packager 0.0.5 → 0.0.7

data/lib/packager/rake/base_task.rb

@@ -3,6 +3,7 @@ require 'rake/tasklib'
 require 'erb'
 require 'rbconfig'
 require 'packager'
+require 'packager/version'
 
 module Packager
   module Rake
@@ -77,17 +78,44 @@ module Packager
             rm_rf "#{short_package_name}-pkg"
             rm_rf package_name
             rm "#{package_name}.pkg", :force => true
-            rm_rf ".bundle"
 
-            unless ENV['PREBUNDLED']
+            begin
+              # :force => true doesn't seem to work
+              mv ".bundle", ".bundle.bak" rescue nil
               rm_rf "bundle"
               Bundler.with_clean_env do
-                sh 'bundle --standalone --without development'
+                # MEGAHAX!!!!
+                # When bundler is run from within a shell out, it calls Bundler.setup
+                # too early. This means that the GEM_HOME gets set incorrectly and the
+                # standalone bundle is not built properly
+                original_rubyopt = ENV['RUBYOPT']
+                begin
+                  ENV['RUBYOPT'] = original_rubyopt.sub("-rbundler/setup", '')
+                  sh 'bundle --standalone --without development'
+                ensure
+                  ENV['RUBYOPT'] = original_rubyopt
+                end
               end
+            rescue Exception => e
+              puts e.class
+              raise e
+            ensure
+              rm_rf ".bundle"
+              # :force => true doesn't seem to work
+              mv ".bundle.bak", ".bundle" rescue nil
             end
 
             mkdir_p "#{package_name}/local/#{short_package_name}"
-            cp_r "bundle", "#{package_name}/local/#{short_package_name}/"
+            mv "bundle", "#{package_name}/local/#{short_package_name}/"
+
+            # Inject packager enviroment information
+            setup_path = "#{package_name}/local/#{short_package_name}/bundle/bundler/setup.rb"
+            setup_data = File.read(setup_path)
+            File.open(setup_path, 'w') do |file|
+              # Programs can use this env var to know if they are running in the package or not
+              file.puts "ENV['RUBY_PACKAGER'] = '#{Packager::VERSION}'"
+              file.puts setup_data
+            end
 
             verbose(false) do
               Dir.chdir("#{package_name}/local/#{short_package_name}/bundle/ruby/1.9.1") do

data/lib/packager/version.rb

@@ -1,4 +1,4 @@
 module Packager
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packager
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-20 00:00:00.000000000Z
+date: 2011-08-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70243012290200 !ruby/object:Gem::Requirement
+  requirement: &70243143033800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: 1.1.pre.4
   type: :runtime
   prerelease: false
-  version_requirements: *70243012290200
+  version_requirements: *70243143033800
 description: A tool for creating a standalone Mac OS X .pkg of your gem.
 email:
 - wycats@gmail.com
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Packager your gem for Mac OS X