pkgr 1.0.5 → 1.1.0

data/lib/pkgr/builder.rb

@@ -121,6 +121,8 @@ module Pkgr
       @procfile_entries ||= begin
         default_process_types = YAML.load_file(release_file)["default_process_types"]
 
+        default_process_types = {} unless default_process_types
+
         entries = if File.exist?(procfile)
           File.read(procfile).gsub("\r\n","\n").split("\n").map do |line|
             if line =~ /^([A-Za-z0-9_]+):\s*(.+)$/
@@ -180,14 +182,14 @@ module Pkgr
 
     # List of available buildpacks for the current distribution.
     def buildpacks
-      distribution.buildpacks
+      distribution.buildpacks(config.buildpack)
     end
 
     # Buildpack detected for the app, if any.
     def buildpack_for_app
       raise "#{source_dir} does not exist" unless File.directory?(source_dir)
       @buildpack_for_app ||= buildpacks.find do |buildpack|
-        buildpack.setup
+        buildpack.setup(config.edge, config.home)
         buildpack.detect(source_dir)
       end
     end

data/lib/pkgr/buildpack.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'digest/sha1'
 
 module Pkgr
   class Buildpack
@@ -12,14 +13,17 @@ module Pkgr
       end
     end
 
-    attr_reader :url, :banner
+    attr_reader :url, :banner, :type, :uuid, :branch
 
-    def initialize(url)
-      @url = url
+    def initialize(url, type = :builtin)
+      @uuid = Digest::SHA1.hexdigest(url)
+      @url, @branch = url.split("#")
+      @branch ||= "master"
+      @type = type
     end
 
     def buildpack_cache_dir
-      self.class.buildpack_cache_dir
+      File.join(self.class.buildpack_cache_dir, type.to_s, uuid)
     end
 
     def detect(path)
@@ -57,24 +61,35 @@ module Pkgr
       File.directory?(dir)
     end
 
-    def setup
-      exists? ? refresh : install
+    def setup(edge, app_home)
+      exists? ? refresh(edge) : install
+      replace_app_with_app_home(app_home)
     end
 
-    def refresh
+    def refresh(edge = true)
+      return if !edge
       Dir.chdir(dir) do
-        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && git reset --hard origin/master")
+        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && git reset --hard origin/#{branch}")
         buildpack_refresh.run_command
         buildpack_refresh.error!
       end
     end
 
     def install
+      FileUtils.mkdir_p(buildpack_cache_dir)
       Dir.chdir(buildpack_cache_dir) do
         buildpack_install = Mixlib::ShellOut.new("git clone \"#{url}\"")
         buildpack_install.run_command
         buildpack_install.error!
       end
     end
+
+    def replace_app_with_app_home(app_home)
+      Dir.chdir(dir) do
+        buildpack_replace = Mixlib::ShellOut.new("find . -type f -print0 | xargs -0 sed -i 's/\\/app/#{app_home.gsub("/", "\\/")}/g'")
+        buildpack_replace.run_command
+        buildpack_replace.error!
+      end
+    end
   end
 end

data/lib/pkgr/cli.rb

@@ -25,6 +25,8 @@ module Pkgr
     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"
+    method_option :buildpack,           :type => :string, :desc => "Custom buildpack to use"
+    method_option :edge,                :type => :boolean, :default => true, :desc => "Always use the latest version of the buildpack if already installed"
 
     def package(tarball)
       Pkgr.level = Logger::INFO if options[:verbose]

data/lib/pkgr/config.rb

@@ -60,10 +60,12 @@ module Pkgr
       args.push "--build-dependencies #{build_dependencies.map{|d| "\"#{d}\""}.join("")}" unless build_dependencies.nil? || build_dependencies.empty?
       args.push "--compile-cache-dir \"#{compile_cache_dir}\"" unless compile_cache_dir.nil? || compile_cache_dir.empty?
       args.push "--before-precompile \"#{before_precompile}\"" unless compile_cache_dir.nil? || compile_cache_dir.empty?
+      args.push "--buildpack \"#{buildpack}\"" unless buildpack.nil? || buildpack.empty?
       args.push "--auto" if auto
       args.push "--verbose" if verbose
       args.push "--debug" if debug
-      args.push "--clean" if clean
+      args.push "--no-clean" if !clean
+      args.push "--no-edge" if !edge
       args
     end
   end

data/lib/pkgr/distributions/debian.rb

@@ -91,24 +91,29 @@ module Pkgr
         }
       end
 
-      def buildpacks
-        case version
-        when "wheezy"
-          %w{
-            https://github.com/heroku/heroku-buildpack-ruby.git
-            https://github.com/heroku/heroku-buildpack-nodejs.git
-            https://github.com/heroku/heroku-buildpack-java.git
-            https://github.com/heroku/heroku-buildpack-play.git
-            https://github.com/heroku/heroku-buildpack-python.git
-            https://github.com/heroku/heroku-buildpack-php.git
-            https://github.com/heroku/heroku-buildpack-clojure.git
-            https://github.com/kr/heroku-buildpack-go.git
-            https://github.com/miyagawa/heroku-buildpack-perl.git
-            https://github.com/heroku/heroku-buildpack-scala
-            https://github.com/igrigorik/heroku-buildpack-dart.git
-            https://github.com/rhy-jot/buildpack-nginx.git
-            https://github.com/Kloadut/heroku-buildpack-static-apache.git
-          }.map{|url| Buildpack.new(url)}
+      def buildpacks(custom_buildpack_uri = nil)
+        if custom_buildpack_uri
+          uuid = Digest::SHA1.hexdigest(custom_buildpack_uri)
+          [Buildpack.new(custom_buildpack_uri, :custom)]
+        else
+          case version
+          when "wheezy"
+            %w{
+              https://github.com/heroku/heroku-buildpack-ruby.git
+              https://github.com/heroku/heroku-buildpack-nodejs.git
+              https://github.com/heroku/heroku-buildpack-java.git
+              https://github.com/heroku/heroku-buildpack-play.git
+              https://github.com/heroku/heroku-buildpack-python.git
+              https://github.com/heroku/heroku-buildpack-php.git
+              https://github.com/heroku/heroku-buildpack-clojure.git
+              https://github.com/kr/heroku-buildpack-go.git
+              https://github.com/miyagawa/heroku-buildpack-perl.git
+              https://github.com/heroku/heroku-buildpack-scala
+              https://github.com/igrigorik/heroku-buildpack-dart.git
+              https://github.com/rhy-jot/buildpack-nginx.git
+              https://github.com/Kloadut/heroku-buildpack-static-apache.git
+            }.map{|url| Buildpack.new(url)}
+          end
         end
       end
 

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake