ocra 1.1.4 → 1.1.5.pre1

data/History.txt

@@ -1,3 +1,22 @@
+=== 1.1.5
+
+* Ignore console events (Ctrl-C, Ctrl-Break). Ruby process handles
+  them anyway and exist, allowing the stub to clean up temporary
+  files.
+
+* Temporary memory used for decompression is now freed before the ruby
+  interpreter is launched by the stub.
+
+* Progress dialog is no longer displayed when removing temporary
+  files.
+
+* Now includes most files from any require'd Rubygem (Now works with
+  mime-types, oledb and other gems that load additional data files
+  from the Gem installation). Some files are still ignored
+  (e.g. Readme's). Use "--no-gem-filter" to make Ocra unconditionally
+  include all files listed in the Gem specification (Thanks to Jorge
+  L. Cangas for patch & ideas).
+
 === 1.1.4
 
 * The tempdir marker is now pretty-printed as "<tempdir>" in the

data/README.txt

@@ -25,7 +25,8 @@ in the forums there aswell.
 
 == TODO:
 
-* Clean up using manual recursive deletion (not SHop).
+* Support for packaging gems that need extra non-ruby files
+  (e.g. mime-types, prawn).
 
 == SYNOPSIS:
 

data/Rakefile

@@ -29,7 +29,7 @@ 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"
+    sh "zip", "ocrasa-#{ENV['VERSION']}.zip", "ocrasa.rb"
   end
 end
 
@@ -128,7 +128,7 @@ task :list_all_rubies do
 end
 
 task :release_docs => :redocs do
-  sh "pscp -r doc/* ocra.rubyforge.org:/var/www/gforge-projects/ocra"
+  sh "pscp -r doc/* larsch@ocra.rubyforge.org:/var/www/gforge-projects/ocra"
 end
 
 

data/bin/ocra

@@ -9,11 +9,25 @@ module Ocra
   OP_CREATE_PROCESS = 3
   OP_DECOMPRESS_LZMA = 4
   OP_SETENV = 5
+  OP_POST_CREATE_PROCESS = 6
 
-  VERSION = "1.1.4"
+  VERSION = "1.1.5.pre1"
 
   IGNORE_MODULES = /^enumerator.so$/
 
+  IGNORE_GEMFILES = %r{(
+    # Auxiliary files in the root of the gem
+    ^(History|Install|Manifest|README|Licen[sc]e).(txt|rdoc)$ |
+    # Installation files in the root of the gem
+    ^(Rakefile|setup.rb|extconf.rb)$ |
+    # Documentation/test directories in the root of the gem
+    ^(doc|ext|examples|test|tests|benchmarks)\/ |
+    # Directories anywhere
+    (^|\/)(\.autotest|\.svn\.cvs)(\/|$) |
+    # Unlikely extensions
+    \.(rdoc)$/
+  )}xi
+
   PATH_SEPARATOR = /[\/\\]/
 
   TEMPDIR_MARKER = "\xFF"
@@ -29,6 +43,8 @@ module Ocra
     attr_accessor :quiet
     attr_accessor :autodll
     attr_accessor :show_warnings
+    attr_accessor :gem_filter
+    
     attr_reader :lzmapath
     attr_reader :ediconpath
     attr_reader :stubimage
@@ -71,6 +87,7 @@ module Ocra
     quiet = false
     autodll = true
     show_warnings = true
+    gem_filter = true
     
     usage = <<EOF
 ocra [options] script.rb
@@ -84,6 +101,7 @@ ocra [options] script.rb
 --no-autoload    Don't load/include script.rb's autoloads
 --icon <ico>     Replace icon with a custom one
 --version        Display version number
+--no-gem-filter  Don't filter uncommon files from gems (readme's, etc.)
 EOF
 
     while arg = argv.shift
@@ -110,6 +128,8 @@ EOF
         exit
       when /\A--no-warnings\z/
         show_warnings = false
+      when /\A--no-gem-filter\z/
+        gem_filter = false
       when /\A--help\z/, /\A--/
         puts usage
         exit
@@ -133,6 +153,7 @@ EOF
     @autodll = autodll
     @files = files
     @show_warnings = show_warnings
+    @gem_filter = gem_filter
   end
 
   def Ocra.init(argv)
@@ -223,6 +244,50 @@ EOF
     instsitelibdir = sitelibdir[exec_prefix.size+1..-1]
 
     load_path = []
+
+    # Detect loaded gems and add additional gem files to the
+    # executable. Ruby 1.8 provides Gem.loaded_specs to detect gems,
+    # but this is empty with Ruby 1.9. So instead, we look for any
+    # loaded file from a gem path.
+    if defined?(Gem)
+      gems = []
+      features_from_gems = []
+      features.each do |filename|
+        if filename !~ /^[a-z]:/i
+          filename = find_load_path($:, filename)
+          next if filename.nil? # Could be enumerator.so
+        end
+        Gem.path.each do |gempath|
+          geminstallpath = File.join(gempath, "gems")
+          if subpath?(filename, geminstallpath)
+            gemlocalpath = filename[geminstallpath.size+1..-1]
+            fullgemname = gemlocalpath.split('/')[0]
+            gems << [gempath, fullgemname]
+            features_from_gems << filename
+          end
+        end
+      end
+      gems.sort!.uniq!
+      gem_files = []
+      gems.each do |gempath, fullgemname|
+        gemspecpath = File.join(gempath, "specifications", fullgemname + ".gemspec")
+        gemspecs << gemspecpath
+        spec = Gem::Specification.load(gemspecpath)
+
+        # Get list of files
+        files = spec.files
+        # Filter out some unlikely files (Readme, etc.)
+        files = files.select { |filename| filename !~ IGNORE_GEMFILES } if Ocra.gem_filter
+        # Find the full path
+        files = files.map { |file| File.join(gempath, "gems", fullgemname, file) }
+        
+        gem_files += files
+      end
+      gem_files.sort!.uniq!
+      features -= features_from_gems
+    else
+      gem_files = []
+    end
     
     # Find loaded files
     libs = []
@@ -255,6 +320,18 @@ EOF
       end
     end
 
+    # Add files from Gems
+    gem_files.each do |gemfile|
+      if subpath?(gemfile, exec_prefix)
+        libs << [ gemfile, relative_path(exec_prefix, gemfile) ]
+      elsif defined?(Gem) and gemhome = Gem.path.find { |pth| subpath?(gemfile, pth) }
+        targetpath = File.join("gemhome", relative_path(gemhome, fullpath))
+        libs << [ gemfile, targetpath ]
+      else
+        raise "Don't know where to put #{gemfile}"
+      end
+    end
+
     # Detect additional DLLs
     dlls = Ocra.autodll ? LibraryDetector.detect_dlls : []
 
@@ -310,8 +387,8 @@ EOF
       Ocra.extra_dlls.each do |dll|
         sb.createfile(File.join(bindir, dll), File.join("bin", dll).tr('/','\\'))
       end
-
-      # Add gemspecs
+      
+      # Add gemspec files
       gemspecs.each do |gemspec|
         if subpath?(gemspec, exec_prefix)
           path = gemspec[exec_prefix.size+1..-1]
@@ -335,7 +412,7 @@ EOF
       sb.setenv('GEM_PATH', "#{TEMPDIR_MARKER}\\gemhome")
 
       # Launch the script
-      sb.createprocess(TEMPDIR_MARKER + "\\bin\\" + rubyexe, "#{rubyexe} \"\xff\\src\\" + File.basename(Ocra.files[0]) + "\"")
+      sb.postcreateprocess(TEMPDIR_MARKER + "\\bin\\" + rubyexe, "#{rubyexe} \"\xff\\src\\" + File.basename(Ocra.files[0]) + "\"")
       
       puts "=== Compressing" unless Ocra.quiet or not Ocra.lzma_mode
     end
@@ -450,6 +527,10 @@ EOF
       puts "l #{showtempdir image} #{showtempdir cmdline}" unless Ocra.quiet
       @of << [OP_CREATE_PROCESS, image, cmdline].pack("VZ*Z*")
     end
+    def postcreateprocess(image, cmdline)
+      puts "p #{showtempdir image} #{showtempdir cmdline}" unless Ocra.quiet
+      @of << [OP_POST_CREATE_PROCESS, image, cmdline].pack("VZ*Z*")
+    end
     def setenv(name, value)
       puts "e #{name} #{showtempdir value}" unless Ocra.quiet
       @of << [OP_SETENV, name, value].pack("VZ*Z*")

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.1.4'
+  VERSION = '1.1.5.pre1'
 end

data/test/test_ocra.rb

@@ -120,6 +120,15 @@ class TestOcra < Test::Unit::TestCase
     end
   end
 
+  # Should be able to build executables with LZMA compression
+  def test_lzma
+    with_fixture 'helloworld' do
+      assert system("ruby", ocra, "helloworld.rb", "--quiet", "--lzma")
+      assert File.exist?("helloworld.exe")
+      assert system("helloworld.exe")
+    end
+  end
+  
   # Test that executables can writing a file to the current working
   # directory.
   def test_writefile

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ocra
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: -769618389
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  - pre1
+  version: 1.1.5.pre1
 platform: ruby
 authors: 
 - Lars Christensen
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2010-08-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,12 +100,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ocra