ocra 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d773c99a0073066c6164194f9244b2a7072d19
-  data.tar.gz: 9879245b7b665fac3cb8ec658a4153934e7dd2ac
+  metadata.gz: 7b774a847e84fd8e197ad630a012bdd3386a4280
+  data.tar.gz: 72df064fe3a99802db7d8c4fd2c1cc14b139db30
 SHA512:
-  metadata.gz: eb0c6eb2fdbf2043301340a2ac6a415b7b4a0f1d6d1d2679eabe3d08e957a4be9bcab949b989145cfc9862ecbedd255d3af1b61dae33c8cdd3a2fc2b31d7727e
-  data.tar.gz: 0c198644eab7b9f23d4d3abdf9627d41859193843a56aad5e2583489c1e1829bccea26a4bc1e6f734ff4a17d29e0ead6bac7c37e138ebb65a0bec300afd13160
+  metadata.gz: a6f7624ec640b24294264231ca05851ea29c0688d96fc835819e90c2ab0fdcd4831eecf4a0be93b65b48198de6192cc12e1d0c96013c45ad4704cee95100baa0
+  data.tar.gz: 5bdf2bc7cfd82acfe37621ac6882a85173ac3f12da805ecacad1cd101ed5891d2d3fb92c1591bf8ba30e1e2467d1ee6b63b4cc36a7d3b82f0b5535f6188a602c

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.3.7
+
+* Workaround for handling of file names and directory name with
+  non-ASCII characters (e.g. "invalid byte sequence in UTF-8")
+
 === 1.3.6
 
 * More robust cleanup of temporary files. Deletes using manual

data/bin/ocra

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
+# encoding: UTF-8
 
 module Ocra
   # Path handling class. Ruby's Pathname class is not used because it
@@ -7,7 +8,7 @@ module Ocra
   # separators.
   class Pathname
     def Pathname.pwd
-      Pathname.new(Dir.pwd)
+      Pathname.new(Dir.pwd.encode('UTF-8'))
     end
 
     def Pathname.pathequal(a, b)
@@ -22,7 +23,7 @@ module Ocra
     ABSOLUTE_PAT = /\A([A-Z]:)?#{SEPARATOR_PAT}/i
 
     def initialize(path)
-      @path = path
+      @path = path && path.encode('UTF-8')
     end
 
     def to_native
@@ -86,7 +87,7 @@ module Ocra
     end
 
     def entries
-      Dir.entries(@path).map { |e| self / e }
+      Dir.entries(@path).map { |e| self / e.encode('UTF-8') }
     end
 
     # Recursively find all files which match a specified regular
@@ -178,7 +179,7 @@ module Ocra
     a.sort.inject([]) { |r, e| r.last == e ? r : r << e }
   end
 
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 
   IGNORE_MODULES = /\/(enumerator.so|rational.so|complex.so|thread.rb)$/
 
@@ -438,7 +439,7 @@ EOF
     end
 
     @options[:files].map! { |path|
-      path = path.tr('\\','/')
+      path = path.encode('UTF-8').tr('\\','/')
       if File.directory?(path)
         # If a directory is passed, we want all files under that directory
         path = "#{path}/**/*"
@@ -655,6 +656,12 @@ EOF
         Ocra.msg "Detected gem #{spec.full_name} (#{include.join(', ')})"
 
         gem_root = Pathname(spec.gem_dir)
+        gem_extension = (gem_root / '..' / '..' / 'extensions').expand
+        if gem_extension.exist?
+          build_complete = gem_extension.find_all_files(/gem.build_complete/).select{|p| p.dirname.basename.to_s == spec.full_name}
+        else
+          build_complete = nil
+        end
         gem_root_files = nil
         files = []
 
@@ -673,7 +680,8 @@ EOF
           when :files
             gem_root_files ||= gem_root.find_all_files(//)
             files << gem_root_files.select { |path| path.relative_path_from(gem_root) !~ GEM_NON_FILE_RE }
-          when :extra
+            files << build_complete if build_complete
+          when :extras
             gem_root_files ||= gem_root.find_all_files(//)
             files << gem_root_files.select { |path| path.relative_path_from(gem_root) =~ GEM_EXTRA_RE }
           when :scripts
@@ -1069,7 +1077,7 @@ EOF
           @files.each do |tgt, src|
             src_escaped = src.to_s.gsub('"', '""')
             target_dir_escaped = Pathname.new(tgt).dirname.to_s.gsub('"', '""')
-            iss << "Source: \"#{src_escaped}\"; DestDir: \"{app}/#{target_dir_escaped}\"\n"
+            iss << "Source: \"#{src_escaped}\"; DestDir: \"{app}/#{target_dir_escaped}\"\n" unless src_escaped =~ IGNORE_MODULES
           end
           iss << "\n"
 

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.3.6'
+  VERSION = '1.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocra
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Lars Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: |-
   OCRA (One-Click Ruby Application) builds Windows executables from Ruby
   source code. The executable is a self-extracting, self-running
@@ -67,7 +67,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
-- ".gemtest"
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -101,10 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby source
   code
-test_files:
-- test/test_ocra.rb
+test_files: []