ocra 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,16 @@
+=== 1.3.1
+
+* Now includes $LOADED_FEATURES even when script is not run to check
+  dependencies. This fixes compatability with Ruby 1.9.3 where
+  rubygems is always loaded.
+
+* Fixed compatability with Ruby 2.0.0: Temp-path alias in binary
+  changed to be valid UTF-8 character.
+
+* README.txt updated related to --no-dep-run (karhatsu).
+
+* Fixes for Bundler handling (DavidMikeSimon).
+
 === 1.3.0
 
 * Fixed some additional corner cases with absolute and relative

data/README.rdoc

@@ -1,6 +1,6 @@
 = ocra
 
-* Homepage: http://ocra.rubyforge.org
+* http://ocra.rubyforge.org
 * RubyForge project page: http://rubyforge.org/projects/ocra
 * GitHub: http://github.com/larsch/ocra
 * Issue tracker: http://github.com/larsch/ocra/issues
@@ -236,8 +236,12 @@ use other means to specify what needs to be packaged with your app.
 
 To disable automatic dependency resolution, use the --no-dep-run
 option; with it, Ocra will skip executing your program during the
-build process. You will also probably need to use the --add-all-core
-option to include the Ruby core libraries.
+build process. This on the other hand requires using --gem-full option
+(see more below); otherwise Ocra will not include all the necessary
+files for the gems.
+
+You will also probably need to use the --add-all-core option to
+include the Ruby core libraries.
 
 If your app uses gems, then you can specify them in a
 Bundler (http://gembundler.com) Gemfile, then use the --gemfile
@@ -254,7 +258,7 @@ actually running the app during the build, you could use the
 following command:
 
   ocra someapp/script/rails someapp --output someapp.exe --add-all-core \
-  --gemfile someapp/Gemfile --no-dep-run --chdir-first -- server
+  --gemfile someapp/Gemfile --no-dep-run --gem-full --chdir-first -- server
 
 Note the space between "--" and "server"! It's important; "server" is an argument to be passed to rails when the script is ran.
 
@@ -315,7 +319,7 @@ app into an installer. Save the following as "<tt>someapp.iss</tt>":
 Then, run Ocra with this command:
 
   ocra someapp/script/rails someapp --output someapp.exe --add-all-core \
-  --gemfile someapp/Gemfile --no-dep-run --chdir-first --no-lzma \
+  --gemfile someapp/Gemfile --no-dep-run --gem-full --chdir-first --no-lzma \
   --innosetup someapp.iss -- server
 
 If all goes well, a file named "SomeAppInstaller.exe" will be placed

data/Rakefile

@@ -3,13 +3,13 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.spec 'ocra' do |spec|
+spec = Hoe.spec 'ocra' do |spec|
   spec.author = "Lars Christensen"
   spec.email = "larsch@belunktum.dk"
-  spec.url = "http://ocra.rubyforge.org/"
   spec.readme_file = 'README.rdoc'
   spec.extra_rdoc_files = ['README.rdoc']
 end
+spec.urls.each { |url| url.chomp! }
 
 task :build_stub do
   sh "mingw32-make -C src"
@@ -19,6 +19,8 @@ task :build_stub do
 end
 
 file 'share/ocra/stub.exe' => :build_stub
+file 'share/ocra/stubw.exe' => :build_stub
+file 'share/ocra/edicon.exe' => :build_stub
 
 task :test => :build_stub
 
@@ -41,7 +43,7 @@ file 'bin/ocrasa.rb' => [ 'bin/ocra', 'share/ocra/stub.exe', 'share/ocra/stubw.e
   cp 'bin/ocra', 'bin/ocrasa.rb'
   File.open("bin/ocrasa.rb", "a") do |f|
     f.puts "__END__"
-    
+
     stub = File.open("share/ocra/stub.exe", "rb") {|g| g.read}
     stub64 = [stub].pack("m")
     f.puts stub64.size
@@ -51,7 +53,7 @@ file 'bin/ocrasa.rb' => [ 'bin/ocra', 'share/ocra/stub.exe', 'share/ocra/stubw.e
     stub64 = [stub].pack("m")
     f.puts stub64.size
     f.puts stub64
-    
+
     lzma = File.open("share/ocra/lzma.exe", "rb") {|g| g.read}
     lzma64 = [lzma].pack("m")
     f.puts lzma64.size

data/bin/ocra

@@ -17,15 +17,15 @@ module Ocra
     attr_reader :path
     SEPARATOR_PAT = /[#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}]/ # }
     ABSOLUTE_PAT = /\A([A-Z]:)?#{SEPARATOR_PAT}/i
-    
+
     def initialize(path)
       @path = path
     end
-    
+
     def to_native
       @path.tr File::SEPARATOR, File::ALT_SEPARATOR
     end
-    
+
     def to_posix
       @path.tr File::ALT_SEPARATOR, File::SEPARATOR
     end
@@ -65,7 +65,7 @@ module Ocra
         Ocra.Pathname(@path + '/' + other.path)
       end
     end
-    
+
     def append_to_filename!(s)
       @path.sub!(/(\.[^.]*?|)$/) { s.to_s + $1 }
     end
@@ -138,7 +138,7 @@ module Ocra
       raise ArgumentError, obj
     end
   end
-  
+
   # Variables describing the host's build environment.
   module Host
     class << self
@@ -161,7 +161,7 @@ module Ocra
         @rubyw_exe ||= (RbConfig::CONFIG['rubyw_install_name'] || "rubyw") + exeext
       end
       def ruby_exe
-        @ruby_exe ||= (RbConfig::CONFIG['ruby_install_name'] || "ruby") + exeext     
+        @ruby_exe ||= (RbConfig::CONFIG['ruby_install_name'] || "ruby") + exeext
       end
       def tempdir
         @tempdir ||= Ocra.Pathname(ENV['TEMP'])
@@ -174,8 +174,8 @@ module Ocra
   def self.sort_uniq(a)
     a.sort.inject([]) { |r, e| r.last == e ? r : r << e }
   end
-  
-  VERSION = "1.3.0"
+
+  VERSION = "1.3.1"
 
   IGNORE_MODULES = /^enumerator.so$/
 
@@ -192,11 +192,11 @@ module Ocra
     # Unlikely extensions
     \.(rdoc|c|cpp|c\+\+|cxx|h|hxx|hpp|obj|o|a)$/
   )}xi
-  
+
   GEM_NON_FILE_RE = /(#{GEM_EXTRA_RE}|#{GEM_SCRIPT_RE})/
 
   # Alias for the temporary directory where files are extracted.
-  TEMPDIR_ROOT = Pathname.new("\xFF")
+  TEMPDIR_ROOT = Pathname.new("|")
   # Directory for source files in temporary directory.
   SRCDIR = Pathname.new('src')
   # Directory for Ruby binaries in temporary directory.
@@ -409,7 +409,11 @@ EOF
         puts usage
         exit 0
       else
-        @options[:files] << arg
+        if __FILE__.respond_to?(:encoding)
+          @options[:files] << arg.dup.force_encoding(__FILE__.encoding)
+        else
+          @options[:files] << arg
+        end
       end
     end
 
@@ -462,6 +466,9 @@ EOF
       modules_to_check.each do |mod|
         modules_checked[mod] = true
         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)
             begin
               mod.const_get(const)
@@ -497,7 +504,7 @@ EOF
       candidates.sort_by { |loadpath| loadpath.path.size }.last
     end
   end
-  
+
   # Find the root of all files specified on the command line and use
   # it as the "src" of the output.
   def Ocra.find_src_root(files)
@@ -554,7 +561,16 @@ EOF
 
       ENV['BUNDLE_GEMFILE'] = Ocra.gemfile
       Bundler.load.specs.each do |spec|
-        gems << [Pathname(spec.installation_path), spec.full_name]
+        Ocra.verbose_msg "From Gemfile, adding gem #{spec.full_name}"
+        gems << [Pathname(spec.base_dir), spec.full_name]
+      end
+
+      unless gems.any?{|dir, name| name =~ /^bundler-[.0-9]+/}
+        # Bundler itself wasn't added for some reason, let's put it in directly
+        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]
       end
     end
 
@@ -664,26 +680,25 @@ EOF
     features_from_gems -= gem_files
     return gem_files, features_from_gems
   end
-  
+
   def Ocra.build_exe
     all_load_paths = $LOAD_PATH.map { |loadpath| Pathname(loadpath).expand }
     @added_load_paths = ($LOAD_PATH - @load_path_before).map { |loadpath| Pathname(loadpath).expand }
     working_directory = Pathname.pwd.expand
 
     restore_environment
-      
-    features = []
-    # If the script was ran, then detect the features it used 
+
+    # If the script was ran, 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
-
-      # 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 }
     end
 
+    # 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)
       @gemspecs = Gem.loaded_specs.map { |name,info| Pathname(info.loaded_from) }
@@ -733,7 +748,7 @@ EOF
           feature = feature.relative_path_from(path.expand)
         end
         fullpath = feature.expand(path)
-        
+
         if fullpath.subpath?(Host.exec_prefix)
           # Features found in the Ruby installation are put in the
           # temporary Ruby installation.
@@ -863,13 +878,13 @@ EOF
         end
         sb.createfile(dll, target)
       end
-      
+
       # Add extra DLLs specified on the command line
       Ocra.extra_dlls.each do |dll|
         Ocra.msg "Adding supplied DLL #{dll}"
         sb.createfile(Host.bindir / dll, BINDIR / dll)
       end
-      
+
       # Add gemspec files
       @gemspecs = sort_uniq(@gemspecs)
       @gemspecs.each do |gemspec|
@@ -926,7 +941,7 @@ EOF
         bytes_needed = bytes_needed_buffer.unpack("I")[0]
         break if bytes_needed <= module_handle_buffer.size
       end
-      
+
       handles = module_handle_buffer.unpack("I*")
       handles.select { |handle| handle > 0 }.map do |handle|
         str = "\x00" * 256
@@ -1047,10 +1062,10 @@ EOF
           result = system(*iscc_cmd)
           if not result
             case $?
-              when 0 then raise RuntimeError.new("ISCC reported success, but system reported error?")
-              when 1 then raise RuntimeError.new("ISCC reports invalid command line parameters")
-              when 2 then raise RuntimeError.new("ISCC reports that compilation failed")
-              else raise RuntimeError.new("ISCC failed to run. Is the InnoSetup directory in your PATH?")
+            when 0 then raise RuntimeError.new("ISCC reported success, but system reported error?")
+            when 1 then raise RuntimeError.new("ISCC reports invalid command line parameters")
+            when 2 then raise RuntimeError.new("ISCC reports that compilation failed")
+            else raise RuntimeError.new("ISCC failed to run. Is the InnoSetup directory in your PATH?")
             end
           end
         rescue Exception => e
@@ -1120,9 +1135,9 @@ EOF
     def showtempdir(x)
       x.to_s.gsub(TEMPDIR_ROOT, "<tempdir>")
     end
-    
+
   end # class OcraBuilder
-  
+
 end # module Ocra
 
 if File.basename(__FILE__) == File.basename($0)
@@ -1132,7 +1147,7 @@ if File.basename(__FILE__) == File.basename($0)
   if not Ocra.files.first.exist?
     Ocra.fatal_error "#{Ocra.files[0]} was not found!"
   end
-  
+
   at_exit do
     if $!.nil? or $!.kind_of?(SystemExit)
       Ocra.build_exe

data/lib/ocra.rb

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

data/test/test_ocra.rb

@@ -9,7 +9,7 @@ begin
   gem 'win32-api', '>=1.2.0'
   require "win32/api"
   $have_win32_api = true
-rescue LoadError => e
+rescue LoadError
   $have_win32_api = false
 end
 
@@ -18,7 +18,7 @@ include FileUtils
 class TestOcra < Test::Unit::TestCase
 
   # Default arguments for invoking OCRA when running tests.
-  DefaultArgs = [ '--no-lzma' ]
+  DefaultArgs = [ '--no-lzma', '--verbose' ]
   DefaultArgs << "--quiet" unless ENV["OCRA_VERBOSE_TEST"]
   DefaultArgs.push '--no-autodll' if not $have_win32_api
 
@@ -42,6 +42,11 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  def system(*args)
+    puts args.join(" ") if ENV["OCRA_VERBOSE_TEST"]
+    Kernel.system(*args)
+  end
+
   attr_reader :ocra
 
   def initialize(*args)
@@ -140,7 +145,7 @@ class TestOcra < Test::Unit::TestCase
       end
     end
   end
-  
+
   # Test that executables can writing a file to the current working
   # directory.
   def test_writefile
@@ -188,7 +193,7 @@ class TestOcra < Test::Unit::TestCase
   # be automatically included and usable in packaged app
   def test_gemfile
     with_fixture 'bundlerusage' do
-      assert system("ruby", ocra, "bundlerusage.rb", "Gemfile", *(DefaultArgs + ["--no-dep-run", "--add-all-core", "--gemfile", "Gemfile"]))
+      assert system("ruby", ocra, "bundlerusage.rb", "Gemfile", *(DefaultArgs + ["--no-dep-run", "--add-all-core", "--gemfile", "Gemfile", "--gem-all"]))
       pristine_env "bundlerusage.exe" do
         assert system("bundlerusage.exe")
       end
@@ -288,7 +293,7 @@ class TestOcra < Test::Unit::TestCase
       end
     end
   end
-  
+
   # Test that the standard output from a script can be redirected to a
   # file.
   def test_stdout_redir
@@ -327,7 +332,7 @@ class TestOcra < Test::Unit::TestCase
       return if gdbmdll.nil?
       args.push '--dll', File.basename(gdbmdll)
     end
-    
+
     with_fixture 'gdbmdll' do
       assert system("ruby", ocra, "gdbmdll.rb", *args)
       with_env 'PATH' => '.' do
@@ -449,7 +454,7 @@ class TestOcra < Test::Unit::TestCase
       end
     end
   end
-  
+
   # Should pick up file when script modifies $LOAD_PATH by adding
   # dirname of script.
   def test_loadpath_mangling_dirname
@@ -506,7 +511,7 @@ class TestOcra < Test::Unit::TestCase
       end
     end
   end
-  
+
   # Test that ocra.rb accepts --version and outputs the version number.
   def test_version
     assert_match(/^Ocra \d+(\.\d)+(.[a-z]+\d+)?$/, `ruby \"#{ocra}\" --version`)
@@ -685,14 +690,14 @@ class TestOcra < Test::Unit::TestCase
   # Test that the --chdir-first option changes directory before exe starts script
   def test_chdir_first
     with_fixture 'writefile' do
-      # Control test; make sure the writefile script works as expected under default options 
+      # Control test; make sure the writefile script works as expected under default options
       assert system("ruby", ocra, "writefile.rb", *(DefaultArgs))
       pristine_env "writefile.exe" do
         assert !File.exist?("output.txt")
         assert system("writefile.exe")
         assert File.exist?("output.txt")
       end
-      
+
       assert system("ruby", ocra, "writefile.rb", *(DefaultArgs + ["--chdir-first"]))
       pristine_env "writefile.exe" do
         assert !File.exist?("output.txt")
@@ -717,6 +722,7 @@ class TestOcra < Test::Unit::TestCase
   end
 
   def test_explicit_in_exec_prefix
+    return unless File.directory?(RbConfig::CONFIG["exec_prefix"] + "/include")
     path = File.join(RbConfig::CONFIG["exec_prefix"], "include", "**", "*.h")
     number_of_files = Dir[path].size
     assert number_of_files > 3
@@ -728,5 +734,20 @@ class TestOcra < Test::Unit::TestCase
       end
     end
   end
-  
+
+  # Hello world test. Test that we can build and run executables.
+  def test_nonexistent_temp
+    with_fixture 'helloworld' do
+      assert system("ruby", ocra, "helloworld.rb", *DefaultArgs)
+      assert File.exist?("helloworld.exe")
+      pristine_env "helloworld.exe" do
+        with_env "TEMP" => "c:\\thispathdoesnotexist12345", "TMP" => "c:\\thispathdoesnotexist12345" do
+          assert File.exist?("helloworld.exe")
+          system("helloworld.exe 2>NUL")
+          assert File.exist?("helloworld.exe")
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,40 +1,67 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ocra
-version: !ruby/object:Gem::Version
-  version: 1.3.0
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
-authors:
+authors: 
 - Lars Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-19 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &7397928 !ruby/object:Gem::Requirement
+
+date: 2013-03-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.9.4
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: *7397928
-description: ! "OCRA (One-Click Ruby Application) builds Windows executables from
-  Ruby\r\nsource code. The executable is a self-extracting, self-running\r\nexecutable
-  that contains the Ruby interpreter, your source code and\r\nany additionally needed
-  ruby libraries or DLL."
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 5
+        version: "3.5"
+  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:
+executables: 
 - ocra
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
-files:
+files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -47,32 +74,39 @@ files:
 - test/test_ocra.rb
 - lib/ocra.rb
 - .gemtest
-homepage: http://ocra.rubyforge.org/
+homepage: http://ocra.rubyforge.org
 licenses: []
+
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: ocra
-rubygems_version: 1.8.4
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: ! "OCRA (One-Click Ruby Application) builds Windows executables from Ruby\r
-  source code"
-test_files:
+summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby
 source code
+test_files: 
 - test/test_ocra.rb