ocra 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.3.4
+
+* Workarounds for Ruby 2.1.5
+
 === 1.3.3
 
 * Rebuild executables with MinGW GCC 4.8.1-4.

data/README.rdoc

@@ -1,8 +1,6 @@
 = ocra
 
-* http://ocra.rubyforge.org
-* RubyForge project page: http://rubyforge.org/projects/ocra
-* GitHub: http://github.com/larsch/ocra
+* https://github.com/larsch/ocra/
 * Issue tracker: http://github.com/larsch/ocra/issues
 * Google Group: http://groups.google.com/group/ruby-ocra
 
@@ -16,7 +14,7 @@ any additionally needed ruby libraries or DLL.
 == FEATURES
 
 * LZMA Compression (optional, default on)
-* Ruby 1.8.7, 1.9.3 and 2.0.0 support
+* Ruby 1.8.7, 1.9.3, 2.0.0 and 2.1.5 support
 * Both windowed/console mode supported
 * Includes gems based on usage, or from a Bundler Gemfile
 

data/bin/ocra

@@ -175,9 +175,9 @@ module Ocra
     a.sort.inject([]) { |r, e| r.last == e ? r : r << e }
   end
 
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 
-  IGNORE_MODULES = /^enumerator.so$/
+  IGNORE_MODULES = /\/(enumerator.so|thread.rb)$/
 
   GEM_SCRIPT_RE = /\.rbw?$/
   GEM_EXTRA_RE = %r{(
@@ -468,8 +468,8 @@ EOF
         mod.constants.each do |const|
           # Module::Config causes warning on Ruby 1.9.3 - prevent autoloading
           next if Module === mod && const == :Config
-
           if mod.autoload?(const)
+            Ocra.msg "Attempting to trigger autoload of #{mod}::#{const}"
             begin
               mod.const_get(const)
             rescue NameError
@@ -608,6 +608,7 @@ EOF
       end
 
       gem_files = []
+
       gems.each do |gemname, spec|
         @gemspecs << Pathname(spec.spec_file) if File.exist?(spec.spec_file)
 
@@ -654,6 +655,11 @@ EOF
         gem_root_files = nil
         files = []
 
+        unless gem_root.directory?
+          Ocra.warn "Gem #{spec.full_name} root folder was not found, skipping"
+          next
+        end
+
         # Find the selected files
         include.each do |set|
           case set
@@ -700,7 +706,7 @@ EOF
 
     restore_environment
 
-    # If the script was ran, then detect the features it used
+    # If the script was run, then detect the features it used
     if Ocra.run_script
       # Attempt to autoload libraries before doing anything else.
       attempt_load_autoload if Ocra.load_autoload
@@ -709,7 +715,6 @@ EOF
     # Store the currently loaded files (before we require rbconfig for
     # our own use).
     features = $LOADED_FEATURES.map { |feature| Pathname(feature) }
-    features.delete_if { |feature| feature =~ IGNORE_MODULES }
 
     # Find gemspecs to include
     if defined?(Gem)
@@ -864,7 +869,11 @@ EOF
         if file.directory?
           sb.ensuremkdir(target)
         else
-          sb.createfile(file, target)
+          begin
+            sb.createfile(file, target)
+          rescue Errno::ENOENT
+            raise unless file =~ IGNORE_MODULES
+          end
         end
       end
 

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/test/test_ocra.rb

@@ -217,8 +217,8 @@ class TestOcra < MiniTest::Test
   def test_output_option
     with_fixture 'helloworld' do
       assert system("ruby", ocra, "helloworld.rb", *(DefaultArgs + ["--output", "goodbyeworld.exe"]))
-      assert !File.exists?("helloworld.exe")
-      assert File.exists?("goodbyeworld.exe")
+      assert !File.exist?("helloworld.exe")
+      assert File.exist?("goodbyeworld.exe")
     end
   end
 

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ocra
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
+  prerelease: 
 platform: ruby
 authors:
 - Lars Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,17 +46,19 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 description: ! 'OCRA (One-Click Ruby Application) builds Windows executables from
   Ruby
 
@@ -70,22 +77,21 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
-- .gemtest
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - bin/ocra
-- lib/ocra.rb
-- share/ocra/edicon.exe
 - share/ocra/lzma.exe
 - share/ocra/stub.exe
 - share/ocra/stubw.exe
+- share/ocra/edicon.exe
 - test/test_ocra.rb
-homepage: http://ocra.rubyforge.org
+- lib/ocra.rb
+- .gemtest
+homepage: https://github.com/larsch/ocra/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -93,20 +99,22 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 1.8.30
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby source
   code
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2E2OWRhMzRkMWI0NzA4OWIzNzIzNDNkYjE4OWNhMzRiNDk5ZGJlZQ==
-  data.tar.gz: !binary |-
-    ZGZiMGZmNTJjMmJjZmNiZWE0NWQxMTUxNzEzZWZkMDRkOTRlYThlMQ==
-SHA512:
-  metadata.gz: !binary |-
-    NmRhYTA1NDU5OGY1OWEwNGZiMjYzODcyMGY3MmRlY2RkMWU1ZWQ1MjI3YjEy
-    MDFiY2ViMDU1MGVlNTA2NjA3MDFhYWI4MTI3ZmRiYjdhNjYzNDMzYjQ4NzI1
-    Y2IzMjljNTY2Yzk5OGUwNGYyYzM1MDdmN2ZhMTU5YzZkN2ZiNjk=
-  data.tar.gz: !binary |-
-    NjM2ZmJkYzhmZGMyOWFhZTcxZGM3NDE5MjliMzk1YjFmY2U1ZDRkYzNhYzBl
-    ZGJkMThlMGMyZTI0MmVjMTUyMjI3YTdkNDY3OGE4YTQ1MGU3ZTMyZTNhZTk4
-    ZmZkNzI4Y2QyYmZkNmYzYmZmOWNlYzBiNDJjODQ4NGQwMTczOTY=