r_bridge 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f3e3fc8242a4204e378f7f86bcc3ca120b163aca161e7b5f7bca12f66eecc3
-  data.tar.gz: 64d9be810cc38ed60bff9204c8dbdf5e1668d295f99d617f7bcfbcf91aea0041
+  metadata.gz: 07cb9536295a7d3c189e375f4a7024c0fc0fa7d76a63372bebeb9fec0248f021
+  data.tar.gz: a8b7fd323bbfe50c80b06e383a18f4651f4bfd3abe4ac7ce3790996b0d3e93fc
 SHA512:
-  metadata.gz: 3af47902e433e3d7be48d472a28d6d84d6cb684f09fa321db31cf8d2ad007af682d8ad401aba3544158fb9853262f224e531a9c0e769c22aa27957b307a4015a
-  data.tar.gz: a43acbb159c37d3ac14ca2580090c810081977d44786812349d901d8ba450173b21ee6ac412a1e9962378fa075030e9b56b52b53e786804969c2fe7406d52257
+  metadata.gz: 64b37858d049eaefef2fd8d73abff0f300595f03d978253bcda6a830d2313de9a0886cb2536f7b50ff74dc897809194d600eae91b1ea14f4bc857030afd4e0fb
+  data.tar.gz: 18baf0868ced6db926a61c9e1fe7f8869a1fe87bb0097dda5ddb897369ebc25ff63a51533befb75bc11c4d3b10207f834bb979d001ad5b34f19cf7b567a1102e

data/ext/r_bridge/extconf.rb

@@ -6,53 +6,69 @@ if FFI::Platform::OS == "windows"
   $CFLAGS << " " << "-D_WIN" << " "
 end
 
-
-class RHeaderNotFound < RuntimeError
-end
-class RLibraryNotFound < RuntimeError
+class RHeaderLibraryNotFound < RuntimeError
 end
 
-def check_R_header_and_lib( )
+def check_set_system_R_header_and_lib( )
   msg_devel_header = "For UNIX package users, please install R development tools via package (which name should look like r-base-dev or R-devel)."
   msg_devel_lib = "For UNIX package users, please install R development tools via package (which name should look like r-base-dev or R-devel). If this is a custom build of R, please make sure that It was built with the --enable-R-shlib option. "
 
   if have_header('R.h')
-    p "header ok"
+    p "header ok (system)"
     if have_library('R', 'R_tryEval') || have_library('libR', 'R_tryEval') 
-      p "library ok"
+      p "library ok (system)"
       return true
     else
-      raise RLibraryNotFound.new(  "Dynamic (i.e. shared) library of R is not found (R.dll for Windows, libR.so for UNIX)." + msg_devel_lib )
+      p "Dynamic (i.e. shared) library of R is not found (R.dll for Windows, libR.so for UNIX)." + msg_devel_lib
     end
   else
-    raise RHeaderNotFound.new( "Header for R is not found." + msg_devel_header )
+    p "Header for R is not found." + msg_devel_header
   end
+  return false
 end
 
-pkg_config_tried = false
-r_config_tried = false
-
-dir_config("R")
+def check_set_pkg_config_R_header_and_lib( )
+  msg_pkg_config = "To let pkg-config locate libR.pc file, include its existing directory path in R PKG_CONFIG_PATH"
 
-begin
-  if check_R_header_and_lib()
-    # Makefile that will build and install extension to lib/r_bridge/librbridge.so
-    create_makefile "r_bridge/librbridge"
-  end
-rescue RHeaderNotFound, RLibraryNotFound => e
-  if find_executable('pkg-config') && (pkg_config_tried == false)
+  if find_executable('pkg-config')
     add_cflags = pkg_config("libR", "cflags")
     add_ldflags = pkg_config("libR", "libs")
-    if ( ! add_cflags.nil? ) && (! add_ldflags.nil?)
+    if ( ! add_cflags.nil? )
+      p "header ok (pkg-config)"
       $CFLAGS << " " << add_cflags
-      $LDFLAGS <<" " << add_ldflags
+      if (! add_ldflags.nil?)
+        p "library ok (pkg-config)"
+        $LDFLAGS <<" " << add_ldflags
+        return true
+      else
+        p "Dynamic (i.e. shared) library of R is not found (R.dll for Windows, libR.so for UNIX)." + msg_pkg_config
+      end
+    else
+      p "Header for R is not found." + msg_pkg_config
+    end
+  else
+    p "pkg-config command is not available."
+  end
+  return false
+end
+
+def check_Rscript_executable
+  if find_executable('Rscript')
+    return true
+  else
+    p "R program is not found. Please check your PATH setting if you already have R on your machine."
+  end
+  return false
+end
+
+def check_set_R_home_header_and_lib
+    msg_rscript = "Cannot be detected by R home."
+
+    if check_Rscript_executable
+      r_home_path = `Rscript -e "cat(R.home()[1])"`.chomp
+    else
+      return false
     end
-    pkg_config_tried = true
-    retry
-  elsif ! find_executable('R')
-    raise "R program is not found. Please check your PATH setting if you already have R on your machine."
-  elsif find_executable('R') && find_executable('Rscript') && (r_config_tried == false)
-    r_home_path = `Rscript -e "cat(R.home()[1])"`.chomp
     
     if ! r_home_path.empty?()
       case FFI::Platform::ARCH
@@ -65,14 +81,32 @@ rescue RHeaderNotFound, RLibraryNotFound => e
       else
         raise FFI::Platform::ARCH + ": unkown architecure detected. Please specify R shared library by yourself."
       end
-      find_header('R.h', *possible_r_header_dirs)
-      find_library('R', 'R_tryEval', *possible_r_lib_dirs)
+
+      if find_header('R.h', *possible_r_header_dirs)
+        p "header ok (Rscript)"
+        if find_library('R', 'R_tryEval', *possible_r_lib_dirs)
+          p "library ok (Rscript)"
+          return true
+        else
+          p "Dynamic (i.e. shared) library of R is not found (R.dll for Windows, libR.so for UNIX)." + msg_rscript
+        end
+      else
+        p "Header for R is not found." + msg_rscript
+      end
+    else
+      p "R home cannot be detected."
     end
+    return false
+end
 
-    r_config_tried = true
-    retry
-  else
-    raise e
-  end
+dir_config("R")
+
+if check_set_system_R_header_and_lib()
+elsif check_set_pkg_config_R_header_and_lib()
+elsif check_set_R_home_header_and_lib()
+else
+  raise RHeaderLibraryNotFound.new( "R header or library not fouund.")
 end
 
+create_makefile "r_bridge/librbridge"
+

data/lib/r_bridge/r_bridge_ffi.rb

@@ -261,6 +261,8 @@ module RBridge
       else
         r_obj = value.to_r_symbol
       end
+    when value.class == NilClass
+      r_obj = RBridge.r_nil
     end
     return r_obj
   end

data/lib/r_bridge/r_bridge_lazyfunc_ext.rb

@@ -69,6 +69,8 @@ module RBridge
         if(idx == val.elems.size ) # Not found
           new_arg_assoc_array << [key, RBridge::r_nil()]
         end
+      when RInstPrevious
+        new_arg_assoc_array << [key, result_manager.get_previous_inst_name() ]
       else  # R object
         new_arg_assoc_array << [key, val]
       end
@@ -166,6 +168,10 @@ module RBridge
     end
   end
 
+  class RInstPrevious
+    # RInstPrevious is used to obtain the previous instruction name.
+  end
+
   class RResultManager
     def initialize
       @results = []
@@ -248,6 +254,16 @@ module RBridge
         return RBridge::r_nil()
       end
     end
+
+    def get_previous_inst_name()
+      if @results.size > 0
+        last_inst_name = @results.last[0]
+        r_obj = RBridge::create_strvec([last_inst_name])
+        return r_obj
+      else
+        return RBridge::r_nil()
+      end
+    end
   end
 
   class RNameContainer

data/lib/r_bridge/version.rb

@@ -1,3 +1,3 @@
 module RBridge
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 end

data/lib/r_bridge.rb

@@ -6,5 +6,21 @@ require 'r_bridge/r_bridge_lazyfunc_ext'
 module RBridge
   class Error < StandardError; end
   # Your code goes here...
+
+  if ENV["R_HOME"].nil?
+    puts "Environment variable R_HOME is not set." 
+    puts "This time, it is tried to be set by 'R RHOME' command."
+    begin
+      `R --version`
+    rescue => e
+      puts "R command is not available. Please ensure that your PATH environment variable includes the location of R command."
+      raise e
+    end
+
+    r_home_output = `R RHOME`
+    r_home = r_home_output.chomp
+    ENV["R_HOME"] = r_home
+    puts "R_HOME environment variable is set to be #{r_home}."
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_bridge
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Toshihiro Umehara
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -73,7 +73,7 @@ metadata:
   homepage_uri: https://github.com/niceume/r_bridge
   source_code_uri: https://github.com/niceume/r_bridge
   changelog_uri: https://github.com/niceume/r_bridge
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.31
+signing_key:
 specification_version: 4
 summary: Enables Ruby to construct and evaluate R internal objects
 test_files: []