packager 0.0.7 → 0.1.0

data/lib/packager/rake/base_task.rb

@@ -89,11 +89,17 @@ module Packager
                 # too early. This means that the GEM_HOME gets set incorrectly and the
                 # standalone bundle is not built properly
                 original_rubyopt = ENV['RUBYOPT']
+
+                # Empty PKG_CONFIG_LIBDIR so if we have MacPorts, those libs aren't used
+                original_pkg_config_libdir = ENV['PKG_CONFIG_LIBDIR']
+
                 begin
-                  ENV['RUBYOPT'] = original_rubyopt.sub("-rbundler/setup", '')
+                  ENV['RUBYOPT'] = original_rubyopt.sub("-rbundler/setup", '') if original_rubyopt
+                  ENV['PKG_CONFIG_LIBDIR'] = ''
                   sh 'bundle --standalone --without development'
                 ensure
                   ENV['RUBYOPT'] = original_rubyopt
+                  ENV['PKG_CONFIG_LIBDIR'] = original_pkg_config_libdir
                 end
               end
             rescue Exception => e
@@ -185,13 +191,6 @@ module Packager
           task :make_pkg => make_pkg_tasks
         end
 
-        def create_rm_task
-          # TODO: Remove more fully
-          task :rm do
-            rm_rf package_name
-          end
-        end
-
     end
   end
 end

data/lib/packager/rake/mac_task.rb

@@ -17,7 +17,6 @@ module Packager
         create_bin_files_task
         create_resource_files_task
         create_make_pkg_task
-        create_rm_task
         create_directory_tasks
         create_distribution_file_task
         create_package_info_file_task
@@ -122,6 +121,12 @@ module Packager
 
           file "#{package_name}.pkg" => pkg_dependencies do
             sh "pkgutil --flatten #{short_package_name}-pkg #{package_name}.pkg"
+
+            unless ENV['NOCLEAN']
+              # Cleanup
+              rm_rf package_name
+              rm_rf "#{short_package_name}-pkg"
+            end
           end
         end
     end

data/lib/packager/rake/windows_task.rb

@@ -22,7 +22,6 @@ module Packager
         create_bin_file_aliases_task
         create_resource_files_task
         create_make_pkg_task
-        create_rm_task
 
         create_ruby_download_task
         create_iss_task
@@ -111,6 +110,11 @@ END
             puts "Compiling. This may take a while..."
             sh %{"#{inno_dir}Compil32.exe" /cc "#{package_name}\\packager.iss"}
             mv "#{package_name}/Output/setup.exe", "#{package_name}.exe"
+
+            unless ENV['NOCLEAN']
+              # Cleanup
+              rm_rf package_name
+            end
           end
         end
 

data/lib/packager/version.rb

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

metadata

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