ocran 1.4.6 → 1.5.0

data/lib/ocran/stub_builder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "fileutils"
 require "tempfile"
 require_relative "file_path_set"
 
@@ -119,7 +120,9 @@ module Ocran
     def initialize(path, chdir_before: nil, chdir_to_exe_dir: nil,
                    debug_extract: nil, debug_mode: nil,
                    enable_compression: nil, gui_mode: nil, icon_path: nil,
-                   run_in_exe_dir: nil, stub_path: nil)
+                   run_in_exe_dir: nil, stub_path: nil,
+                   version_strings: nil, file_version: nil, product_version: nil,
+                   resource_strings: nil, execution_level: nil, application_manifest: nil)
       @dirs = FilePathSet.new
       @files = FilePathSet.new
       @data_size = 0
@@ -138,38 +141,65 @@ module Ocran
                  else
                    STUB_PATH
                  end
-      IO.copy_stream(stub_src, stub_tmp)
-      stub = stub_tmp
+      begin
+        IO.copy_stream(stub_src, stub_tmp)
+        stub = stub_tmp
 
-      # Clear any invalid security directory entries from the stub (Windows only)
-      self.class.clear_invalid_security_entry(stub) if WINDOWS
+        # Clear any invalid security directory entries from the stub (Windows only)
+        self.class.clear_invalid_security_entry(stub) if WINDOWS
 
-      # Embed icon resource (Windows only)
-      if icon_path && WINDOWS
-        require_relative "ed_icon"
-        EdIcon.update_icon(stub, icon_path.to_s)
-      end
+        # Embed icon resource (Windows only)
+        if icon_path && WINDOWS
+          require_relative "ed_icon"
+          EdIcon.update_icon(stub, icon_path.to_s)
+        end
 
-      File.open(stub, "ab") do |of|
-        @of = of
-        @opcode_offset = @of.size
+        # Embed rcedit-style PE resources: version info, manifest, string table
+        # (Windows only). This must run before the opcode data is appended below,
+        # because BeginUpdateResource/EndUpdateResource rewrites the whole PE file.
+        # Only loaded when asked for, like ed_icon: it requires fiddle, which
+        # since Ruby 4.0 is a bundled gem that the application's own bundle
+        # (ocran run under its `bundle exec`) need not include.
+        resource_options = [version_strings, file_version, product_version,
+                            resource_strings, execution_level, application_manifest]
+        if WINDOWS && resource_options.any? { |v| v && !(v.respond_to?(:empty?) && v.empty?) }
+          manifest_xml = application_manifest ? File.read(application_manifest, encoding: "UTF-8") : nil
+          require_relative "ed_resource"
+          EdResource.update(stub,
+                            version_strings: version_strings,
+                            file_version: file_version,
+                            product_version: product_version,
+                            resource_strings: resource_strings,
+                            manifest_xml: manifest_xml,
+                            execution_level: execution_level)
+        end
 
-        write_header(debug_mode, debug_extract, chdir_before, enable_compression, run_in_exe_dir, chdir_to_exe_dir)
+        File.open(stub, "ab") do |of|
+          @of = of
+          @opcode_offset = @of.size
 
-        b = proc {
-          yield(self)
-        }
+          write_header(debug_mode, debug_extract, chdir_before, enable_compression, run_in_exe_dir, chdir_to_exe_dir)
+
+          b = proc {
+            yield(self)
+          }
 
-        if enable_compression && LZMA_CMD
-          compress(&b)
-        else
-          b.yield
+          if enable_compression && LZMA_CMD
+            compress(&b)
+          else
+            b.yield
+          end
+
+          write_footer
         end
 
-        write_footer
+        File.rename(stub, path)
+      rescue Exception
+        # The half-written executable sits next to the requested output,
+        # under a name nobody would look for; do not leave it behind.
+        FileUtils.rm_f(stub_tmp)
+        raise
       end
-
-      File.rename(stub, path)
       File.chmod(0755, path) unless WINDOWS
     end
 
@@ -225,8 +255,23 @@ module Ocran
 
       IO.popen(LZMA_CMD, "r+b") do |lzma|
         _of, @of = @of, lzma
-        Thread.new { yield(self); lzma.close_write }
+        writer = Thread.new do
+          # An error is re-raised in the main thread by writer.value below.
+          Thread.current.report_on_exception = false
+          yield(self)
+        ensure
+          # Always end the compressor's input, also when the block raised:
+          # otherwise copy_stream below waits for more output forever.
+          begin
+            lzma.close_write
+          rescue IOError, SystemCallError
+            # The pipe is already closed or broken; the compressor has
+            # nothing more to read either way.
+          end
+        end
         IO.copy_stream(lzma, _of)
+        writer.value
+      ensure
         @of = _of
       end
 

data/lib/ocran/version.rb

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