neri 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c6c2f6b6dad9643634b34c873219f02c7507828
-  data.tar.gz: c491cd7f829aa66a13edeaab659d73ff7703968f
+SHA256:
+  metadata.gz: bed9920dd2236f60526c9e0374ce6e32fcbd95a80fb33059f88312d1f17ff403
+  data.tar.gz: a28147392e1e54aa6cbdd77c39862f4707b3312ed3cf19e5c1a8decf80579b3d
 SHA512:
-  metadata.gz: 73e8ae13f438b7891a20dfcececde76bc12a95a1df2c16f3c69db10b45fbcc597aa52b88eb9964ac9fe32f8c97a116a348c78cabd283978e98c6e28b1863640e
-  data.tar.gz: 3c568b9700a5229007571809484236e07d20f49adc56d881bdfd63f0d70508f878c3826da10022412c7d71f130901e68ed4d7b3e87f47fed050a3517ba2d9d63
+  metadata.gz: 1ebecbfccb0f97928d97a29ef58ef1680c1a37317d9d708c0f6270e5f2088c8655615f4a4d122f0c1752255479b450470907082cf921a37633a5bfdcbc14dec1
+  data.tar.gz: 2a2d02cbf53664e2abe985253fa907d09eb064eac168bf790515a7465224d6534612c0afa731c82cd9cb32b9953640867a6babc9d3a750bb578689cfd75a00af

data/README.ja.md

@@ -11,7 +11,7 @@ Neri は、Ruby スクリプトを Ruby 未インストール環境向けに配
     - ただし Ruby のバージョンによっては、日本語を含むパス上では起動できない。（この点は OCRA も同様。）
 - OCRA に比べての短所
   - exe ファイルを作成するには、次のどちらかが必要。
-    - gcc と windres（Ruby の拡張ライブラリをコンパイルできる環境ならばおそらく大丈夫。）
+    - gcc と windres（Ruby Installer 2 With Devkit を使用している場合、使用前に `ridk enable` を実行してパスを通す必要があるかもしれません。）
     - [Bat To Exe Converter](http://www.f2ko.de/en/b2e.php) ver.3
 
 ## インストール

data/Rakefile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
-task :default => :spec
+task default: %i[]

data/lib/neri/ayame.rb

@@ -6,7 +6,7 @@ module Neri
   module Ayame
     def new(filename)
       if Neri.exist_in_datafile?(filename)
-        ayame = load_from_memory(Neri.file_read(path))
+        ayame = load_from_memory(Neri.file_read(filename))
         return ayame
       else
         return super

data/lib/neri/build.rb

@@ -320,6 +320,9 @@ options:
       unless options[:enable_did_you_mean]
         @rubyopt += " --disable-did_you_mean" unless @rubyopt.index("--disable-did_you_mean")
       end
+      if @data_files.size > 1 || options[:encryption_key]
+        options[:datafile] ||= basename + ".dat"
+      end
     end
     
     
@@ -588,9 +591,10 @@ options:
 @echo off
 setlocal
 set PATH=%~dp0#{options[:system_dir]}\\#{relative_path(bindir)};%PATH%
+set NERI_EXECUTABLE=%~0
 #{chdir}
 if %~x0 == .exe ( shift )
-#{ruby_command("%~dp0")} %1 %2 %3 %4 %5 %6 %7 %8 %9
+#{ruby_command(options[:chdir_first] ? "" : "%~dp0")} %1 %2 %3 %4 %5 %6 %7 %8 %9
 #{pause_command}
 endlocal
         EOF
@@ -613,6 +617,7 @@ endlocal
       open(c_file, "w:#{options[:external_encoding]}") do |f|
         f.puts <<-EOF
 #include <stdio.h>
+#include <stdlib.h>
 #include <windows.h>
 #include <unistd.h>
 
@@ -634,12 +639,13 @@ int main(int argc, char *argv[])
     } else {
         exit(EXIT_FAILURE);
     }
-    sprintf(paths, "PATH=%s%s#{system_dir}bin;%s", drive, dir, getenv("PATH"));
+    snprintf(paths, sizeof(paths), "NERI_EXECUTABLE=%s", exepath);
+    putenv(paths);
+    snprintf(paths, sizeof(paths), "PATH=%s%s#{system_dir}bin;%s", drive, dir, getenv("PATH"));
     putenv(paths);
-    #{options[:chdir_first] ? 'sprintf(paths, "%s%s", drive, dir);chdir(paths);' : ''}
-    sprintf(runruby, "#{escape_cstr(ruby_command("%s%s"))} %s %s %s %s %s %s %s %s %s",
-        drive,
-        dir,
+    #{options[:chdir_first] ? 'snprintf(paths, sizeof(paths), "%s%s", drive, dir);chdir(paths);' : ''}
+    snprintf(runruby, sizeof(runruby), "#{escape_cstr(ruby_command(options[:chdir_first] ? "" : "%s%s"))} %s %s %s %s %s %s %s %s %s",
+        #{options[:chdir_first] ? "" : "drive, dir,"}
         argc > 1 ? argv[1] : "",
         argc > 2 ? argv[2] : "",
         argc > 3 ? argv[3] : "",
@@ -717,7 +723,7 @@ END
       ruby_code = "Neri.key='#{@encryption_key}';" if @encryption_key
       if options[:datafile]
         ruby_code += "Neri.datafile='#{system_dir}' + #{unpack_filename(options[:datafile])};"
-        ruby_code += "load File.expand_path(#{unpack_filename(File.basename(scriptfile))})"
+        ruby_code += "load #{unpack_filename(File.basename(scriptfile))}"
       else
         ruby_code += "load File.expand_path('#{system_dir}' + #{unpack_filename(scriptfile)})"
       end

data/lib/neri/runtime.rb

@@ -39,7 +39,7 @@ module Neri
     
     def require(feature)
       filepath = nil
-      load_path.each do |path|
+      (feature.match?(/\A([a-z]:|\\|\/|\.)/i) ? [""] : load_path).each do |path|
         ["", ".rb"].each do |ext|
           next unless exist_in_datafile?(path + feature + ext)
           filepath = adjust_path(path + feature + ext)
@@ -49,7 +49,7 @@ module Neri
       if filepath
         return false if $LOADED_FEATURES.index(filepath)
         code = load_code(filepath)
-        eval(code, nil, filepath)
+        eval(code, TOPLEVEL_BINDING, filepath)
         $LOADED_FEATURES.push(filepath)
         return true
       else
@@ -68,7 +68,7 @@ module Neri
         if priv
           Module.new.module_eval(code, filepath)
         else
-          eval(code, nil, filepath)
+          eval(code, TOPLEVEL_BINDING, filepath)
         end
       else
         _neri_orig_load(filepath || file, priv)
@@ -130,8 +130,9 @@ module Neri
     end
     
     def load_path()
-      return $LOAD_PATH unless @system_dir
-      return $LOAD_PATH.map{|path| path.sub(@system_dir, "*neri*#{File::SEPARATOR}") + File::SEPARATOR }
+      paths = $LOAD_PATH.map { |path| path.encode(Encoding::UTF_8) }
+      return paths unless @system_dir
+      paths.map { |path| path.sub(@system_dir, "*neri*#{File::SEPARATOR}") + File::SEPARATOR }
     end
     
     def load_code(file)

data/lib/neri/version.rb

@@ -1,3 +1,3 @@
 module Neri
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/neri.gemspec

@@ -1,36 +1,35 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "neri/version"
+# frozen_string_literal: true
+
+require_relative "lib/neri/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "neri"
   spec.version       = Neri::VERSION
   spec.authors       = ["nodai2hITC"]
   spec.email         = ["nodai2h.itc@gmail.com"]
-  
+
   spec.summary       = %q{One-Click Ruby Application Builder}
   spec.description   = %q{Neri builds Windows batfile or exefile from Ruby script.}
   spec.homepage      = "https://github.com/nodai2hITC/neri"
   spec.license       = "MIT"
-  
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-  
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+  spec.required_ruby_version = ">= 2.4.0"
+
+  # spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
   end
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry"
+
+  spec.add_dependency "win32api"
 end

metadata

@@ -1,51 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: neri
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - nodai2hITC
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: win32api
   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:
@@ -60,7 +32,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.ja.md
@@ -81,8 +52,10 @@ files:
 homepage: https://github.com/nodai2hITC/neri
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/nodai2hITC/neri
+  source_code_uri: https://github.com/nodai2hITC/neri
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,16 +63,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.2.27
+signing_key:
 specification_version: 4
 summary: One-Click Ruby Application Builder
 test_files: []

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/