ocra 1.2.0.rc1 → 1.2.0.rc2

data/History.txt

@@ -31,6 +31,9 @@
   your script after a "--" marker. Arguments will be passed both at
   compile time and run time. (#27815)
 
+* Now works if the source files are located beneath Ruby's
+  exec_prefix. (#28505)
+
 === 1.1.4
 
 * The tempdir marker is now pretty-printed as "<tempdir>" in the

data/Rakefile

@@ -66,11 +66,9 @@ file 'bin/ocrasa.rb' => [ 'bin/ocra', 'share/ocra/stub.exe', 'share/ocra/stubw.e
 end
 
 task :clean do
-  rm_rf Dir.glob("bin/*.exe")
+  rm_f Dir["{bin,samples}/*.exe"]
+  rm_f Dir["share/ocra/{stub,stubw,edicon}.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
@@ -79,54 +77,6 @@ task :test_standalone => :standalone do
   ENV['TESTED_OCRA'] = nil
 end
 
-def each_ruby_version
-  raise "Set RUBIES to point to where you have various versions of Ruby installed" if ENV['RUBIES'].nil?
-  root = ENV['RUBIES'].tr '\\', '/'
-  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
-
-desc 'Run test suite with all version of Ruby found in ENV["RUBIES"]'
-task :test_all_rubies do
-  each_ruby_version do
-    system("ruby -v")
-    system("ruby test/test_ocra.rb")
-  end
-end
-
-desc 'List all version of Ruby found in ENV["RUBIES"]'
-task :list_all_rubies do
-  each_ruby_version do
-    system "ruby -v"
-  end
-end
-
 task :release_docs => :redocs do
   sh "pscp -r doc/* larsch@ocra.rubyforge.org:/var/www/gforge-projects/ocra"
 end

data/bin/ocra

@@ -11,7 +11,7 @@ module Ocra
   OP_SETENV = 5
   OP_POST_CREATE_PROCESS = 6
 
-  VERSION = "1.2.0.rc1"
+  VERSION = "1.2.0.rc2"
 
   IGNORE_MODULES = /^enumerator.so$/
 
@@ -57,7 +57,7 @@ module Ocra
   end
 
   # Returns a binary blob store embedded in the current Ruby script.
-  def get_next_embedded_image
+  def Ocra.get_next_embedded_image
     DATA.read(DATA.readline.to_i).unpack("m")[0]
   end
 
@@ -406,6 +406,7 @@ EOF
     windowed = (Ocra.files[0] =~ /\.rbw$/ || Ocra.force_windows) && !Ocra.force_console
 
     puts "=== Building #{executable}" unless Ocra.quiet
+    target_script = nil
     OcraBuilder.new(executable, windowed) do |sb|
       # Add explicitly mentioned files
       Ocra.files.each do |file|
@@ -419,6 +420,8 @@ EOF
           target = File.join('src', File.basename(file))
         end
 
+        target_script ||= target
+
         if File.directory?(file)
           sb.ensuremkdir(target)
         else
@@ -472,13 +475,13 @@ EOF
 
       # Set environment variable
       sb.setenv('RUBYOPT', ENV['RUBYOPT'] || '')
-      sb.setenv('RUBYLIB', load_path.uniq.join(';'))
+      sb.setenv('RUBYLIB', load_path.map{|path| dospath(path)}.uniq.join(';'))
       sb.setenv('GEM_PATH', "#{TEMPDIR_MARKER}\\gemhome")
 
       # Launch the script
       extra_arg = Ocra.arg.map { |a| ' "' + a.gsub(/\"/,'\\"') + '"' }.join
       sb.postcreateprocess(TEMPDIR_MARKER + "\\bin\\" + rubyexe,
-        "#{rubyexe} \"\xff\\src\\" + Ocra.dospath(Ocra.files[0]) + "\"#{extra_arg}")
+        "#{rubyexe} \"\xff\\" + Ocra.dospath(target_script) + "\"#{extra_arg}")
       
       puts "=== Compressing" unless Ocra.quiet or not Ocra.lzma_mode
     end

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.2.0.rc1'
+  VERSION = '1.2.0.rc2'
 end

data/test/test_ocra.rb

@@ -3,8 +3,6 @@ require "tmpdir"
 require "fileutils"
 require "rbconfig"
 
-require 'rbconfig'
-
 begin
   require "rubygems"
   gem 'win32-api', '>=1.2.0'
@@ -19,7 +17,8 @@ include FileUtils
 class TestOcra < Test::Unit::TestCase
 
   # Default arguments for invoking OCRA when running tests.
-  DefaultArgs = [ '--quiet', '--no-lzma' ]
+  DefaultArgs = [ '--no-lzma' ]
+  DefaultArgs << "--quiet" unless ENV["OCRA_VERBOSE_TEST"]
   DefaultArgs.push '--no-autodll' if not $have_win32_api
 
   # Name of the tested ocra script.
@@ -54,9 +53,9 @@ class TestOcra < Test::Unit::TestCase
   # 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)
+  def with_fixture(name, target_path = nil)
     path = File.join(FixturePath, name)
-    with_tmpdir do
+    with_tmpdir([], target_path) do
       cp_r path, '.'
       cd name do
         yield
@@ -82,9 +81,9 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
-  def with_tmpdir(files = [])
-    tempdirname = File.join(ENV['TEMP'], ".ocratest-#{$$}-#{rand 2**32}").tr('\\','/')
-    Dir.mkdir tempdirname
+  def with_tmpdir(files = [], path = nil)
+    tempdirname = path || File.join(ENV['TEMP'], ".ocratest-#{$$}-#{rand 2**32}").tr('\\','/')
+    mkdir_p tempdirname
     begin
       cp files, tempdirname
       FileUtils.cd tempdirname do
@@ -389,7 +388,7 @@ class TestOcra < Test::Unit::TestCase
 
   # Test that ocra.rb accepts --version and outputs the version number.
   def test_version
-    assert_match(/^Ocra \d+(\.\d)+(.pre\d+)?$/, `ruby \"#{ocra}\" --version`)
+    assert_match(/^Ocra \d+(\.\d)+(.[a-z]+\d+)?$/, `ruby \"#{ocra}\" --version`)
   end
 
   # Test that ocra.rb accepts --icon.
@@ -561,5 +560,18 @@ class TestOcra < Test::Unit::TestCase
       end
     end
   end
+
+  # Would be nice if OCRA could build from source located beneath the
+  # Ruby installation too.
+  def test_exec_prefix
+    path = File.join(RbConfig::CONFIG["exec_prefix"], "ocratempsrc")
+    with_fixture "helloworld", path do
+      assert system("ruby", ocra, "helloworld.rb", *DefaultArgs)
+      assert File.exist?("helloworld.exe")
+      pristine_env "helloworld.exe" do
+        assert system("helloworld.exe")
+      end
+    end
+  end
   
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 2
   - 0
-  - rc1
-  version: 1.2.0.rc1
+  - rc2
+  version: 1.2.0.rc2
 platform: ruby
 authors: 
 - Lars Christensen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 +02:00
+date: 2010-08-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency