packager 0.0.1 → 0.0.2

data/lib/packager/rake_task.rb

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/tasklib'
-require 'bundler/setup'
 require 'erb'
 
 module Packager
@@ -37,6 +36,10 @@ module Packager
 
       yield self if block_given?
 
+      if !@package_name || @package_name.empty?
+        raise "package_name is required"
+      end
+
       @short_package_name ||= package_name.downcase.gsub(/\W+/,'-')
 
       namespace group do
@@ -86,9 +89,9 @@ module Packager
       # HELPERS
 
       def pkg_dependencies
-        [:make_pkg, "#{package_name}-pkg/Resources", "#{package_name}-pkg/#{package_name}.pkg",
-          "#{package_name}-pkg/Distribution", "#{package_name}-pkg/#{package_name}.pkg/Bom",
-          "#{package_name}-pkg/#{package_name}.pkg/PackageInfo", "#{package_name}-pkg/#{package_name}.pkg/Payload"]
+        [:make_pkg, "#{short_package_name}-pkg/Resources", "#{short_package_name}-pkg/#{short_package_name}.pkg",
+          "#{short_package_name}-pkg/Distribution", "#{short_package_name}-pkg/#{short_package_name}.pkg/Bom",
+          "#{short_package_name}-pkg/#{short_package_name}.pkg/PackageInfo", "#{short_package_name}-pkg/#{short_package_name}.pkg/Payload"]
       end
 
       def get_details
@@ -103,12 +106,34 @@ module Packager
         end
       end
 
+      def setup_bundler
+        require 'bundler/shared_helpers'
+
+        unless Bundler::SharedHelpers.in_bundle?
+          raise "Must be in a Bundler bundle"
+        end
+
+        require 'bundler'
+
+        begin
+          Bundler.setup
+        rescue Bundler::GemNotFound
+          # Do nothing yet, since we don't actually care
+        end
+
+        # Add bundler to the load path after disabling system gems
+        bundler_lib = File.expand_path("../..", __FILE__)
+        $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
+      end
+
       # TASK DEFINITIONS
 
       def bundle_file_task
         file "#{package_name}/local/#{short_package_name}/bundle" => "Gemfile" do
           require "rbconfig"
 
+          setup_bundler
+
           unless Config::CONFIG["target_cpu"] == "universal"
             puts "Please use a universal binary copy of ruby"
             exit 1
@@ -186,8 +211,10 @@ module Packager
       end
 
       def distribution_file_task
+        erb_path = File.expand_path("../build/Distribution.erb", __FILE__)
+
         file "#{short_package_name}-pkg/Distribution" do
-          src = File.read File.expand_path("../build/Distribution.erb", __FILE__)
+          src = File.read erb_path
           erb = ERB.new(src)
 
           File.open("#{short_package_name}-pkg/Distribution", "w") do |file|
@@ -197,8 +224,10 @@ module Packager
       end
 
       def package_info_file_task
+        erb_path = File.expand_path("../build/PackageInfo.erb", __FILE__)
+
         file "#{short_package_name}-pkg/#{short_package_name}.pkg/PackageInfo" do
-          src = File.read File.expand_path("../build/PackageInfo.erb", __FILE__)
+          src = File.read erb_path
           erb = ERB.new(src)
 
           File.open("#{short_package_name}-pkg/#{short_package_name}.pkg/PackageInfo", "w") do |file|

data/lib/packager/version.rb

@@ -1,4 +1,4 @@
 module Packager
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: packager
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Yehuda Katz