rinruby 2.0.1 → 2.0.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 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
 

data/lib/rinruby.rb

@@ -62,7 +62,7 @@ class RinRuby
   require 'socket'
 
   
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 
 
   attr_reader :interactive
@@ -93,7 +93,7 @@ class RinRuby
 #* :port_number: This is the smallest port number on the local host that could be used to pass data between Ruby and R. The actual port number used depends on port_width.
 #* :port_width: RinRuby will randomly select a uniform number between port_number and port_number + port_width - 1 (inclusive) to pass data between Ruby and R. If the randomly selected port is not available, RinRuby will continue selecting random ports until it finds one that is available. By setting port_width to 1, RinRuby will wait until port_number is available. The default port_width is 1000.
 #
-#It may be desirable to change the parameters to the instance of R, but still call it by the name of R. In that case the old instance of R which was created with the 'require "rinruby"' statement should be closed first using the quit method which is explained below. Unless the previous instance is killed, it will continue to use system resources until exiting Ruby. The following shows an example by changing the parameter echo:
+# It may be desirable to change the parameters to the instance of R, but still call it by the name of R. In that case the old instance of R which was created with the 'require "rinruby"' statement should be closed first using the quit method which is explained below. Unless the previous instance is killed, it will continue to use system resources until exiting Ruby. The following shows an example by changing the parameter echo:
 #
 #      >> require "rinruby"
 #      >> R.quit
@@ -189,6 +189,7 @@ def initialize(*args)
   def quit
     begin 
       @writer.puts "q(save='no')"
+      # TODO: Verify if read is needed
       @socket.read()
       #@socket.close 
       @engine.close 
@@ -771,7 +772,13 @@ def initialize(*args)
     else
       path.gsub!('\\','/')
     end
-    %Q<"#{path}/bin/Rterm.exe">
+    for hierarchy in [ 'bin', 'bin/i386', 'bin/x64' ]
+      target = "#{path}/#{hierarchy}/Rterm.exe"
+      if File.exists? target
+        return %Q<"#{target}">
+      end
+    end
+    raise "Cannot locate R executable"
   end
 
 end

data/spec/rinruby_spec.rb

@@ -4,14 +4,25 @@ puts "RinRuby #{RinRuby::VERSION} specification"
 describe RinRuby do
   describe "on init" do
     it "should accept parameters as specified on Dahl & Crawford(2009)" do
+      
+      platform = case RUBY_PLATFORM
+      when /mswin/ then 'windows'
+      when /mingw/ then 'windows'
+      when /bccwin/ then 'windows'
+      else 
+        "other"
+      end
+      if platform=='windows'
+        pending("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
-      r.executable.should=='R'
+      r.executable.should=="R"
       r.port_number.should==38500
-      r.port_width.should==1
-      
-      
+      r.port_width.should==1      
+      end
     end
     it "should accept :echo and :interactive parameters" do
       r=RinRuby.new(:echo=>false, :interactive=>false)
@@ -113,7 +124,7 @@ describe RinRuby do
       rx=R.x
       matrix.row_size.times {|i|
         matrix.column_size.times {|j|
-          matrix[i,j].should be_close(rx[i,j],1e-10)
+          matrix[i,j].should be_within(1e-10).of(rx[i,j])
         }
       }
     end

data/spec/spec_helper.rb

@@ -1,15 +1,10 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'rinruby'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
 require 'matrix'
 
-Spec::Runner.configure do |config|
-  
-end
-
 class String
   def deindent
     gsub /^[ \t]*/, ''

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rinruby
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - David Dahl
@@ -31,29 +36,24 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-05-01 00:00:00 -04:00
+date: 2011-02-03 00:00:00 -03:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.4
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.6.0
-    version: 
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  type: :development
+  version_requirements: *id001
 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.
   
@@ -98,21 +98,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rinruby
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RinRuby is a Ruby library that integrates the R interpreter in Ruby, making R's statistical routines and graphics available within Ruby