pkgr 1.1.3 → 1.1.4pre1

data/README.md

@@ -19,11 +19,11 @@ Install `pkgr` on a Debian/Ubuntu machine (only `wheezy` flavour for now):
 
 To package your app, you can either execute `pkgr` locally if your app repository is on the same machine:
 
-    pkgr path/to/app/repo
+    pkgr package path/to/app/repo
 
 Or, assuming your build machine is accessible via SSH by doing `ssh pkgr-build-machine` (set this in your `~/.ssh/config` file), you can do as follows:
 
-    pkgr path/to/app/repo --host pkgr-build-machine
+    pkgr package path/to/app/repo --host pkgr-build-machine
 
 The resulting .deb package will be in your current working directory.
 
@@ -60,6 +60,7 @@ Full command line options are given below:
       [--verbose]                              # Run verbosely
       [--debug]                                # Run very verbosely
       [--name=NAME]                            # Application name (if directory given, it will default to the directory name)
+      [--env="RACK_ENV=staging" ]              # Specify environment variables for buildpack
 
 ## Why?
 

data/lib/pkgr/builder.rb

@@ -195,7 +195,7 @@ module Pkgr
 
     # List of available buildpacks for the current distribution.
     def buildpacks
-      distribution.buildpacks(config.buildpack)
+      distribution.buildpacks(config)
     end
 
     # Buildpack detected for the app, if any.

data/lib/pkgr/buildpack.rb

@@ -13,13 +13,14 @@ module Pkgr
       end
     end
 
-    attr_reader :url, :banner, :type, :uuid, :branch
+    attr_reader :url, :banner, :type, :uuid, :branch, :env
 
-    def initialize(url, type = :builtin)
+    def initialize(url, type = :builtin, env = nil)
       @uuid = Digest::SHA1.hexdigest(url)
       @url, @branch = url.split("#")
       @branch ||= "master"
       @type = type
+      @env = env
     end
 
     def buildpack_cache_dir
@@ -34,8 +35,10 @@ module Pkgr
     end
 
     def compile(path, compile_cache_dir)
+      cmd = %{env -i PATH="$PATH"#{env} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" }
+
       Dir.chdir(path) do
-        IO.popen(%{ env -i PATH="$PATH" #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" }) do |io|
+        IO.popen(cmd) do |io|
           until io.eof?
             data = io.gets
             print data
@@ -86,10 +89,10 @@ module Pkgr
 
     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 = Mixlib::ShellOut.new("find . -type f -print0 | xargs -0 perl -pi -e s,/app,#{app_home},g")
         buildpack_replace.run_command
         buildpack_replace.error!
       end
     end
   end
-end
+end

data/lib/pkgr/cli.rb

@@ -1,6 +1,7 @@
 require "thor"
 require 'pkgr'
 require 'pkgr/buildpack'
+require 'pkgr/env'
 
 module Pkgr
   class CLI < Thor
@@ -40,6 +41,7 @@ module Pkgr
     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")'
 
     def package(tarball)
       Pkgr.level = Logger::INFO if options[:verbose]
@@ -55,4 +57,4 @@ module Pkgr
       exit 1
     end
   end
-end
+end

data/lib/pkgr/config.rb

@@ -58,6 +58,10 @@ module Pkgr
       @table[:description] || "No description given"
     end
 
+    def env
+      Pkgr::Env.new(@table[:env])
+    end
+
     def valid?
       @errors = []
       @errors.push("name can't be blank") if name.nil? || name.empty?
@@ -84,11 +88,12 @@ module Pkgr
         "--target \"#{target}\"",
         "--description \"#{description}\"",
       ]
-      args.push "--dependencies #{dependencies.map{|d| "\"#{d}\""}.join("")}" unless dependencies.nil? || dependencies.empty?
-      args.push "--build-dependencies #{build_dependencies.map{|d| "\"#{d}\""}.join("")}" unless build_dependencies.nil? || build_dependencies.empty?
+      args.push "--dependencies #{dependencies.map{|d| "\"#{d}\""}.join}" unless dependencies.nil? || dependencies.empty?
+      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 "--before-precompile \"#{before_precompile}\"" unless before_precompile.nil? || before_precompile.empty?
       args.push "--buildpack \"#{buildpack}\"" unless buildpack.nil? || buildpack.empty?
+      args.push "--env #{env.variables.map{|v| "\"#{v}\""}.join(" ")}" if env.present?
       args.push "--auto" if auto
       args.push "--verbose" if verbose
       args.push "--debug" if debug

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

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

data/lib/pkgr/distributions/debian.rb

@@ -91,10 +91,11 @@ module Pkgr
         }
       end
 
-      def buildpacks(custom_buildpack_uri = nil)
+      def buildpacks(config)
+        custom_buildpack_uri = config.buildpack
         if custom_buildpack_uri
           uuid = Digest::SHA1.hexdigest(custom_buildpack_uri)
-          [Buildpack.new(custom_buildpack_uri, :custom)]
+          [Buildpack.new(custom_buildpack_uri, :custom, config.env)]
         else
           case version
           when "ubuntu-precise", "debian-wheezy", "ubuntu-lucid", "debian-squeeze"
@@ -112,7 +113,7 @@ module Pkgr
               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)}
+            }.map{|url| Buildpack.new(url, :builtin, config.env)}
           else
             []
           end
@@ -162,4 +163,4 @@ module Pkgr
       end
     end
   end
-end
+end

data/lib/pkgr/env.rb

@@ -0,0 +1,33 @@
+module Pkgr
+  class Env
+    attr_reader :variables
+
+    def initialize(variables)
+      @variables = variables || []
+    end
+
+    def to_s
+      to_hash.map {|k, v| " #{k}=#{v}" }.join
+    end
+
+    def present?
+      create_env_hash_from_string.length > 0
+    end
+
+    def to_hash
+      create_env_hash_from_string
+    end
+
+    private
+
+    def create_env_hash_from_string
+      return {} if variables == []
+
+      variables.inject({}) do |h, var|
+        name, value = var.split('=')
+        h[name.strip] = value.strip
+        h
+      end
+    end
+  end
+end

data/lib/pkgr/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4pre1
+  prerelease: 5
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,6 +155,7 @@ files:
 - lib/pkgr/dispatcher.rb
 - lib/pkgr/distributions/debian.rb
 - lib/pkgr/distributions.rb
+- lib/pkgr/env.rb
 - lib/pkgr/git.rb
 - lib/pkgr/process.rb
 - lib/pkgr/templates/dir_template.rb