Updated spec

Author: clbustos

Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rinruby.gemspec
+gemspec

Gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: .
+  specs:
+    rinruby (2.0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    hoe (3.12.0)
+      rake (>= 0.8, < 11.0)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hoe
+  rake
+  rinruby!
+  rspec

History.txt

@@ -1,8 +1,11 @@
 === 2.0.3 / 2012-07-31
-  * 64-bit version is in x64
-  * Adapt to different Rterm.exe locations. On Windows at least, Rterm.exe has moved under an i386/ folder
-  * Update README.txt
-  * Updated spec to rspec 2.0
+* Update README.txt
+
+=== 2.0.2 / 2011-02-03
+
+* Updated RSpec to 2.0. Should work on Windows [clbustos]
+* 64-bit version is in x64 [Rob Heittman]
+* Adapt to different Rterm.exe locations [Rob Heittman]
 
 === 2.0.1 / 2010-05-01
 * Reimplemented Rinruby.new with ordered parameters, for complete backwards compatibility

README.txt renamed to README.md

@@ -1,8 +1,7 @@
-= rinruby
-
+# rinruby
 * http://rinruby.ddahl.org/
 
-== DESCRIPTION:
+### DESCRIPTION
 
 RinRuby is a Ruby library that integrates the R interpreter in Ruby, making R's statistical routines and graphics available within Ruby.  The library consists of a single Ruby script that is simple to install and does not require any special compilation or installation of R.  Since the library is 100% pure Ruby, it works on a variety of operating systems, Ruby implementations, and versions of R.  RinRuby's methods are simple, making for readable code.  The {website [rinruby.ddahl.org]}[http://rinruby.ddahl.org] describes RinRuby usage, provides comprehensive documentation, gives several examples, and discusses RinRuby's implementation.
 
@@ -15,15 +14,16 @@ Homepage: http://rinruby.ddahl.org
 
 Contributors: Claudio Bustos
 
-== FEATURES/PROBLEMS:
+### FEATURES/PROBLEMS
 
 * Pure Ruby. Works on Ruby 1.8.7, 1.9 and JRuby 1.4
 * Slower than RSRuby, but more robust
 
-== SYNOPSIS:
+### SYNOPSIS
+
 Below is a simple example of RinRuby usage for simple linear regression. The simulation parameters are defined in Ruby, computations are performed in R, and Ruby reports the results. In a more elaborate application, the simulation parameter might come from input from a graphical user interface, the statistical analysis might be more involved, and the results might be an HTML page or PDF report. 
 
-<b>Code</b>:
+#### Code
 
       require "rinruby"
       n = 10
@@ -33,34 +33,34 @@ Below is a simple example of RinRuby usage for simple linear regression. The sim
       seed = 23423
       R.x = (1..n).entries
       R.eval <<EOF
-          set.seed({seed})
-          y <- {beta_0} + {beta_1}*x + rnorm({n})
+          set.seed(#{seed})
+          y <- #{beta_0} + #{beta_1}*x + rnorm(#{n})
           fit <- lm( y ~ x )
           est <- round(coef(fit),3)
           pvalue <- summary(fit)$coefficients[2,4]
       EOF
-      puts "E(y|x) ~= {R.est[0]} + {R.est[1]} * x"
+      puts "E(y|x) ~= #{R.est[0]} + #{R.est[1]} * x"
       if R.pvalue < alpha
         puts "Reject the null hypothesis and conclude that x and y are related."
       else
         puts "There is insufficient evidence to conclude that x and y are related."
       end
 
-<b>Output</b>:
+#### Output
 
       E(y|x) ~= 1.264 + 0.273 * x
       Reject the null hypothesis and conclude that x and y are related.
 
-== REQUIREMENTS:
+### REQUIREMENTS
 
 * R
 
-== INSTALL:
+### INSTALL
 
 * sudo gem install rinruby
 
 
-== LICENSE:
+### LICENSE
 
 GPL-3. See LICENSE.txt for more information.
 

Rakefile

@@ -14,8 +14,7 @@ Hoe.spec 'rinruby' do
   # self.rubyforge_name = 'rinruby' # if different than 'rinruby2'
   self.developer('David Dahl', 'rinruby_AT_ddahl.org')
   self.developer('Claudio Bustos', 'clbustos_AT_gmail.com')
-  self.url = "http://rinruby.ddahl.org/"
-
+  self.urls = ["http://rinruby.ddahl.org/"]
 end
 
 # vim: syntax=ruby

lib/version.rb

@@ -0,0 +1,3 @@
+module Rinruby
+  VERSION = "2.0.3"
+end

rinruby.gemspec

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "rinruby"
+  spec.version       = Rinruby::VERSION
+  spec.authors       = ["David Dahl", "Scott Crawford", "Claudio Bustos"]
+  spec.email         = ["[email protected]", "[email protected]", "[email protected]"]
+  spec.summary       = %q{RinRuby is a Ruby library that integrates the R interpreter in Ruby}
+  spec.description   = %q{RinRuby is a Ruby library that integrates the R interpreter in Ruby, making R's statistical routines and graphics available within Ruby. The library consists of a single Ruby script that is simple to install and does not require any special compilation or installation of R. Since the library is 100% pure Ruby, it works on a variety of operating systems, Ruby implementations, and versions of R.  RinRuby's methods are simple, making for readable code.  The {website [rinruby.ddahl.org]}[http://rinruby.ddahl.org] describes RinRuby usage, provides comprehensive documentation, gives several examples, and discusses RinRuby's implementation.}
+  spec.homepage      = "http://rinruby.ddahl.org"
+  spec.license       = "Copyright 2005-2008 David B. Dahl"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "hoe"
+end

spec/rinruby_spec.rb

@@ -13,21 +13,22 @@
         "other"
       end
       if platform=='windows'
-        pending("Difficult to test without specific location of R executable on Windows")
+        skip("Difficult to test without specific location of R executable on Windows")
       else      
 
       r=RinRuby.new(false, false, "R", 38500, 1)
-      r.echo_enabled.should_not be_true
-      r.interactive.should_not be_true
+      
+      expect(r.echo_enabled).to be false
+      r.interactive.should be false
       r.executable.should=="R"
       r.port_number.should==38500
       r.port_width.should==1      
       end
     end
     it "should accept :echo and :interactive parameters" do
       r=RinRuby.new(:echo=>false, :interactive=>false)
-      r.echo_enabled.should_not be_true
-      r.interactive.should_not be_true
+      r.echo_enabled.should be false
+      r.interactive.should be false
 
     end
     it "should accept :port_number" do
@@ -56,13 +57,13 @@
     it {should respond_to :quit}
     it {should respond_to :echo}
     it "return correct values for complete?" do
-      R.eval("x<-1").should be_true
+      R.eval("x<-1").should be true
     end
     it "return false for complete? for incorrect expressions" do
-      R.complete?("x<-").should be_false
+      R.complete?("x<-").should be false
     end
     it "correct eval should return true" do 
-      R.complete?("x<-1").should be_true
+      R.complete?("x<-1").should be true
     end
     it "incorrect eval should raise an ParseError" do
       lambda {R.eval("x<-")}.should raise_error(RinRuby::ParseError)
@@ -136,7 +137,7 @@
       @r=RinRuby.new(:echo=>false)
     end
     it "return true" do
-      @r.quit.should be_true
+      @r.quit.should be true
     end
     it "returns an error if used again" do
       @r.quit

spec/spec_helper.rb

@@ -1,16 +1,30 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
-require 'rinruby'
 require 'rspec'
+require 'rinruby'
 
 require 'matrix'
 
 RSpec.configure do |config|
-  
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
+  # Use color in STDOUT
+  config.color = true
+
+  # Use color not only in STDOUT but also in pagers and files
+  config.tty = true
+
+  # Use the specified formatter
+  config.formatter = :documentation # :progress, :html, :textmate
 end
 
+
 class String
   def deindent
-    gsub /^[ \t]*/, ''
+    gsub /^[ \t]*/, '' 
   end
 end
+
+