pkgr 1.1.4pre3 → 1.1.4

data/lib/pkgr/builder.rb

@@ -55,6 +55,7 @@ module Pkgr
       end
 
       tarball_extract = Mixlib::ShellOut.new("tar xzf #{tarball} -C #{source_dir}", opts)
+      tarball_extract.logger = Pkgr.logger
       tarball_extract.run_command
       tarball_extract.error!
     end
@@ -62,7 +63,8 @@ module Pkgr
     # 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 "Loading #{distribution.slug} from #{config_file}."
+        @config = Config.load_file(config_file, distribution.slug).merge(config)
         Pkgr.debug "Found .pkgr.yml file. Updated config is now: #{config.inspect}"
       end
     end
@@ -115,8 +117,8 @@ module Pkgr
 
     # Launch the FPM command that will generate the package.
     def package
-      Pkgr.info "Running command: #{fpm_command}"
       app_package = Mixlib::ShellOut.new(fpm_command)
+      app_package.logger = Pkgr.logger
       app_package.run_command
       app_package.error!
     end
@@ -190,7 +192,7 @@ module Pkgr
 
     # Returns the current distribution we're packaging for.
     def distribution
-      @distribution ||= Distributions.current
+      @distribution ||= Distributions.current(config.force_os)
     end
 
     # List of available buildpacks for the current distribution.
@@ -214,10 +216,19 @@ module Pkgr
     protected
     def run_hook(file)
       return true if file.nil?
+
+      cmd = %{env -i PATH="$PATH"#{config.env} bash '#{file}' 2>&1}
+
+      puts "-----> Running hook: #{file.inspect}"
+
       Dir.chdir(source_dir) do
-        app_package = Mixlib::ShellOut.new("bash '#{file}'")
-        app_package.run_command
-        app_package.error!
+        IO.popen(cmd) do |io|
+          until io.eof?
+            data = io.gets
+            print "       #{data}"
+          end
+        end
+        raise "Hook failed" unless $?.exitstatus.zero?
       end
     end
   end

data/lib/pkgr/buildpack.rb

@@ -29,6 +29,7 @@ module Pkgr
 
     def detect(path)
       buildpack_detect = Mixlib::ShellOut.new("#{dir}/bin/detect \"#{path}\"")
+      buildpack_detect.logger = Pkgr.logger
       buildpack_detect.run_command
       @banner = buildpack_detect.stdout.chomp
       buildpack_detect.exitstatus == 0
@@ -52,6 +53,7 @@ module Pkgr
 
     def release(path, compile_cache_dir)
       buildpack_release = Mixlib::ShellOut.new("#{dir}/bin/release \"#{path}\" \"#{compile_cache_dir}\" > #{path}/.release")
+      buildpack_release.logger = Pkgr.logger
       buildpack_release.run_command
       buildpack_release.exitstatus == 0
     end
@@ -72,7 +74,8 @@ module Pkgr
     def refresh(edge = true)
       return if !edge
       Dir.chdir(dir) do
-        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && git reset --hard origin/#{branch}")
+        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && git reset --hard $(git describe 'origin/#{branch}' || git describe '#{branch}')")
+        buildpack_refresh.logger = Pkgr.logger
         buildpack_refresh.run_command
         buildpack_refresh.error!
       end
@@ -82,14 +85,17 @@ module Pkgr
       FileUtils.mkdir_p(buildpack_cache_dir)
       Dir.chdir(buildpack_cache_dir) do
         buildpack_install = Mixlib::ShellOut.new("git clone \"#{url}\"")
+        buildpack_install.logger = Pkgr.logger
         buildpack_install.run_command
         buildpack_install.error!
       end
+      refresh(true)
     end
 
     def replace_app_with_app_home(app_home)
       Dir.chdir(dir) do
         buildpack_replace = Mixlib::ShellOut.new("find . -type f -print0 | xargs -0 perl -pi -e s,/app,#{app_home},g")
+        buildpack_replace.logger = Pkgr.logger
         buildpack_replace.run_command
         buildpack_replace.error!
       end

data/lib/pkgr/cli.rb

@@ -23,25 +23,75 @@ module Pkgr
 
     desc "package TARBALL", "Package the given tarball or directory"
 
-    method_option :target,              :type => :string, :default => "deb", :desc => "Target package to build (only 'deb' supported for now)"
-    method_option :changelog,           :type => :string, :desc => "Changelog"
-    method_option :architecture,        :type => :string, :default => "x86_64", :desc => "Target architecture for the package"
-    method_option :homepage,            :type => :string, :desc => "Project homepage"
-    method_option :description,         :type => :string, :desc => "Project description"
-    method_option :version,             :type => :string, :desc => "Package version (if git directory given, it will use the latest git tag available)"
-    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. 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 :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"
-    method_option :env,                 :type => :array, default: [], :description => 'Specify environment variables for buildpack (--env "CURL_TIMEOUT=2" "BUNDLE_WITHOUT=development test")'
+    method_option :buildpack,
+      :type => :string,
+      :desc => "Custom buildpack to use"
+    method_option :target,
+      :type => :string,
+      :default => "deb",
+      :desc => "Target package to build (only 'deb' supported for now)"
+    method_option :changelog,
+      :type => :string,
+      :desc => "Changelog"
+    method_option :architecture,
+      :type => :string,
+      :default => "x86_64",
+      :desc => "Target architecture for the package"
+    method_option :homepage,
+      :type => :string,
+      :desc => "Project homepage"
+    method_option :description,
+      :type => :string,
+      :desc => "Project description"
+    method_option :version,
+      :type => :string,
+      :desc => "Package version (if git directory given, it will use the latest git tag available)"
+    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. 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 :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 :edge,
+      :type => :boolean,
+      :default => true,
+      :desc => "Always use the latest version of the buildpack if already installed"
+    method_option :env,
+      :type => :array,
+      :default => [],
+      :desc => 'Specify environment variables for buildpack (--env "CURL_TIMEOUT=2" "BUNDLE_WITHOUT=development test")'
+    method_option :force_os,
+      :type => :string,
+      :desc => 'Force a specific distribution to build for (e.g. --force-os "debian-wheezy")'
 
     def package(tarball)
       Pkgr.level = Logger::INFO if options[:verbose]

data/lib/pkgr/config.rb

@@ -6,6 +6,7 @@ module Pkgr
     class << self
       def load_file(path, distribution)
         config = YAML.load_file(path)
+        Pkgr.debug "Configuration from file: #{config.inspect} - Distribution: #{distribution.inspect}."
 
         targets = config.delete("targets") || {}
         (targets[distribution.to_s] || {}).each do |k,v|
@@ -22,7 +23,15 @@ module Pkgr
 
     def merge(other)
       new_config = self.class.new
-      self.each{|k,v| new_config.send("#{k}=".to_sym, v)}
+      self.each{|k,v|
+        new_value = case v
+        when Array
+          v | (other.delete(k) || [])
+        else
+          v
+        end
+        new_config.send("#{k}=".to_sym, new_value)
+      }
       other.each{|k,v| new_config.send("#{k}=".to_sym, v)}
       new_config
     end
@@ -34,6 +43,10 @@ module Pkgr
       end
     end
 
+    def delete(key)
+      @table.delete(key)
+    end
+
     def home
       "/opt/#{name}"
     end
@@ -66,6 +79,7 @@ module Pkgr
       @errors = []
       @errors.push("name can't be blank") if name.nil? || name.empty?
       @errors.push("version can't be blank") if version.nil? || version.empty?
+      @errors.push("version must start with a digit") if !version.empty? && version !~ /^\d/
       @errors.push("iteration can't be blank") if iteration.nil? || iteration.empty?
       @errors.push("user can't be blank") if user.nil? || user.empty?
       @errors.push("group can't be blank") if group.nil? || group.empty?
@@ -93,6 +107,7 @@ module Pkgr
       args.push "--compile-cache-dir \"#{compile_cache_dir}\"" unless compile_cache_dir.nil? || compile_cache_dir.empty?
       args.push "--before-precompile \"#{before_precompile}\"" unless before_precompile.nil? || before_precompile.empty?
       args.push "--buildpack \"#{buildpack}\"" unless buildpack.nil? || buildpack.empty?
+      args.push "--force-os \"#{force_os}\"" unless force_os.nil? || force_os.empty?
       args.push "--env #{env.variables.map{|v| "\"#{v}\""}.join(" ")}" if env.present?
       args.push "--auto" if auto
       args.push "--verbose" if verbose

data/lib/pkgr/data/distributions/debian/build_dependencies.yml

@@ -1,5 +1,4 @@
 default:
-  - libssl0.9.8
   - curl
   - libmysqlclient-dev
   - libpq-dev
@@ -10,3 +9,7 @@ default:
   - libxslt1-dev
   - libreadline-dev
   - build-essential
+squeeze:
+  - libssl0.9.8
+wheezy:
+  - libssl1.0.0

data/lib/pkgr/data/distributions/debian/dependencies.yml

@@ -3,28 +3,19 @@ default:
   - mysql-common
   - libpq5
   - libsqlite3-0
-  - libssl0.9.8
   - openssl
   - libxml2
   - libxslt1.1
   - libreadline5
   - libreadline6
-debian-squeeze:
-  - libmysqlclient16
-  - libevent-1.4-2
-  - libevent-core-1.4-2
-  - libevent-extra-1.4-2
-ubuntu-lucid:
+squeeze:
+  - libssl0.9.8
   - libmysqlclient16
   - libevent-1.4-2
   - libevent-core-1.4-2
   - libevent-extra-1.4-2
-debian-wheezy:
-  - libmysqlclient18
-  - libevent-2.0-5
-  - libevent-core-2.0-5
-  - libevent-extra-2.0-5
-ubuntu-precise:
+wheezy:
+  - libssl1.0.0
   - libmysqlclient18
   - libevent-2.0-5
   - libevent-core-2.0-5

data/lib/pkgr/dispatcher.rb

@@ -38,7 +38,11 @@ module Pkgr
       tmpfile = Tempfile.new(["pkgr-tarball", ".tar.gz"])
       system("tar czf #{tmpfile.path} --exclude .git --exclude .svn -C \"#{path}\" .") || raise(Pkgr::Errors::Base, "Can't compress input directory")
       # Remove any non-digit characters that may be before the version number
-      config.version ||= (Git.new(path).latest_tag || "").gsub(/^[^\d](\d.*)/, '\1')
+      config.version ||= begin
+        v = (Git.new(path).latest_tag || "").gsub(/^[^\d]+(\d.*)/, '\1')
+        v = "0.0.0" if v !~ /^\d/
+        v
+      end
       config.compile_cache_dir ||= File.join(path, ".git", "cache")
       config.name ||= File.basename(path)
       @path = tmpfile.path

data/lib/pkgr/distributions.rb

@@ -5,13 +5,18 @@ require 'facter'
 
 module Pkgr
   module Distributions
-    def current
-      osfamily = Facter.value('osfamily')
-      klass = const_get(osfamily)
-      klass.new([Facter.value('operatingsystem'), Facter.value('lsbdistcodename')].join("-").downcase)
+    def current(force_os = nil)
+      distro = if force_os.nil?
+        [Facter.value('operatingsystem'), Facter.value('lsbdistcodename')]
+      else
+        force_os.split("-")
+      end.map(&:capitalize).join("")
+
+      klass = const_get(distro)
+      klass.new
     rescue NameError => e
-      raise Errors::UnknownDistribution, "Don't know about the current distribution you're on: #{osfamily.inspect}"
+      raise Errors::UnknownDistribution, "Don't know about the current distribution you're on: #{distro}"
     end
     module_function :current
   end
-end
+end

data/lib/pkgr/distributions/debian.rb

@@ -7,9 +7,17 @@ module Pkgr
   module Distributions
     class Debian
 
-      attr_reader :version
-      def initialize(version)
-        @version = version
+      # Must be subclassed.
+      def codename
+        raise NotImplementedError, "codename must be set"
+      end
+
+      def osfamily
+        "debian"
+      end
+
+      def slug
+        [osfamily, codename].join("-")
       end
 
       def templates(app_name)
@@ -53,15 +61,15 @@ module Pkgr
       def check(config)
         missing_packages = (build_dependencies(config.build_dependencies) || []).select do |package|
           test_command = "dpkg -s '#{package}' > /dev/null 2>&1"
-          Pkgr.debug "Running #{test_command}"
+          Pkgr.debug "sh(#{test_command})"
           ! system(test_command)
         end
 
         unless missing_packages.empty?
           package_install_command = "sudo apt-get install -y #{missing_packages.map{|package| "\"#{package}\""}.join(" ")}"
           if config.auto
-            Pkgr.debug "Running command: #{package_install_command}"
             package_install = Mixlib::ShellOut.new(package_install_command)
+            package_install.logger = Pkgr.logger
             package_install.run_command
             package_install.error!
           else
@@ -97,29 +105,15 @@ module Pkgr
           uuid = Digest::SHA1.hexdigest(custom_buildpack_uri)
           [Buildpack.new(custom_buildpack_uri, :custom, config.env)]
         else
-          case version
-          when "ubuntu-precise", "debian-wheezy", "ubuntu-lucid", "debian-squeeze"
-            %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, :builtin, config.env)}
-          else
-            []
-          end
+          default_buildpacks.map{|url| Buildpack.new(url, :builtin, config.env)}
         end
       end
 
+      # Return the default buildpacks. Must be subclassed.
+      def default_buildpacks
+        []
+      end
+
       def preinstall_file(config)
         @preinstall_file ||= begin
           source = File.join(data_dir, "hooks", "preinstall.sh")
@@ -146,12 +140,12 @@ module Pkgr
 
       def dependencies(other_dependencies = nil)
         deps = YAML.load_file(File.join(data_dir, "dependencies.yml"))
-        (deps["default"] || []) | (deps[version] || []) | (other_dependencies || [])
+        (deps["default"] || []) | (deps[codename] || []) | (other_dependencies || [])
       end
 
       def build_dependencies(other_dependencies = nil)
         deps = YAML.load_file(File.join(data_dir, "build_dependencies.yml"))
-        (deps["default"] || []) | (deps[version] || []) | (other_dependencies || [])
+        (deps["default"] || []) | (deps[codename] || []) | (other_dependencies || [])
       end
 
       def data_file(name)
@@ -164,3 +158,7 @@ module Pkgr
     end
   end
 end
+
+%w{debian_squeeze debian_wheezy ubuntu_lucid ubuntu_precise}.each do |distro|
+  require "pkgr/distributions/#{distro}"
+end

data/lib/pkgr/distributions/debian_squeeze.rb

@@ -0,0 +1,22 @@
+require "pkgr/distributions/debian"
+
+module Pkgr
+  module Distributions
+    class DebianSqueeze < Debian
+      def codename
+        "squeeze"
+      end
+
+      def default_buildpacks
+        %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-clojure.git
+        }
+      end
+    end
+  end
+end

data/lib/pkgr/distributions/debian_wheezy.rb

@@ -0,0 +1,22 @@
+require "pkgr/distributions/debian"
+
+module Pkgr
+  module Distributions
+    class DebianWheezy < Debian
+      def codename
+        "wheezy"
+      end
+
+      def default_buildpacks
+        %w{
+          https://github.com/pkgr/heroku-buildpack-ruby.git#precise
+          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-clojure.git
+        }
+      end
+    end
+  end
+end

data/lib/pkgr/distributions/ubuntu_lucid.rb

@@ -0,0 +1,15 @@
+require "pkgr/distributions/debian_squeeze"
+
+module Pkgr
+  module Distributions
+    class UbuntuLucid < DebianSqueeze
+      def codename
+        "lucid"
+      end
+
+      def osfamily
+        "ubuntu"
+      end
+    end
+  end
+end

data/lib/pkgr/distributions/ubuntu_precise.rb

@@ -0,0 +1,15 @@
+require "pkgr/distributions/debian_wheezy"
+
+module Pkgr
+  module Distributions
+    class UbuntuPrecise < DebianWheezy
+      def codename
+        "precise"
+      end
+
+      def osfamily
+        "ubuntu"
+      end
+    end
+  end
+end

data/lib/pkgr/git.rb

@@ -12,6 +12,7 @@ module Pkgr
       return nil unless valid?
       Dir.chdir(path) do
         git_describe = Mixlib::ShellOut.new("git describe --tags --abbrev=0")
+        git_describe.logger = Pkgr.logger
         git_describe.run_command
         git_describe.stdout.chomp
       end

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.1.4pre3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.1.4pre3
-  prerelease: 5
+  version: 1.1.4
+  prerelease: 
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,6 +154,10 @@ files:
 - lib/pkgr/data/pkgr.yml
 - lib/pkgr/dispatcher.rb
 - lib/pkgr/distributions/debian.rb
+- lib/pkgr/distributions/debian_squeeze.rb
+- lib/pkgr/distributions/debian_wheezy.rb
+- lib/pkgr/distributions/ubuntu_lucid.rb
+- lib/pkgr/distributions/ubuntu_precise.rb
 - lib/pkgr/distributions.rb
 - lib/pkgr/env.rb
 - lib/pkgr/git.rb