ruby-gr 0.0.26 → 0.64.0.0

data/lib/gr_commons/gr_lib.rb

@@ -23,45 +23,66 @@ module GRCommons
   #     - mingw-w64-gr
   module GRLib
     class << self
+      # Check if using RubyInstaller or not.
+      def ruby_installer?
+        Object.const_defined?(:RubyInstaller)
+      end
+
+      # Return the directory path from the GRDIR environment variable.
+      def get_grdir_from_env(lib_names)
+        return nil unless ENV['GRDIR']
+        return ENV['GRDIR'] if Dir.exist?(ENV['GRDIR'])
+
+        warn "#{lib_names} : Dir GRDIR=#{ENV['GRDIR']} not found." # return nil
+      end
+
       # Search the shared library.
       # @note This method does not detect the Operating System.
       #
       # @param lib_names [Array] The actual file name of the shared library.
       # @param pkg_name [String] The package name to be used when searching with pkg-configg
       def search(lib_names, pkg_name)
+        # FIXME: There may be a better way to do it...
         def lib_names.map_find(&block)
           lazy.map(&block).find { |path| path }
         end
+
+        # ENV['GRDIR']
+        # Verify that the directory exists.
+        grdir = get_grdir_from_env(lib_names)
+
         # Windows + RubyInstaller
-        if Object.const_defined?(:RubyInstaller)
-          dir = ENV['GRDIR'] || [
-            RubyInstaller::Runtime.msys2_installation.msys_path,
-            RubyInstaller::Runtime.msys2_installation.mingwarch
-          ].join(File::ALT_SEPARATOR)
-          lib_names.lazy.map do |lib_name|
-            recursive_search(lib_name, dir)
-          end.find { |i| i }.tap do |path|
-            RubyInstaller::Runtime.add_dll_directory(File.dirname(path)) if path
-          end
-        # ENV['GRDIR'] (Linux, Mac, Windows)
-        elsif ENV['GRDIR']
-          # Search for XXX.dylib and then XXX.so on macOS
-          lib_names.map_find do |lib_name|
-            recursive_search(lib_name, ENV['GRDIR'])
-          end || lib_names.map_find do |lib_name|
-            pkg_config_search(lib_name, pkg_name)
-          end
-        else
-          lib_names.map_find do |lib_name|
-            pkg_config_search(lib_name, pkg_name)
+        if ruby_installer?
+          grdir ||= File.join(RubyInstaller::Runtime.msys2_installation.msys_path,
+                              RubyInstaller::Runtime.msys2_installation.mingwarch)
+        end
+
+        # Search grdir
+        if grdir
+          lib_path = lib_names.map_find do |lib_name|
+            recursive_search(lib_name, grdir)
           end
         end
+
+        # Search with pkg-config
+        lib_path ||= lib_names.map_find do |lib_name|
+          pkg_config_search(lib_name, pkg_name)
+        end
+
+        # Windows + RubyInstaller
+        if ruby_installer?
+          RubyInstaller::Runtime.add_dll_directory(File.dirname(lib_path))
+          # FIXME: Where should I write this code?
+          ENV['GKS_FONTPATH'] ||= grdir
+        end
+
+        lib_path
       end
 
       # Recursive file search in directories
       # @param name [String] File to search for
       # @param base_dir [String] Directory to search
-      # @retrun path [String, NilClass] Returns the first path found.
+      # @return path [String, NilClass] Returns the first path found.
       #                                 If not found, nil is returned.
       def recursive_search(name, base_dir)
         Dir.chdir(base_dir) do

data/lib/gr_commons/gr_logger.rb

@@ -5,10 +5,11 @@
 # It should not be loaded when gr_commons/gr_commons is loaded.
 
 require 'logger'
-require 'rainbow'
-require 'awesome_print'
+require 'pp'
 
 module GRCommons
+  # Convenience class methods
+
   class << self
     # Create a new GRLogger
     # @param out [String]
@@ -16,30 +17,35 @@ module GRCommons
     # @example
     #   require 'gr_commons/gr_logger'
     #   GRCommons.gr_log("log.txt")
+
     def gr_log(out = $stderr)
       GRCommons::GRLogger.new(out)
     end
 
     # Return the last created GRLogger
     # @return [GRLogger]
+
     def gr_logger
       GRCommons::GRLogger.logger
     end
   end
 
-  # Outputs function calls to GR Framework to a log file.
-  # Mainly used for debugging.
-  # @note This module is for those who want to see low-level function calls in GR.
+  # If GR.rb call native functions of the GR framework,
+  # it will be recorded in the log file.
+  #
+  # @note Mainly used by developers for debugging.
   #
   # = How it works　
-  # prepend a module named Inspector to the singular class
-  # of the FFI module. It will inspects the GR function call of the FFI module
+  # It prepend a module named Inspector to the singular class of the FFI module.
+  # It will inspects the GR function call of the FFI module
   #
   # @example
   #   require 'gr_commons/gr_logger'
-  #   GRCommons.gr_log("log.txt")
+  #   GRCommons::GRLogger.new("log.txt")
+
   class GRLogger < Logger
     # Return the last created GRLogger
+
     def self.logger
       @@logger ||= GRCommons::GRLogger.new
     end
@@ -51,13 +57,15 @@ module GRCommons
   end
 end
 
+# GR
+
 if Object.const_defined?(:GR)
   module GR
     module FFI
       module Inspector
         GR::FFI.ffi_methods.each do |s|
           define_method(s) do |*args|
-            GRCommons.gr_logger.info "GR::FFI.#{s}\n" + args.ai + "\n"
+            GRCommons.gr_logger.info "GR::FFI.#{s}\n#{args.pretty_inspect}\n"
             super(*args)
           end
         end
@@ -69,13 +77,15 @@ if Object.const_defined?(:GR)
   end
 end
 
+# GR3
+
 if Object.const_defined?(:GR3)
   module GR3
     module FFI
       module Inspector
         GR3::FFI.ffi_methods.each do |s|
           define_method(s) do |*args|
-            GRCommons.gr_logger.info "GR3::FFI.#{s}\n" + args.ai + "\n"
+            GRCommons.gr_logger.info "GR3::FFI.#{s}\n#{args.pretty_inspect}\n"
             super(*args)
           end
         end
@@ -87,13 +97,15 @@ if Object.const_defined?(:GR3)
   end
 end
 
+# GRM
+
 if Object.const_defined?(:GRM)
   module GRM
     module FFI
       module Inspector
         GRM::FFI.ffi_methods.each do |s|
           define_method(s) do |*args|
-            GRCommons.gr_logger.info "GRM::FFI.#{s}\n" + args.ai + "\n"
+            GRCommons.gr_logger.info "GRM::FFI.#{s}\n#{args.pretty_inspect}\n"
             super(*args)
           end
         end

data/lib/gr_commons/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GRCommons
-  VERSION = '0.0.26'
+  VERSION = '0.64.0.0'
 end

data/lib/grm/ffi.rb

@@ -70,8 +70,5 @@ module GRM
     try_extern 'int grm_merge_named(const grm_args_t *args, const char *identificator)'
     try_extern 'int grm_plot(const grm_args_t *args)'
     try_extern 'int grm_switch(unsigned int id)'
-
-    # https://github.com/sciapp/gr/blob/master/lib/grm/util.h
-    try_extern 'FILE *grm_get_stdout(void)'
   end
 end

data/lib/grm.rb

@@ -27,7 +27,7 @@ module GRM
 
   # Platforms |  path
   # Windows   |  bin/libGRM.dll
-  # MacOSX    |  lib/libGRM.dylib (v0.53.0 .so)
+  # MacOSX    |  lib/libGRM.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGRM.so
   platform = RbConfig::CONFIG['host_os']
   lib_names, pkg_name = \
@@ -35,10 +35,14 @@ module GRM
     when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       [['libGRM.dll'], 'grm']
     when /darwin|mac os/
+      ENV['GKSwstype'] ||= 'gksqt'
       [['libGRM.dylib', 'libGRM.so'], 'grm']
     else
       [['libGRM.so'], 'grm']
     end
+
+  # On Windows + RubyInstaller,
+  # the environment variable GKS_FONTPATH will be set.
   lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
 
   raise NotFoundError, "#{lib_names} not found" if lib_path.nil?

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.64.0.0
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: histogram
+  name: fiddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: numo-narray
+  name: histogram
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pkg-config
+  name: numo-narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,83 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
+  name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -147,7 +77,6 @@ files:
 - lib/gr.rb
 - lib/gr/ffi.rb
 - lib/gr/grbase.rb
-- lib/gr/plot.rb
 - lib/gr/version.rb
 - lib/gr3.rb
 - lib/gr3/ffi.rb
@@ -186,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: GR for Ruby