ocra 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.1.1
+
+* Fixed duplicate entries in the RUBYLIB environment variable.
+
+* Another slight fix for relative load paths.
+
+* RUBYOPT is now set to the value it had when OCRA was invoked.
+
 === 1.1.0
 
 * Added an icon to the executable. Can be replaced from a .ico file

data/Rakefile

@@ -8,13 +8,15 @@ Hoe.new('ocra', Ocra::VERSION) do |p|
   p.developer('Lars Christensen', 'larsch@belunktum.dk')
 end
 
-task :stub do
+task :build_stub do
   sh "mingw32-make -C src"
   cp 'src/stub.exe', 'share/ocra/stub.exe'
   cp 'src/stubw.exe', 'share/ocra/stubw.exe'
   cp 'src/edicon.exe', 'share/ocra/edicon.exe'
 end
 
+file 'share/ocra/stub.exe' => :build_stub
+
 task :test => :stub
 
 task :standalone => [ 'bin/ocrasa.rb' ]
@@ -61,6 +63,9 @@ end
 task :clean do
   rm_rf Dir.glob("bin/*.exe")
   sh "mingw32-make -C src clean"
+  rm_f 'share/ocra/stub.exe'
+  rm_f 'share/ocra/stubw.exe'
+  rm_f 'share/ocra/edicon.exe'
 end
 
 task :test_standalone => :standalone do
@@ -69,4 +74,43 @@ task :test_standalone => :standalone do
   ENV['TESTED_OCRA'] = nil
 end
 
+def each_ruby_version
+  root = "h:/appl"
+  Dir.glob(File.join(root, 'ruby-*','bin')).each do |path|
+    path.tr!('/','\\')
+    pathenv = ENV['PATH']
+    ENV['PATH'] = path
+    begin
+      yield
+    ensure
+      ENV['PATH'] = pathenv
+    end
+  end
+end
+
+task :setup_all_ruby do
+  ENV['RUBYOPT'] = nil
+  rubygemszip = "rubygems-1.3.4.zip"
+  rubygemsdir = rubygemszip.gsub(/\.zip$/,'')
+  sh "unzip rubygems-1.3.4.zip"
+  begin
+    cd "rubygems-1.3.4" do
+      each_ruby_version do
+        system("ruby -v")
+        system("ruby setup.rb")
+        system("gem install win32-api")
+      end
+    end
+  ensure
+    rm_rf "rubygems-1.3.4"
+  end
+end
+
+task :test_all_ruby do
+  each_ruby_version do
+    system("ruby -v")
+    system("ruby test/test_ocra.rb")
+  end
+end
+
 # vim: syntax=Ruby

data/bin/ocra.rb

@@ -10,7 +10,7 @@ module Ocra
   OP_DECOMPRESS_LZMA = 4
   OP_SETENV = 5
 
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
   IGNORE_MODULES = /^enumerator.so$/
 
@@ -171,7 +171,7 @@ EOF
 
   def Ocra.find_load_path(paths, path)
     if path[1,1] == ":"
-      rps = paths.map {|p| relative_path(p, path) }
+      rps = paths.map {|p| relative_path(File.expand_path(p), path) }
       rps.zip(paths).sort_by {|x| x[0].size }.first[1]
     else
       candidates = paths.select { |p| File.exist?(File.expand_path(path, p)) }
@@ -292,8 +292,8 @@ EOF
       end
 
       # Set environment variable
-      sb.setenv('RUBYOPT', '')
-      sb.setenv('RUBYLIB', load_path.join(';'))
+      sb.setenv('RUBYOPT', ENV['RUBYOPT'] || '')
+      sb.setenv('RUBYLIB', load_path.uniq.join(';'))
 
       # Launch the script
       sb.createprocess("bin\\" + rubyexe, "#{rubyexe} \xff\\src\\" + Ocra.files[0])
@@ -307,7 +307,7 @@ EOF
     def LibraryDetector.loaded_dlls
       begin
         require 'rubygems'
-        gem 'win32-api', '>=1.4.0'
+        gem 'win32-api', '>=1.2.0'
         require 'win32/api'
       rescue Exception => e
         puts "=== ERROR: Failed to load the win32-api gem. Install win32-api or use --no-autodll."
@@ -435,8 +435,10 @@ if File.basename(__FILE__) == File.basename($0)
   ARGV.clear
   
   at_exit do
-    Ocra.build_exe
-    exit(0)
+    if $!.nil?
+      Ocra.build_exe
+      exit(0)
+    end
   end
 
   puts "=== Loading script to check dependencies" unless Ocra.quiet

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/test/test_ocra.rb

@@ -1,16 +1,36 @@
 require "test/unit"
-require "ocra"
 require "tmpdir"
 require "fileutils"
 require "rbconfig"
+
+begin
+  require "rubygems"
+  gem 'win32-api', '>=1.2.0'
+  require "win32/api"
+  $have_win32_api = true
+rescue LoadError => e
+  $have_win32_api = false
+end
+
 include FileUtils
 
 class TestOcra < Test::Unit::TestCase
 
+  # Default arguments for invoking OCRA when running tests.
   DefaultArgs = [ '--quiet', '--no-lzma' ]
+  DefaultArgs.push '--no-autodll' if not $have_win32_api
 
+  # Name of the tested ocra script.
   TESTED_OCRA = ENV['TESTED_OCRA'] || 'ocra.rb'
 
+  # Root of OCRA.
+  OcraRoot = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  # Path to test fixtures.
+  FixturePath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+
+  attr_reader :ocra
+
   def initialize(*args)
     super(*args)
     @testnum = 0
@@ -18,30 +38,24 @@ class TestOcra < Test::Unit::TestCase
     ENV['RUBYOPT'] = ""
   end
 
-  def ocra
-    @ocra
-  end
-
-  OcraRoot = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  FixturePath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
-
   # Sets up an directory with a copy of a fixture and yields to the
   # block, then cleans up everything. A fixture here is a hierachy of
   # files located in test/fixtures.
   def with_fixture(name)
     path = File.join(FixturePath, name)
-    FileUtils.cp_r path, '.'
+    cp_r path, '.'
     begin
       cd name do
         yield
       end
     ensure
-      rm_rf 'name'
+      rm_rf name
     end
   end
 
-  # Sets up temporary environment variable and yields to the block.
+  # Sets up temporary environment variables and yields to the
+  # block. When the block exits, the environment variables are set
+  # back to their original values.
   def with_env(hash)
     old = {}
     hash.each do |k,v|
@@ -57,6 +71,8 @@ class TestOcra < Test::Unit::TestCase
     end
   end
   
+  # Test setup method. Creates a tempory directory to work in and
+  # changes to it. 
   def setup
     @testnum += 1
     @tempdirname = ".ocratest-#{$$}-#{@testnum}"
@@ -64,11 +80,13 @@ class TestOcra < Test::Unit::TestCase
     Dir.chdir @tempdirname
   end
 
+  # Test cleanup method. Exits the temporary directory and deletes it.
   def teardown
     Dir.chdir '..'
     FileUtils.rm_rf @tempdirname
   end
-  
+
+  # Hello world test. Test that we can build and run executables.
   def test_helloworld
     with_fixture 'helloworld' do
       assert system("ruby", ocra, "helloworld.rb", *DefaultArgs)
@@ -77,6 +95,8 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that executables can writing a file to the current working
+  # directory.
   def test_writefile
     with_fixture 'writefile' do
       assert system("ruby", ocra, "writefile.rb", *DefaultArgs)
@@ -87,6 +107,7 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that scripts can exit with a specific exit status code.
   def test_exitstatus
     with_fixture 'exitstatus' do
       assert system("ruby", ocra, "exitstatus.rb", *DefaultArgs)
@@ -95,6 +116,7 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that arguments are passed correctly to scripts.
   def test_arguments
     with_fixture 'arguments' do
       assert system("ruby", ocra, "arguments.rb", *DefaultArgs)
@@ -104,6 +126,8 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that the standard output from a script can be redirected to a
+  # file.
   def test_stdout_redir
     with_fixture 'stdoutredir' do
       assert system("ruby", ocra, "stdoutredir.rb", *DefaultArgs)
@@ -114,6 +138,8 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that the standard input to a script can be redirected from a
+  # file.
   def test_stdin_redir
     with_fixture 'stdinredir' do
       assert system("ruby", ocra, "stdinredir.rb", *DefaultArgs)
@@ -123,9 +149,19 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that executables can include dll's using the --dll
+  # option. Sets PATH=. while running the executable so that it can't
+  # find the DLL from the Ruby installation.
   def test_gdbmdll
+    args = DefaultArgs.dup
+    if not $have_win32_api
+      gdbmdll = Dir.glob(File.join(RbConfig::CONFIG['bindir'], 'gdbm*.dll'))[0]
+      return if gdbmdll.nil?
+      args.push '--dll', File.basename(gdbmdll)
+    end
+    
     with_fixture 'gdbmdll' do
-      assert system("ruby", ocra, "gdbmdll.rb", *DefaultArgs)
+      assert system("ruby", ocra, "gdbmdll.rb", *args)
       with_env 'PATH' => '.' do
         system("gdbmdll.exe")
         assert_equal 104, $?.exitstatus
@@ -133,6 +169,9 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that scripts can require a file relative to the location of
+  # the script and that such files are correctly added to the
+  # executable.
   def test_relative_require
     with_fixture 'relativerequire' do
       assert system("ruby", ocra, "relativerequire.rb", *DefaultArgs)
@@ -158,7 +197,9 @@ class TestOcra < Test::Unit::TestCase
   # ignored by Ocra (a warning may be logged).
   def test_autoload_missing
     with_fixture 'autoloadmissing' do
-      assert system("ruby", ocra, "autoloadmissing.rb", *DefaultArgs)
+      args = DefaultArgs.dup
+      args.push '--no-warnings'
+      assert system("ruby", ocra, "autoloadmissing.rb", *args)
       assert File.exist?("autoloadmissing.exe")
       assert system("autoloadmissing.exe")
     end
@@ -251,10 +292,12 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that ocra.rb accepts --version and outputs the version number.
   def test_version
     assert_match(/^Ocra \d+(\.\d)+$/, `ruby #{ocra} --version`)
   end
 
+  # Test that ocra.rb accepts --icon.
   def test_icon
     with_fixture 'helloworld' do
       icofile = File.join(OcraRoot, 'src', 'vit-ruby.ico')
@@ -264,6 +307,8 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Test that additional non-script files can be added to the
+  # executable and used by the script.
   def test_resource
     with_fixture 'resource' do
       assert system("ruby", ocra, "resource.rb", "resource.txt", "res/resource.txt", *DefaultArgs)
@@ -271,5 +316,25 @@ class TestOcra < Test::Unit::TestCase
       assert system("resource.exe")
     end
   end
-end
 
+  # Test that when exceptions are thrown, no executable will be built.
+  def test_exception
+    with_fixture 'exception' do
+      system("ruby \"#{ocra}\" exception.rb #{DefaultArgs.join(' ')} 2>NUL")
+      assert $?.exitstatus != 0
+      assert !File.exist?("exception.exe")
+    end
+  end
+
+  # Test that the RUBYOPT environment variable is preserved.
+  def test_rubyopt
+    with_fixture 'environment' do
+      with_env "RUBYOPT" => "-rtime" do
+        assert system("ruby", ocra, "environment.rb", *DefaultArgs)
+        assert system("environment.exe")
+        env = Marshal.load(File.open("environment", "rb") { |f| f.read })
+        assert_equal "-rtime", env['RUBYOPT']
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ocra
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Lars Christensen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 +02:00
+date: 2009-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.10.0
+        version: 1.12.2
     version: 
 description: |-
   OCRA (One-Click Ruby Application) builds Windows executables from Ruby
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ocra
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby source code