rsruby 0.5 → 0.5.1

data/History.txt

@@ -1,3 +1,7 @@
+= 0.5.1 2008-11-11
+
+* removed #include of Rdevices.h so installation is possible with R 2.8.0 packages
+
 = 0.5 2008-04-18
 
 * Added easy figure method RSRuby.img()
@@ -8,4 +12,5 @@
 
 * Several bugs in the conversion system are fixed
 * The test suite was expanded and tidied
-* Using Hoe for package management
+* Using Hoe for package management
+

data/Rakefile.rb

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift("./lib")
 $LOAD_PATH.unshift("./ext")
 
 gem_name = RUBY_PLATFORM !~ /mswin32$/ ? "rsruby" : "rsrubywin"
-hoe = Hoe.new(gem_name,'0.5') do |p|
+hoe = Hoe.new(gem_name,'0.5.1') do |p|
   
-  p.author = "Alex Gutteridge"
-  p.email = "ag357@cam.ac.uk"
+  p.author = "Alex Gutteridge, Ben J Woodcroft"
+  p.email = "ag357@cam.ac.uk, b.woodcroft@pgrad.unimelb.edu.au"
   p.url = "http://web.kuicr.kyoto-u.ac.jp/~alexg/rsruby/"
   
   p.description = p.paragraphs_of("README.txt",1..3)[0]

data/ext/R_eval.c

@@ -32,11 +32,13 @@
 #include <rsruby.h>
 #include <R_eval.h>
 
+int interrupted = 0;
+
 /* Abort the current R computation due to a SIGINT */
 void interrupt_R(int signum)
 {
-  //interrupted = 1;
-  //error("Interrupted");
+  interrupted = 1;
+  error("Interrupted");
 }
 
 
@@ -47,17 +49,21 @@ SEXP do_eval_expr(SEXP e) {
   VALUE rb_eRException;
   int error = 0;
 
+  signal(SIGINT, interrupt_R);
+  interrupted = 0;
+
   res = R_tryEval(e, R_GlobalEnv, &error);
 
   if (error) {
-    //if (interrupted) {
-    //  rb_raise(rb_eInterrupt);
-    //}
-    //else
-    rb_eRException = rb_const_get(rb_cObject, 
-				  rb_intern("RException"));
-    rb_raise(rb_eRException, get_last_error_msg());
-    return NULL;
+    if (interrupted) {
+      rb_raise(rb_eInterrupt,"RSRuby interrupted");
+    }
+    else {
+      rb_eRException = rb_const_get(rb_cObject, 
+				    rb_intern("RException"));
+      rb_raise(rb_eRException, get_last_error_msg());
+      return NULL;
+    }
   }
 
   return res;

data/ext/rsruby.c

@@ -152,9 +152,9 @@ void init_R(int argc, char **argv){
              
 /* This method is for testing catching of segfaults */
 VALUE crash(){
-	int* ptr = (int*)0;
-	 *ptr = 1;
-	return Qtrue; 
+  int* ptr = (int*)0;
+  *ptr = 1;
+  return Qtrue; 
 }
 
 
@@ -171,7 +171,7 @@ void Init_rsruby_c(){
   rb_define_method(cRRuby, "get_fun", get_fun, 1);
   rb_define_method(cRRuby, "shutdown", rs_shutdown, 0);
 
-rb_define_method(cRRuby, "crash", crash, 0);
+  rb_define_method(cRRuby, "crash", crash, 0);
 
   //Add the lcall method to RObj
   cRObj  = rb_const_get(rb_cObject,rb_intern("RObj"));

data/ext/rsruby.h

@@ -38,7 +38,6 @@
 #include "Rdefines.h"
 #include "Rinternals.h"
 #include "Rdefines.h"
-#include "Rdevices.h"
 
 #include "signal.h"
 

data/lib/rsruby.rb

@@ -53,7 +53,7 @@ require 'complex'
 
 class RSRuby
 
-  VERSION = '0.5'
+  VERSION = '0.5.1'
 
   include Singleton
 

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: rsruby
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
-- Alex Gutteridge
+- Alex Gutteridge, Ben J Woodcroft
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-04-18 00:00:00 +01:00
+date: 2008-11-26 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
 description: RSRuby is a bridge library for Ruby giving Ruby developers access to the full R statistical programming environment. RSRuby embeds a full R interpreter inside the running Ruby script, allowing R methods to be called and data passed between the Ruby script and the R interpreter. Most data conversion is handled automatically, but user-definable conversion routines can also be written to handle any R or Ruby class.
-email: ag357@cam.ac.uk
+email: ag357@cam.ac.uk, b.woodcroft@pgrad.unimelb.edu.au
 executables: []
 
 extensions: 
@@ -23,9 +23,9 @@ extra_rdoc_files:
 - README.txt
 - History.txt
 - License.txt
-- examples/arrayfields.rb
 - examples/bioc.rb
 - examples/dataframe.rb
+- examples/arrayfields.rb
 - examples/erobj.rb
 files: 
 - History.txt
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rsruby
-rubygems_version: 1.1.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: RSRuby is a bridge library for Ruby giving Ruby developers access to the full R statistical programming environment. RSRuby embeds a full R interpreter inside the running Ruby script, allowing R methods to be called and data passed between the Ruby script and the R interpreter. Most data conversion is handled automatically, but user-definable conversion routines can also be written to handle any R or Ruby class.