ocra 1.0.3 → 1.1.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.1.0
+
+* Added an icon to the executable. Can be replaced from a .ico file
+  using the --icon <ico> option.
+
+* Improved handling of load paths added either from the command line
+  (ruby -I), RUBYLIB environment variable or during the script (by
+  modifying $: or $LOAD_PATH).
+
+* Now automatically detects loaded DLLs through Win32::API. Disable
+  with --no-autodll.
+
 === 1.0.3 / 2009-05-25
 
 * Fixed invokation of executables with spaces in path names (#25966).
@@ -21,4 +33,3 @@
 * 1 major enhancement
 
   * Birthday!
-

data/Manifest.txt

@@ -6,5 +6,6 @@ bin/ocra.rb
 share/ocra/lzma.exe
 share/ocra/stub.exe
 share/ocra/stubw.exe
+share/ocra/edicon.exe
 test/test_ocra.rb
 lib/ocra.rb

data/README.txt

@@ -18,6 +18,11 @@ any additionally needed ruby libraries or DLL.
 * Both console programs and desktop programs supported (no console will
   pop up with .rbw files).
 
+If you experience problems with Ocra or have found a bug, please use
+the tracker on the RubyForge project page
+http://rubyforge.org/projects/ocra/. You are welcome to ask questions
+in the forums there aswell.
+
 == TODO:
 
 * Clean up using manual recursive deletion (not SHop).
@@ -32,16 +37,18 @@ ocra.rb [option] your/script.rb
 * Your program should 'require' all necessary files when invoked without
   arguments, so ocra can detect all dependencies.
 
-* Autoloaded constants (e.g. modules and classes) should work. Ocra
-  attempts to load all autoload definitions.
+* Ocra executables clear the RUBYLIB environment variable but set
+  RUBYOPT to whatever value it had when you invoked Ocra.
 
 * Ocra does not set up the include path. Use "$:.unshift
   File.dirname(__FILE__)" at the start of your script if you need to
   'require' additional source files in the same directory no matter
   what the user's current working directory is.
 
-* DLLs needs to be added manually (e.g. sqlite3.dll, gdbm.dll,
-  etc.). Use the --dll option.
+* Loaded DLLs are detected automatically but only those located in
+  your Ruby installation are included. Automatic detection can be
+  disabled using --no-autodll. DLLs can be manually added using the
+  --dll option.
 
 == REQUIREMENTS:
 
@@ -57,29 +64,96 @@ ocra.rb [option] your/script.rb
 
 Can also be downloaded from http://rubyforge.org/frs/?group_id=8185
 
-== Stand-alone
+=== Stand-alone
 
 Get ocrasa.rb from http://rubyforge.org/frs/?group_id=8185. Requires
 nothing but a working Ruby installation on Windows.
 
 == TECHNICAL DETAILS
 
-The Ocra stub extracts the contents into a temporary directory
-(Windows' default temporary directory). The directory will contains
-the same directory layout as your Ruby installlation. The source files
-for your application will be put in the 'src' subdirectory.
+The Ocra stub extracts the Ruby interpreter and your scripts into a
+temporary directory. The directory will contains the same directory
+layout as your Ruby installlation. The source files for your
+application will be put in the 'src' subdirectory.
+
+=== Libraries
+
+Rubygems will be automatically included in the Ocra executable.
 
 Libraries found in non-standard path (for example, if you invoke Ocra
 with "ruby -I some/path") will be placed into the site dir
-(lib/ruby/site_ruby).
+(lib/ruby/site_ruby). Avoid changing $LOAD_PATH / $: from your script
+to include paths outside your source tree.
 
-The RUBYOPT and RUBYLIB variables are cleared before your program is
-launched by the executable in order not to interfere with any Ruby
-installation on the end user's installation.
-
-Autoloaded constants will be attempted loaded when building the
+Autoloaded libraries will be attempted loaded when building the
 executable. Modules that doesn't exist will be ignore (but a warning
-will be logged.)
+will be logged).
+
+=== Environment variables
+
+Ocra executables clear the RUBYLIB environment variable before your
+script is launched. This is done to ensure that your script does not
+use load paths from the end user's Ruby installation.
+
+Ocra executables set the RUBYOPT environment variable to the value it
+had when you invoked Ocra. For example, if you had "RUBYOPT=rubygems"
+on your build PC, Ocra ensures that it is also set on PC's running the
+executables.
+
+=== Working directory
+
+You should not assume that the current working directory when invoking
+an executable built with .exe is the location of the source script. It
+can be the directory where the executable is placed (when invoked
+through the Windows Explorer), the users' current working directory
+(when invoking from the Command Prompt), or even C:\WINDOWS\SYSTEM32
+when the executable is invoked through a file association. You can
+optionally change the directory yourself:
+
+   Dir.chdir File.dirname(__FILE__)
+
+If you wish to maintain the user's working directory, but need to
+'require' additional Ruby scripts from the source directory, you can
+add the following line to your script:
+
+   $LOAD_PATH.unshift File.dirname(__FILE__)
+
+=== $LOAD_PATH/$: mangling
+
+Adding paths to $LOAD_PATH or $: at runtime is not recommended. Adding
+relative load paths depends on the working directory being the same as
+where the script is located (See above). If you have additional
+library files in directories below the directory containing your
+source script you can use this idiom:
+
+   $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'path/to/script')
+
+=== Detecting OCRA
+
+You can detect whether Ocra is currently building your script by
+looking for the 'Ocra' constant. If it is defined, Ocra is currenly
+building the executable from your script. For example, you can use
+this to avoid opening a GUI window when compiling executables:
+
+   app = MyApp.new
+   if not defined?(Ocra)
+     app.main_loop
+   end
+
+=== Additional files and resources
+
+You can add additional files to the Ocra executable (for example
+images) by appending them to the command line. They should be placed
+in the source directory with your main script (or a subdirectory).
+
+   ocra.rb mainscript.rb someimage.jpeg docs/document.txt
+
+This will create the following layout in the temporary directory when
+your program is executed:
+
+   src/mainscript.rb
+   src/someimage.jpeg
+   src/docs/document.txt
 
 == CREDITS:
 
@@ -88,6 +162,9 @@ source code used was place into Public Domain by Igor Pavlov.
 
 Erik Veenstra for rubyscript2exe which provided inspiration.
 
+Dice for the default .exe icon (vit-ruby.ico,
+http://ruby.morphball.net/vit-ruby-ico_en.html)
+
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'hoe'
-require './lib/ocra.rb'
+require 'bin/ocra'
 
 Hoe.new('ocra', Ocra::VERSION) do |p|
   p.developer('Lars Christensen', 'larsch@belunktum.dk')
@@ -12,17 +12,26 @@ task :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
 
 task :test => :stub
 
 task :standalone => [ 'bin/ocrasa.rb' ]
 
-task :release_standalone => :standalone do
-  sh "rubyforge add_release ocra ocra-standalone #{Ocra::VERSION} bin/ocrasa.rb"
+standalone_zip = "bin/ocrasa-#{ENV['VERSION']}.zip"
+
+file standalone_zip => 'bin/ocrasa.rb' do
+  chdir('bin') do
+    system("zip ocrasa-#{ENV['VERSION']}.zip ocrasa.rb")
+  end
+end
+
+task :release_standalone => standalone_zip do
+  sh "rubyforge add_release ocra ocra-standalone #{Ocra::VERSION} #{standalone_zip}"
 end
 
-file 'bin/ocrasa.rb' => [ 'bin/ocra.rb', 'share/ocra/stub.exe', 'share/ocra/stubw.exe', 'share/ocra/lzma.exe' ] do
+file 'bin/ocrasa.rb' => [ 'bin/ocra.rb', 'share/ocra/stub.exe', 'share/ocra/stubw.exe', 'share/ocra/lzma.exe', 'share/ocra/edicon.exe' ] do
   cp 'bin/ocra.rb', 'bin/ocrasa.rb'
   File.open("bin/ocrasa.rb", "a") do |f|
     f.puts "__END__"
@@ -41,6 +50,11 @@ file 'bin/ocrasa.rb' => [ 'bin/ocra.rb', 'share/ocra/stub.exe', 'share/ocra/stub
     lzma64 = [lzma].pack("m")
     f.puts lzma64.size
     f.puts lzma64
+
+    lzma = File.open("share/ocra/edicon.exe", "rb") {|g| g.read}
+    lzma64 = [lzma].pack("m")
+    f.puts lzma64.size
+    f.puts lzma64
   end
 end
 

data/bin/ocra.rb

@@ -10,6 +10,10 @@ module Ocra
   OP_DECOMPRESS_LZMA = 4
   OP_SETENV = 5
 
+  VERSION = "1.1.0"
+
+  IGNORE_MODULES = /^enumerator.so$/
+
   class << self
     attr_accessor :lzma_mode
     attr_accessor :extra_dlls
@@ -17,8 +21,11 @@ module Ocra
     attr_accessor :load_autoload
     attr_accessor :force_windows
     attr_accessor :force_console
+    attr_accessor :icon_filename
     attr_accessor :quiet
+    attr_accessor :autodll
     attr_reader :lzmapath
+    attr_reader :ediconpath
     attr_reader :stubimage
     attr_reader :stubwimage
     
@@ -28,18 +35,23 @@ module Ocra
   end
 
   def Ocra.initialize_ocra
+    @load_path_before = $LOAD_PATH.dup
+    
     if defined?(DATA)
       @stubimage = get_next_embedded_image
       @stubwimage = get_next_embedded_image
       lzmaimage = get_next_embedded_image
       @lzmapath = File.join(ENV['TEMP'], 'lzma.exe').tr('/','\\')
       File.open(@lzmapath, "wb") { |file| file << lzmaimage }
+      ediconimage = get_next_embedded_image
+      @ediconpath = File.join(ENV['TEMP'], 'edicon.exe').tr('/','\\')
+      File.open(@ediconpath, "wb") { |file| file << ediconimage }
     else
       ocrapath = File.dirname(__FILE__)
       @stubimage = File.open(File.join(ocrapath, '../share/ocra/stub.exe'), "rb") { |file| file.read }
       @stubwimage = File.open(File.join(ocrapath, '../share/ocra/stubw.exe'), "rb") { |file| file.read }
       @lzmapath = File.expand_path('../share/ocra/lzma.exe', ocrapath).tr('/','\\')
-      raise "lzma.exe not found" unless File.exist?(@lzmapath)
+      @ediconpath = File.expand_path('../share/ocra/edicon.exe', ocrapath).tr('/','\\')
     end
   end
 
@@ -50,7 +62,9 @@ module Ocra
     load_autoload = true
     force_windows = false
     force_console = false
+    icon_filename = nil
     quiet = false
+    autodll = true
     
     usage = <<EOF
 ocra [options] script.rb
@@ -62,6 +76,8 @@ ocra [options] script.rb
 --windows        Force Windows application (rubyw.exe)
 --console        Force console application (ruby.exe)
 --no-autoload    Don't load/include script.rb's autoloads
+--icon <ico>     Replace icon with a custom one
+--version        Display version number
 EOF
 
     while arg = argv.shift
@@ -78,6 +94,14 @@ EOF
         force_console = true
       when /\A--no-autoload\z/
         load_autoload = false
+      when /\A--icon\z/
+        icon_filename = argv.shift
+        raise "Icon file #{icon_filename} not found.\n" unless File.exist?(icon_filename)
+      when /\A--no-autodll\z/
+        autodll = false
+      when /\A--version\z/
+        puts "Ocra #{VERSION}"
+        exit
       when /\A--help\z/, /\A--/
         puts usage
         exit
@@ -97,6 +121,8 @@ EOF
     @force_windows = force_windows
     @force_console = force_console
     @load_autoload = load_autoload
+    @icon_filename = icon_filename
+    @autodll = autodll
     @files = files
   end
 
@@ -130,8 +156,32 @@ EOF
       end
     end
   end
+
+  def Ocra.relative_path(src, tgt)
+    a = src.split('/')
+    b = tgt.split('/')
+    while a.first && a.first.downcase == b.first.downcase
+      a.shift
+      b.shift
+    end
+    return tgt if b.first =~ /^[a-z]:/i
+    a.size.times { b.unshift '..' }
+    return b.join('/')
+  end
+
+  def Ocra.find_load_path(paths, path)
+    if path[1,1] == ":"
+      rps = paths.map {|p| relative_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)) }
+      candidates.sort_by {|p| p.size}.last
+    end
+  end
   
   def Ocra.build_exe
+    @added_load_paths = $LOAD_PATH - @load_path_before
+    
     # Attempt to autoload libraries before doing anything else.
     attempt_load_autoload if Ocra.load_autoload
 
@@ -154,25 +204,40 @@ EOF
     libruby_so = RbConfig::CONFIG['LIBRUBY_SO']
 
     instsitelibdir = sitelibdir[exec_prefix.size+1..-1]
+
+    load_path = []
     
     # Find loaded files
     libs = []
     features.each do |filename|
-      path = $:.find { |path| File.exist?(File.expand_path(filename, path)) }
+      path = find_load_path($:, filename)
       if path
+        if filename[1,1] == ":"
+          filename = relative_path(File.expand_path(path), filename)
+        end
+        if filename =~ /^\.\.\//
+          puts "=== WARNING: Detected a relative require (#{filename}). This is not recommended."
+        end
         fullpath = File.expand_path(filename, path)
         if fullpath.index(exec_prefix) == 0
           libs << [ fullpath, fullpath[exec_prefix.size+1..-1] ]
         elsif fullpath.index(src_prefix) == 0
-          libs << [ fullpath, "src/" + fullpath[src_prefix.size+1..-1]]
+          targetpath = "src/" + fullpath[src_prefix.size+1..-1]
+          libs << [ fullpath, targetpath ]
+          if not @added_load_paths.include?(path) and not load_path.include?(path)
+            load_path << File.join("\xFF", File.dirname(targetpath))
+          end
         else
           libs << [ fullpath, File.join(instsitelibdir, filename) ]
         end
       else
-        puts "=== WARNING: Couldn't find #{filename}"
+        puts "=== WARNING: Couldn't find #{filename}" unless filename =~ IGNORE_MODULES
       end
     end
 
+    # Detect additional DLLs
+    dlls = Ocra.autodll ? LibraryDetector.detect_dlls : []
+
     executable = Ocra.files[0].sub(/(\.rbw?)?$/, '.exe')
 
     windowed = (Ocra.files[0] =~ /\.rbw$/ || Ocra.force_windows) && !Ocra.force_console
@@ -196,6 +261,16 @@ EOF
         sb.createfile(File.join(bindir, libruby_so), "bin\\#{libruby_so}")
       end
 
+      # Add detected DLLs
+      dlls.each do |dll|
+        if dll.tr('\\','/').index(exec_prefix) == 0
+          target = dll[exec_prefix.size+1..-1]
+        else
+          target = File.join('bin', File.basename(dll))
+        end
+        sb.createfile(dll, target)
+      end
+      
       # Add extra DLLs
       Ocra.extra_dlls.each do |dll|
         sb.createfile(File.join(bindir, dll), File.join("bin", dll).tr('/','\\'))
@@ -218,7 +293,7 @@ EOF
 
       # Set environment variable
       sb.setenv('RUBYOPT', '')
-      sb.setenv('RUBYLIB', '')
+      sb.setenv('RUBYLIB', load_path.join(';'))
 
       # Launch the script
       sb.createprocess("bin\\" + rubyexe, "#{rubyexe} \xff\\src\\" + Ocra.files[0])
@@ -227,6 +302,52 @@ EOF
     end
     puts "=== Finished (Final size was #{File.size(executable)})" unless Ocra.quiet
   end
+
+  module LibraryDetector
+    def LibraryDetector.loaded_dlls
+      begin
+        require 'rubygems'
+        gem 'win32-api', '>=1.4.0'
+        require 'win32/api'
+      rescue Exception => e
+        puts "=== ERROR: Failed to load the win32-api gem. Install win32-api or use --no-autodll."
+        puts "=== CAUSE: #{e.class.name}: #{e.message.chomp}"
+        exit
+      end
+
+      enumprocessmodules = Win32::API.new('EnumProcessModules', 'LPLP', 'B', 'psapi')
+      getmodulefilename = Win32::API.new('GetModuleFileName', 'LPL', 'L')
+      getcurrentprocess = Win32::API.new('GetCurrentProcess', 'V', 'L')
+
+      bytes_needed = 4 * 32
+      module_handle_buffer = nil
+      process_handle = getcurrentprocess.call()
+      loop do
+        module_handle_buffer = "\x00" * bytes_needed
+        bytes_needed_buffer = [0].pack("I")
+        r = enumprocessmodules.call(process_handle, module_handle_buffer, module_handle_buffer.size, bytes_needed_buffer)
+        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{|x|x>0}.map do |h|
+        str = "\x00" * 256
+        r = getmodulefilename.call(h, str, str.size)
+        str[0,r]
+      end
+    end
+
+    def LibraryDetector.detect_dlls
+      loaded = loaded_dlls
+      exec_prefix = RbConfig::CONFIG['exec_prefix']
+      loaded.select do |path|
+        path.tr('\\','/').index(exec_prefix) == 0 and
+          File.basename(path) =~ /\.dll$/ and
+          File.basename(path).downcase != RbConfig::CONFIG['LIBRUBY_SO'].downcase
+      end
+    end
+  end
   
   class OcraBuilder
     def initialize(path, windowed)
@@ -238,7 +359,16 @@ EOF
         else
           ocrafile.write(Ocra.stubimage)
         end
-          
+      end
+
+      if Ocra.icon_filename
+        system("#{Ocra.ediconpath} #{path} #{Ocra.icon_filename}")
+      end
+
+      opcode_offset = File.size(path)
+
+      File.open(path, "ab") do |ocrafile|
+        
         if Ocra.lzma_mode
           @of = ""
         else
@@ -263,7 +393,7 @@ EOF
         end
 
         ocrafile.write([OP_END].pack("V"))
-        ocrafile.write([Ocra.stubimage.size].pack("V")) # Pointer to start of opcodes
+        ocrafile.write([opcode_offset].pack("V")) # Pointer to start of opcodes
         ocrafile.write(Signature.pack("C*"))
       end
     end
@@ -308,7 +438,7 @@ if File.basename(__FILE__) == File.basename($0)
     Ocra.build_exe
     exit(0)
   end
-  
+
   puts "=== Loading script to check dependencies" unless Ocra.quiet
   $0 = Ocra.files[0]
   load Ocra.files[0]

data/lib/ocra.rb

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

data/test/test_ocra.rb

@@ -3,9 +3,12 @@ require "ocra"
 require "tmpdir"
 require "fileutils"
 require "rbconfig"
+include FileUtils
 
 class TestOcra < Test::Unit::TestCase
 
+  DefaultArgs = [ '--quiet', '--no-lzma' ]
+
   TESTED_OCRA = ENV['TESTED_OCRA'] || 'ocra.rb'
 
   def initialize(*args)
@@ -18,6 +21,41 @@ class TestOcra < Test::Unit::TestCase
   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, '.'
+    begin
+      cd name do
+        yield
+      end
+    ensure
+      rm_rf 'name'
+    end
+  end
+
+  # Sets up temporary environment variable and yields to the block.
+  def with_env(hash)
+    old = {}
+    hash.each do |k,v|
+      old[k] = ENV[k]
+      ENV[k] = v
+    end
+    begin
+      yield
+    ensure
+      hash.each do |k,v|
+        ENV[k] = old[k]
+      end
+    end
+  end
   
   def setup
     @testnum += 1
@@ -32,168 +70,206 @@ class TestOcra < Test::Unit::TestCase
   end
   
   def test_helloworld
-    File.open("helloworld.rb", "w") do |f|
-      f << "hello_world = \"Hello, World!\"\n"
+    with_fixture 'helloworld' do
+      assert system("ruby", ocra, "helloworld.rb", *DefaultArgs)
+      assert File.exist?("helloworld.exe")
+      assert system("helloworld.exe")
     end
-    assert system("ruby", ocra, "--quiet", "helloworld.rb")
-    assert File.exist?("helloworld.exe")
-    assert system("helloworld.exe")
   end
 
   def test_writefile
-    File.open("writefile.rb", "w") do |f|
-      f << "File.open(\"output.txt\", \"w\") do |f| f.write \"output\"; end"
+    with_fixture 'writefile' do
+      assert system("ruby", ocra, "writefile.rb", *DefaultArgs)
+      assert File.exist?("writefile.exe")
+      assert system("writefile.exe")
+      assert File.exist?("output.txt")
+      assert "output", File.read("output.txt")
     end
-    assert system("ruby", ocra, "--quiet", "writefile.rb")
-    assert File.exist?("writefile.exe")
-    assert system("writefile.exe")
-    assert File.exist?("output.txt")
-    assert "output", File.read("output.txt")
   end
 
   def test_exitstatus
-    File.open("exitstatus.rb", "w") do |f|
-      f << "exit 167 if __FILE__ == $0"
+    with_fixture 'exitstatus' do
+      assert system("ruby", ocra, "exitstatus.rb", *DefaultArgs)
+      system("exitstatus.exe")
+      assert_equal 167, $?.exitstatus
     end
-    assert system("ruby", ocra, "--quiet", "exitstatus.rb")
-    system("exitstatus.exe")
-    assert_equal 167, $?.exitstatus
   end
 
   def test_arguments
-    File.open("arguments.rb", "w") do |f|
-      f << "if $0 == __FILE__\n"
-      f << "exit 1 if ARGV.size != 2\n"
-      f << "exit 2 if ARGV[0] != \"foo\"\n"
-      f << "exit 3 if ARGV[1] != \"bar baz\"\n"
-      # f << "exit 4 if ARGV[2] != \"\\\"smile\\\"\"\n"
-      f << "exit(5)\n"
-      f << "end"
-    end
-    assert system("ruby", ocra, "--quiet", "arguments.rb")
-    assert File.exist?("arguments.exe")
-    # system(File.expand_path("arguments.exe"), "foo", "bar baz", "\"smile\"")
-    system("arguments.exe foo \"bar baz\"")
-    assert_equal 5, $?.exitstatus
+    with_fixture 'arguments' do
+      assert system("ruby", ocra, "arguments.rb", *DefaultArgs)
+      assert File.exist?("arguments.exe")
+      system("arguments.exe foo \"bar baz\"")
+      assert_equal 5, $?.exitstatus
+    end
   end
 
   def test_stdout_redir
-    File.open("stdoutredir.rb", "w") do |f|
-      f << "if $0 == __FILE__\n"
-      f << "puts \"Hello, World!\"\n"
-      f << "end\n"
+    with_fixture 'stdoutredir' do
+      assert system("ruby", ocra, "stdoutredir.rb", *DefaultArgs)
+      assert File.exist?("stdoutredir.exe")
+      system("stdoutredir.exe > output.txt")
+      assert File.exist?("output.txt")
+      assert_equal "Hello, World!\n", File.read("output.txt")
     end
-    assert system("ruby", ocra, "--quiet", "stdoutredir.rb")
-    assert File.exist?("stdoutredir.exe")
-    system("stdoutredir.exe > output.txt")
-    assert File.exist?("output.txt")
-    assert_equal "Hello, World!\n", File.read("output.txt")
   end
 
   def test_stdin_redir
-    File.open("input.txt", "w") do |f|
-      f << "Hello, World!\n"
+    with_fixture 'stdinredir' do
+      assert system("ruby", ocra, "stdinredir.rb", *DefaultArgs)
+      assert File.exist?("stdinredir.exe")
+      system("stdinredir.exe < input.txt")
+      assert 104, $?.exitstatus
     end
-    File.open("stdinredir.rb", "w") do |f|
-      f << "if $0 == __FILE__\n"
-      f << "  exit 104 if gets == \"Hello, World!\\n\""
-      f << "end\n"
-    end
-    assert system("ruby", ocra, "--quiet", "stdinredir.rb")
-    assert File.exist?("stdinredir.exe")
-    system("stdinredir.exe < input.txt")
-    assert 104, $?.exitstatus
   end
 
   def test_gdbmdll
-    File.open("gdbmdll.rb", "w") do |f|
-      f << "require 'gdbm'\n"
-      f << "exit 104 if $0 == __FILE__ and defined?(GDBM)\n"
-    end
-    bindir = RbConfig::CONFIG['bindir']
-    
-    gdbmdllpath = Dir[File.join(bindir, 'gdbm*.dll')][0]
-    raise "gdbm dll was not found" unless gdbmdllpath
-    gdbmdll = File.basename(gdbmdllpath)
-    assert system("ruby", ocra, "--quiet", "--dll", gdbmdll, "gdbmdll.rb")
-    path = ENV['PATH']
-    ENV['PATH'] = "."
-    begin
-      system("gdbmdll.exe")
-    ensure
-      ENV['PATH'] = path
+    with_fixture 'gdbmdll' do
+      assert system("ruby", ocra, "gdbmdll.rb", *DefaultArgs)
+      with_env 'PATH' => '.' do
+        system("gdbmdll.exe")
+        assert_equal 104, $?.exitstatus
+      end
     end
-    assert_equal 104, $?.exitstatus
   end
 
   def test_relative_require
-    File.open("relativerequire.rb", "w") do |f|
-      f << "require 'somedir/somefile.rb'\n"
-      f << "exit 160 if __FILE__ == $0 and defined?(SomeConst)"
+    with_fixture 'relativerequire' do
+      assert system("ruby", ocra, "relativerequire.rb", *DefaultArgs)
+      assert File.exist?("relativerequire.exe")
+      system("relativerequire.exe")
+      assert_equal 160, $?.exitstatus
     end
-    Dir.mkdir('somedir')
-    File.open("somedir/somefile.rb", "w") do |f|
-      f << "SomeConst = 12312\n"
+  end
+
+  # Test that autoloaded files which are not actually loaded while
+  # running the script through Ocra are included in the resulting
+  # executable.
+  def test_autoload
+    with_fixture 'autoload' do
+      assert system("ruby", ocra, "autoload.rb", *DefaultArgs)
+      assert File.exist?("autoload.exe")
+      File.unlink('foo.rb')
+      assert system("autoload.exe")
     end
-    assert system("ruby", ocra, "--quiet", "relativerequire.rb")
-    assert File.exist?("relativerequire.exe")
-    system("relativerequire.exe")
-    assert_equal 160, $?.exitstatus
   end
 
-  def test_exiting
-    File.open("exiting.rb", "w") do |f|
-      f << "exit 214\n"
+  # Test that autoload statement which point to non-existing files are
+  # ignored by Ocra (a warning may be logged).
+  def test_autoload_missing
+    with_fixture 'autoloadmissing' do
+      assert system("ruby", ocra, "autoloadmissing.rb", *DefaultArgs)
+      assert File.exist?("autoloadmissing.exe")
+      assert system("autoloadmissing.exe")
     end
-    assert system("ruby", ocra, "--quiet", "exiting.rb")
-    assert File.exist?("exiting.exe")
-    system("exiting.exe")
-    assert_equal 214, $?.exitstatus
   end
 
-  def test_autoload
-    File.open("autoload.rb", "w") do |f|
-      f << "$:.unshift File.dirname(__FILE__)\n"
-      f << "autoload :Foo, 'foo'\n"
-      f << "Foo if __FILE__ == $0\n"
+  # Test that Ocra picks up autoload statement nested in modules.
+  def test_autoload_nested
+    with_fixture 'autoloadnested' do
+      assert system("ruby", ocra, "autoloadnested.rb", *DefaultArgs)
+      assert File.exist?("autoloadnested.exe")
+      File.unlink('foo.rb')
+      assert system("autoloadnested.exe")
+    end
+  end
+
+  # Test that we can use custom include paths when invoking Ocra (ruby
+  # -I somepath). In this case the lib scripts are put in the src/
+  # directory.
+  def test_relative_loadpath1_ilib
+    with_fixture 'relloadpath1' do
+      assert system('ruby', '-I', 'lib', ocra, 'relloadpath1.rb', *DefaultArgs)
+      assert File.exist?('relloadpath1.exe')
+      assert system('relloadpath1.exe')
     end
-    File.open("foo.rb", "w") do |f|
-      f << "class Foo; end\n"
+  end
+
+  # Same as above with './lib'
+  def test_relative_loadpath_idotlib
+    with_fixture 'relloadpath1' do
+      assert system('ruby', '-I', './lib', ocra, 'relloadpath1.rb', *DefaultArgs)
+      assert File.exist?('relloadpath1.exe')
+      assert system('relloadpath1.exe')
     end
-    assert system("ruby", ocra, "--quiet", "autoload.rb")
-    assert File.exist?("autoload.exe")
-    File.unlink('foo.rb')
-    assert system("autoload.exe")
-    # assert_equal 214, $?.exitstatus
   end
 
-  def test_autoload_missing
-    File.open("autoloadmissing.rb", "w") do |f|
-      f << "$:.unshift File.dirname(__FILE__)\n"
-      f << "autoload :Foo, 'foo'\n"
+  # Test that we can use custom include paths when invoking Ocra (env
+  # RUBYLIB=lib). In this case the lib scripts are put in the src/
+  # directory.
+  def test_relative_loadpath_rubyliblib
+    with_fixture 'relloadpath1' do
+      with_env 'RUBYLIB' => 'lib' do
+        assert system('ruby', ocra, 'relloadpath1.rb', *DefaultArgs)
+        assert File.exist?('relloadpath1.exe')
+        assert system('relloadpath1.exe')
+      end
     end
-    assert system("ruby", ocra, "--quiet", "autoloadmissing.rb")
-    assert File.exist?("autoloadmissing.exe")
-    assert system("autoloadmissing.exe")
   end
-  
-  def test_autoload_nested
-    File.open("autoloadnested.rb", "w") do |f|
-      f << "$:.unshift File.dirname(__FILE__)\n"
-      f << "module Bar\n"
-      f << "  autoload :Foo, 'foo'\n"
-      f << "end\n"
-      f << "Bar::Foo if __FILE__ == $0\n"
-    end
-    File.open("foo.rb", "w") do |f|
-      f << "module Bar\n"
-      f << "class Foo; end\n"
-      f << "end\n"
-    end
-    assert system("ruby", ocra, "--quiet", "autoloadnested.rb")
-    assert File.exist?("autoloadnested.exe")
-    File.unlink('foo.rb')
-    assert system("autoloadnested.exe")
-    # assert_equal 214, $?.exitstatus
+
+  # Same as above with './lib'
+  def test_relative_loadpath_rubylibdotlib
+    with_fixture 'relloadpath1' do
+      with_env 'RUBYLIB' => './lib' do
+        assert system('ruby', ocra, 'relloadpath1.rb', *DefaultArgs)
+        assert File.exist?('relloadpath1.exe')
+        assert system('relloadpath1.exe')
+      end
+    end
+  end
+
+  # Relative path with .. prefix (../lib).
+  def test_relative_loadpath2_idotdotlib
+    with_fixture 'relloadpath2' do
+      cd 'src' do
+        assert system('ruby', '-I', '../lib', ocra, 'relloadpath2.rb', *DefaultArgs)
+        assert File.exist?('relloadpath2.exe')
+        assert system('relloadpath2.exe')
+      end
+    end
+  end
+
+  # Test that scripts which modify $LOAD_PATH with a relative path
+  # (./lib) work correctly.
+  def test_relloadpath3
+    with_fixture 'relloadpath3' do
+      assert system('ruby', ocra, 'relloadpath3.rb', *DefaultArgs)
+      assert File.exist?('relloadpath3.exe')
+      assert system('relloadpath3.exe')
+    end
+  end
+
+  # Test that scripts which modify $LOAD_PATH with a relative path
+  # (../lib) work correctly.
+  def test_relloadpath4
+    with_fixture 'relloadpath4' do
+      cd 'src' do
+        assert system('ruby', ocra, 'relloadpath4.rb', *DefaultArgs)
+        assert File.exist?('relloadpath4.exe')
+        assert system('relloadpath4.exe')
+      end
+    end
+  end
+
+  def test_version
+    assert_match(/^Ocra \d+(\.\d)+$/, `ruby #{ocra} --version`)
+  end
+
+  def test_icon
+    with_fixture 'helloworld' do
+      icofile = File.join(OcraRoot, 'src', 'vit-ruby.ico')
+      assert system("ruby", ocra, '--icon', icofile, "helloworld.rb", *DefaultArgs)
+      assert File.exist?("helloworld.exe")
+      assert system("helloworld.exe")
+    end
+  end
+
+  def test_resource
+    with_fixture 'resource' do
+      assert system("ruby", ocra, "resource.rb", "resource.txt", "res/resource.txt", *DefaultArgs)
+      assert File.exist?("resource.exe")
+      assert system("resource.exe")
+    end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ocra
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Lars Christensen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 +02:00
+date: 2009-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - share/ocra/lzma.exe
 - share/ocra/stub.exe
 - share/ocra/stubw.exe
+- share/ocra/edicon.exe
 - test/test_ocra.rb
 - lib/ocra.rb
 has_rdoc: true