pkgr 1.1.2 → 1.1.3

data/lib/pkgr/builder.rb

@@ -17,9 +17,10 @@ module Pkgr
 
     # Launch the full packaging procedure
     def call
+      extract
+      update_config
       check
       setup
-      extract
       compile
       write_env
       write_init
@@ -45,7 +46,7 @@ module Pkgr
 
     # Extract the given tarball to the target directory
     def extract
-      raise "#{source_dir} does not exist" unless File.directory?(source_dir)
+      FileUtils.mkdir_p source_dir
 
       opts = {}
       if tarball == "-"
@@ -58,6 +59,14 @@ module Pkgr
       tarball_extract.error!
     end
 
+    # Update existing config with the one from .pkgr.yml file, if any
+    def update_config
+      if File.exist?(config_file)
+        @config = Config.load_file(config_file, distribution.version).merge(config)
+        Pkgr.debug "Found .pkgr.yml file. Updated config is now: #{config.inspect}"
+      end
+    end
+
     # Pass the app through the buildpack
     def compile
       if buildpack_for_app
@@ -142,6 +151,10 @@ module Pkgr
       File.join(source_dir, ".release")
     end
 
+    def config_file
+      File.join(source_dir, ".pkgr.yml")
+    end
+
     # Path to the directory containing the main app files.
     def source_dir
       File.join(build_dir, "opt/#{config.name}")

data/lib/pkgr/cli.rb

@@ -1,5 +1,6 @@
 require "thor"
 require 'pkgr'
+require 'pkgr/buildpack'
 
 module Pkgr
   class CLI < Thor
@@ -30,10 +31,10 @@ module Pkgr
     method_option :iteration,           :type => :string, :default => Time.now.strftime("%Y%m%d%H%M%S"), :desc => "Package iteration (you should keep the default here)"
     method_option :user,                :type => :string, :desc => "User to run the app under (defaults to your app name)"
     method_option :group,               :type => :string, :desc => "Group to run the app under (defaults to your app name)"
-    method_option :compile_cache_dir,   :type => :string, :desc => "Where to store the files cached between packaging runs"
+    method_option :compile_cache_dir,   :type => :string, :desc => "Where to store the files cached between packaging runs. Path will be resolved from the temporary code repository folder, so use absolute paths if needed."
+    method_option :before_precompile,   :type => :string, :desc => "Provide a script to run just before the buildpack compilation. Path will be resolved from the temporary code repository folder, so use absolute paths if needed."
     method_option :dependencies,        :type => :array,  :default => [], :desc => "Specific system dependencies that you want to install with the package"
     method_option :build_dependencies,  :type => :array,  :default => [], :desc => "Specific system dependencies that must be present before building"
-    method_option :before_precompile,   :type => :string, :desc => "Provide a script to run just before the buildpack compilation"
     method_option :host,                :type => :string, :desc => "Remote host to build on (default: local machine)"
     method_option :auto,                :type => :boolean, :default => false, :desc => "Automatically attempt to install missing dependencies"
     method_option :clean,               :type => :boolean, :default => true, :desc => "Automatically clean up temporary dirs"

data/lib/pkgr/config.rb

@@ -1,11 +1,39 @@
 require 'ostruct'
+require 'yaml'
 
 module Pkgr
   class Config < OpenStruct
+    class << self
+      def load_file(path, distribution)
+        config = YAML.load_file(path)
+
+        targets = config.delete("targets") || {}
+        (targets[distribution.to_s] || {}).each do |k,v|
+          config[k] = v
+        end
+
+        self.new(config)
+      end
+    end
+
     def sesame
       binding
     end
 
+    def merge(other)
+      new_config = self.class.new
+      self.each{|k,v| new_config.send("#{k}=".to_sym, v)}
+      other.each{|k,v| new_config.send("#{k}=".to_sym, v)}
+      new_config
+    end
+
+    def each
+      @table.each do |k,v|
+        next if v.nil?
+        yield k, v
+      end
+    end
+
     def home
       "/opt/#{name}"
     end

data/lib/pkgr/dispatcher.rb

@@ -14,8 +14,6 @@ module Pkgr
 
     def setup
       tarify if File.directory?(path)
-      config.before_precompile = File.expand_path(config.before_precompile) if config.before_precompile
-      config.compile_cache_dir = File.expand_path(config.compile_cache_dir) if config.compile_cache_dir
     end
 
     def call

data/lib/pkgr/distributions/debian.rb

@@ -113,6 +113,8 @@ module Pkgr
               https://github.com/rhy-jot/buildpack-nginx.git
               https://github.com/Kloadut/heroku-buildpack-static-apache.git
             }.map{|url| Buildpack.new(url)}
+          else
+            []
           end
         end
       end

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake