ocra 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.1.3
+
+* Use Win32API (provided with Ruby) instead of win32-api (gem).
+
+* No longer sets GEM_HOME (which would override the default gem
+  path). Instead sets GEM_PATH. Resolves issues with gems not loading
+  on Ruby 1.9.
+
 === 1.1.2
 
 * Warnings can be disabled using --no-warnings.

data/Rakefile

@@ -23,12 +23,13 @@ task :standalone => [ '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")
+  chdir 'bin' do
+    system "zip ocrasa-#{ENV['VERSION']}.zip ocrasa.rb"
   end
 end
 
 task :release_standalone => standalone_zip do
+  load 'bin/ocra'
   sh "rubyforge add_release ocra ocra-standalone #{Ocra::VERSION} #{standalone_zip}"
 end
 
@@ -75,7 +76,7 @@ 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']
+  root = ENV['RUBIES'].tr '\\', '/'
   Dir.glob(File.join(root, 'ruby*','bin')).each do |path|
     path.tr!('/','\\')
     pathenv = ENV['PATH']
@@ -106,11 +107,19 @@ task :setup_all_ruby do
   end
 end
 
-task :test_all_ruby do
+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
+
 # vim: syntax=Ruby

data/bin/ocra

@@ -10,7 +10,7 @@ module Ocra
   OP_DECOMPRESS_LZMA = 4
   OP_SETENV = 5
 
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 
   IGNORE_MODULES = /^enumerator.so$/
 
@@ -267,8 +267,12 @@ EOF
         if File.directory?(file)
           sb.ensuremkdir(File.join('src',file).tr('/','\\'))
         else
-          path = File.join('src', file).tr('/','\\')
-          sb.createfile(file, path)
+          if subpath?(file, exec_prefix)
+            target = file[exec_prefix.size+1..-1]
+          else
+            target = File.join('src', file).tr('/','\\')
+          end
+          sb.createfile(file, target)
         end
       end
 
@@ -319,7 +323,7 @@ EOF
       # Set environment variable
       sb.setenv('RUBYOPT', ENV['RUBYOPT'] || '')
       sb.setenv('RUBYLIB', load_path.uniq.join(';'))
-      sb.setenv('GEM_HOME', "\xFF\\gemhome")
+      sb.setenv('GEM_PATH', "\xFF\\gemhome")
 
       # Launch the script
       sb.createprocess("bin\\" + rubyexe, "#{rubyexe} \"\xff\\src\\" + Ocra.files[0] + "\"")
@@ -331,19 +335,11 @@ EOF
 
   module LibraryDetector
     def LibraryDetector.loaded_dlls
-      begin
-        require 'rubygems'
-        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."
-        puts "=== CAUSE: #{e.class.name}: #{e.message.chomp}"
-        exit
-      end
+      require 'Win32API'
 
-      enumprocessmodules = Win32::API.new('EnumProcessModules', 'LPLP', 'B', 'psapi')
-      getmodulefilename = Win32::API.new('GetModuleFileName', 'LPL', 'L')
-      getcurrentprocess = Win32::API.new('GetCurrentProcess', 'V', 'L')
+      enumprocessmodules = Win32API.new('psapi', 'EnumProcessModules', ['L','P','L','P'], 'B')
+      getmodulefilename = Win32API.new('kernel32', 'GetModuleFileName', ['L','P','L'], 'L')
+      getcurrentprocess = Win32API.new('kernel32', 'GetCurrentProcess', ['V'], 'L')
 
       bytes_needed = 4 * 32
       module_handle_buffer = nil

data/lib/ocra.rb

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

data/test/test_ocra.rb

@@ -3,6 +3,11 @@ require "tmpdir"
 require "fileutils"
 require "rbconfig"
 
+require 'rbconfig'
+puts "Version: #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+puts "Architecture: #{RbConfig::CONFIG['arch']}"
+puts "Host: #{RbConfig::CONFIG['host']}"
+
 begin
   require "rubygems"
   gem 'win32-api', '>=1.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ocra
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Lars Christensen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 +02:00
+date: 2009-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,12 +20,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.1
+        version: 2.3.3
     version: 
 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
+  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
@@ -50,7 +50,7 @@ files:
 - test/test_ocra.rb
 - lib/ocra.rb
 has_rdoc: true
-homepage: http://rubyforge.org/projects/ocra/
+homepage: http://rubyforge.org/projects/ocra/
 licenses: []
 
 post_install_message: 
@@ -74,9 +74,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ocra
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby source code
+summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby
 source code
 test_files: 
 - test/test_ocra.rb