ocran 1.3.12 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a58068c425f2d336d76700e029910fb63f307f43a3323e72ccf3f6f80cc575
-  data.tar.gz: 9876cc77dbccd0ce1f0278f326e381d78656fc75417be8693d6218af0073cbd7
+  metadata.gz: 449194532d3384d90405c64c563178872353c0174ac273f6d139b5af97b74098
+  data.tar.gz: fd72ceea04583f1023000765017a70f12d87b517f847119b722d1af2810028ea
 SHA512:
-  metadata.gz: ab3b92cd5d2a1e93a09bcfd99d9992e48c110b38e775d68a1ee5104f0601eb11ba13b428b447831bb771330c300c719b633413d4350d01205bd8700423408fc8
-  data.tar.gz: 4dc1c362a1f6589c1cf5df5ba10211c00f7e6b792f380c58da3cc987e02758152b5c410671e43f5c099943ced230328e7be6cd0fa65f9f16d0a4e6b0c3584a46
+  metadata.gz: e3f49d0fddb65df9b88ce81b21aecd8c27350afc8018c2899629830058e7f6e35fe03431d6448cd4a5343b2967d512d376a712a87939ffa847ce7913836188fb
+  data.tar.gz: f83fbb8cf6768d4f32e220a83ecb1f77468c27b4735f7a14f4a3fe3680e50587ad79ac0ba5c9c4912498ea9171bfd5c6aeb041b7f49bf5908d5b522dd1ea0051

data/bin/ocran

@@ -121,6 +121,7 @@ module Ocran
     def basename; Pathname.new(File.basename(@path)); end
     def expand(dir = nil); Pathname.new(File.expand_path(@path, dir && Ocran.Pathname(dir))); end
     def size; File.size(@path); end
+    def encode(e); to_posix.encode(e); end # called when creating an installer with innosetup 
 
     alias to_s to_posix
     alias to_str to_posix
@@ -186,7 +187,7 @@ module Ocran
     a.sort.inject([]) { |r, e| r.last == e ? r : r << e }
   end
 
-  VERSION = "1.3.12"
+  VERSION = "1.3.14"
 
   IGNORE_MODULE_NAMES = /\/(enumerator.so|rational.so|complex.so|fiber.so|thread.rb|ruby2_keywords.rb)$/
 
@@ -229,6 +230,7 @@ module Ocran
     :force_windows => false,
     :force_console => false,
     :icon_filename => nil,
+    :rubyopt => nil,
     :gemfile => nil,
     :inno_script => nil,
     :quiet => false,
@@ -361,6 +363,7 @@ Executable options:
 --console          Force console application (ruby.exe)
 --chdir-first      When exe starts, change working directory to app dir.
 --icon <ico>       Replace icon with a custom one.
+--rubyopt <str>    Set the RUBYOPT environment variable when running the executable
 --debug            Executable will be verbose.
 --debug-extract    Executable will unpack to local dir and not delete after.
 EOF
@@ -392,6 +395,8 @@ EOF
       when /\A--icon\z/
         @options[:icon_filename] = Pathname(argv.shift)
         Ocran.fatal_error "Icon file #{icon_filename} not found.\n" unless icon_filename.exist?
+      when /\A--rubyopt\z/
+        @options[:rubyopt] = argv.shift
       when /\A--gemfile\z/
         @options[:gemfile] = Pathname(argv.shift)
         Ocran.fatal_error "Gemfile #{gemfile} not found.\n" unless gemfile.exist?
@@ -972,8 +977,13 @@ EOF
         sb.createfile(path, target)
       end
 
+      # Workaround: RubyInstaller cannot find the msys folder if ../msys64/usr/bin/msys-2.0.dll is not present (since RubyInstaller-2.4.1 rubyinstaller 2 issue 23)
+      # Add an empty file to /msys64/usr/bin/msys-2.0.dll if the dll was not required otherwise
+      require 'tempfile'
+      sb.createfile((Tempfile.new("msys-2.0.dll")).path.to_s, 'msys64/usr/bin/msys-2.0.dll') unless sb.files.keys.any? { |entry| entry.to_s.include?("msys-2.0.dll") }
+
       # Set environment variable
-      sb.setenv("RUBYOPT", ENV["RUBYOPT"] || "")
+      sb.setenv("RUBYOPT", Ocran.rubyopt || ENV["RUBYOPT"] || "")
       sb.setenv("RUBYLIB", load_path.map { |path| path.to_native }.uniq.join(";"))
 
       sb.setenv("GEM_PATH", (TEMPDIR_ROOT / GEMHOMEDIR).to_native)
@@ -1082,6 +1092,8 @@ EOF
     OP_ENABLE_DEBUG_MODE = 7
     OP_CREATE_INST_DIRECTORY = 8
 
+    attr_reader :files
+
     def initialize(path, windowed)
       @paths = {}
       @files = {}
@@ -1230,6 +1242,9 @@ EOF
       end
     end
 
+    def hasFile?(src)
+    end
+
     def createprocess(image, cmdline)
       Ocran.verbose_msg "l #{showtempdir image} #{showtempdir cmdline}"
       @of << [OP_CREATE_PROCESS, image.to_native, cmdline].pack("VZ*Z*")

data/lib/ocran/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Ocran
+    VERSION = "1.3.14"
+  end

data/lib/ocran.rb

@@ -1,3 +1,6 @@
-class Ocran
-  VERSION = '1.3.12
+# frozen_string_literal: true
+
+require_relative "ocran/version"
+
+module Ocran
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocran
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.14
 platform: ruby
 authors:
 - Andi Idogawa
@@ -9,12 +9,17 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies: []
-description: OCRAN (One-Click Ruby Application Next) builds Windows executables from
-  Ruby source code. The executable is a self-extracting, self-running executable that
-  contains the Ruby interpreter, your source code and any additionally needed ruby
-  libraries or DLL.
+description: "OCRAN (One-Click Ruby Application Next) builds Windows executables from
+  Ruby source code. \n  The executable is a self-extracting, self-running executable
+  that contains the Ruby interpreter, your source code and any additionally needed
+  ruby libraries or DLL.\n  \n  This is a fork of OCRA that is compatible with ruby
+  version after 2.6. \n  Migration guide: make sure to write ocran instead of ocra
+  in your code. For instance: OCRAN_EXECUTABLE\n\n  usage: \n    ocra helloworld.rb\n
+  \   helloworld.exe\n\n  See readme at https://github.com/largo/ocran\n  Report problems
+  in the github issues. Contributions welcome.\n  This gem contains executables. We
+  plan to build them on github actions for security.\n  "
 email:
 - andi@idogawa.com
 executables:
@@ -24,6 +29,7 @@ extra_rdoc_files: []
 files:
 - bin/ocran
 - lib/ocran.rb
+- lib/ocran/version.rb
 - share/ocran/edicon.exe
 - share/ocran/lzma.exe
 - share/ocran/stub.exe
@@ -34,7 +40,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/largo/ocran
   source_code_uri: https://github.com/largo/ocran
-  changelog_uri: https://github.com/largo/ocran/History.txt
+  changelog_uri: https://github.com/largo/ocran/CHANGELOG.txt
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -50,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: OCRAN (One-Click Ruby Application Next) builds Windows executables from Ruby