ocra 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.3.2
+
+* Refactored Gemfile handling for better compatibility with Ruby
+  version.
+
 === 1.3.1
 
 * Now includes $LOADED_FEATURES even when script is not run to check

data/README.rdoc

@@ -16,7 +16,7 @@ any additionally needed ruby libraries or DLL.
 == FEATURES
 
 * LZMA Compression (optional, default on)
-* Ruby 1.9 support
+* Ruby 1.8.7, 1.9.3 and 2.0.0 support
 * Both windowed/console mode supported
 * Includes gems based on usage, or from a Bundler Gemfile
 
@@ -153,9 +153,8 @@ Executable options:
 
 * Windows
 
-* Working Ruby installation, tested with:
-  * One-Click Installer (187_27_rc2)
-  * RubyInstaller (1.8.7p299, 1.9.1p249, 1.9.2p0)
+* Working Ruby installation. Ocra is tested with RubyInstaller
+  1.8.7p374, 1.9.3p545, and 2.0.0p481 (32 and 64 bit).
 
 * MinGW Installation (when working with the source code only)
 
@@ -432,8 +431,8 @@ windowed applications (without console window) from .rbw-files.
 Ruby on Windows provides two executables: ruby.exe is a console mode
 application and rubyw.exe is a windowed application which does not
 bring up a console window when launched using the Windows Explorer.
-By default, or if the "<tt>--console</tt>" option is used, OCRA will use
-the console runtime (rubyw.exe). OCRA will automatically select the
+By default, or if the "<tt>--console</tt>" option is used, OCRA will
+use the console runtime (ruby.exe). OCRA will automatically select the
 windowed runtime when your script has the ".rbw" extension, or if you
 specify the "<tt>--windows</tt>" command line option.
 

data/Rakefile

@@ -3,12 +3,13 @@
 require 'rubygems'
 require 'hoe'
 
-spec = Hoe.spec 'ocra' do |spec|
-  spec.author = "Lars Christensen"
-  spec.email = "larsch@belunktum.dk"
-  spec.readme_file = 'README.rdoc'
-  spec.extra_rdoc_files = ['README.rdoc']
+Hoe.plugin :minitest
+
+spec = Hoe.spec 'ocra' do
+  developer "Lars Christensen", "larsch@belunktum.dk"
+  license "MIT"
 end
+
 spec.urls.each { |url| url.chomp! }
 
 task :build_stub do

data/bin/ocra

@@ -175,7 +175,7 @@ module Ocra
     a.sort.inject([]) { |r, e| r.last == e ? r : r << e }
   end
 
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 
   IGNORE_MODULES = /^enumerator.so$/
 
@@ -545,7 +545,7 @@ EOF
   # file from a gem path.
   def Ocra.find_gem_files(features)
     features_from_gems = []
-    gems = []
+    gems = {}
 
     # If a Bundler Gemfile was provided, add all gems it specifies
     if Ocra.gemfile
@@ -562,7 +562,7 @@ EOF
       ENV['BUNDLE_GEMFILE'] = Ocra.gemfile
       Bundler.load.specs.each do |spec|
         Ocra.verbose_msg "From Gemfile, adding gem #{spec.full_name}"
-        gems << [Pathname(spec.base_dir), spec.full_name]
+        gems[spec.name] ||= spec
       end
 
       unless gems.any?{|dir, name| name =~ /^bundler-[.0-9]+/}
@@ -570,34 +570,46 @@ EOF
         Ocra.verbose_msg "From Gemfile, forcing inclusion of bundler gem itself"
         bundler_spec = Gem.loaded_specs["bundler"]
         bundler_spec or Ocra.fatal_error "Unable to locate bundler gem"
-        gems << [Pathname(bundler_spec.base_dir), bundler_spec.full_name]
+        gems["bundler"] ||= spec
       end
     end
 
     if defined?(Gem)
+      # Include Gems that are loaded
+      Gem.loaded_specs.each { |gemname, spec| gems[gemname] ||= spec }
+      # Fall back to gem detection (loaded_specs are not population on
+      # all Ruby versions)
       features.each do |feature|
+        # Detect load path unless absolute
         if not feature.absolute?
           feature = find_load_path(Pathname($:), feature)
           next if feature.nil? # Could be enumerator.so
         end
+        # Skip if found in known Gem dir
+        if gems.find { |gem, spec| feature.subpath?(spec.gem_dir) }
+          features_from_gems << feature
+          next
+        end
         gempaths = Pathname(Gem.path)
         gempaths.each do |gempath|
           geminstallpath = Pathname(gempath) / "gems"
           if feature.subpath?(geminstallpath)
             gemlocalpath = feature.relative_path_from(geminstallpath)
             fullgemname = gemlocalpath.path.split('/').first
-            gems << [gempath, fullgemname]
-            features_from_gems << feature
+            gemspecpath = gempath / 'specifications' / "#{fullgemname}.gemspec"
+            if spec = Gem::Specification.load(gemspecpath)
+              gems[spec.name] ||= spec
+              features_from_gems << feature
+            else
+              Ocra.warn "Failed to load gemspec for '#{fullgemname}'"
+            end
           end
         end
       end
 
-      gems = sort_uniq(gems)
       gem_files = []
-      gems.each do |gempath, fullgemname|
-        gemspecpath = gempath / 'specifications' / "#{fullgemname}.gemspec"
-        @gemspecs << gemspecpath
-        spec = Gem::Specification.load(gemspecpath)
+      gems.each do |gemname, spec|
+        @gemspecs << Pathname(spec.spec_file) if File.exist?(spec.spec_file)
 
         # Determine which set of files to include for this particular gem
         include = [ :loaded, :files ]
@@ -638,7 +650,7 @@ EOF
 
         Ocra.msg "Detected gem #{spec.full_name} (#{include.join(', ')})"
 
-        gem_root = gempath / "gems" / spec.full_name
+        gem_root = Pathname(spec.gem_dir)
         gem_root_files = nil
         files = []
 

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/test/test_ocra.rb

@@ -1,4 +1,5 @@
-require "test/unit"
+require "minitest/autorun"
+
 require "tmpdir"
 require "fileutils"
 require "rbconfig"
@@ -15,7 +16,7 @@ end
 
 include FileUtils
 
-class TestOcra < Test::Unit::TestCase
+class TestOcra < MiniTest::Test
 
   # Default arguments for invoking OCRA when running tests.
   DefaultArgs = [ '--no-lzma', '--verbose' ]

metadata

@@ -1,67 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ocra
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.3.2
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
 platform: ruby
-authors: 
+authors:
 - Lars Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rdoc
+date: 2014-07-06 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'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 5
-        version: "3.5"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  version_requirements: *id002
-description: |-
-  OCRA (One-Click Ruby Application) 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.
-email: larsch@belunktum.dk
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+description: ! 'OCRA (One-Click Ruby Application) 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.'
+email:
+- larsch@belunktum.dk
+executables:
 - ocra
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.rdoc
-files: 
+files:
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -75,38 +90,32 @@ files:
 - lib/ocra.rb
 - .gemtest
 homepage: http://ocra.rubyforge.org
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: ocra
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
-summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby
 source code
-test_files: 
+summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby source
+  code
+test_files:
 - test/test_ocra.rb