pkgr 1.1.0 → 1.1.1

data/README.md

@@ -6,12 +6,10 @@ Make debian packages out of any app that can run on Heroku.
 
 ## Examples
 
-* Gitlab package for debian wheezy: <http://deb.pkgr.io/crohr/gitlabhq/>.
+* See <http://deb.pkgr.io/> for examples of apps packaged with `pkgr` (e.g. Gitlab, Discourse).
 
 ## Installation
 
-Note: the new version of pkgr using buildpacks is only available as a pre-release.
-
 Install `pkgr` on a Debian/Ubuntu machine (only `wheezy` flavour for now):
 
     sudo apt-get install ruby1.9.1-full
@@ -45,7 +43,7 @@ Full command line options are given below:
       [--description=DESCRIPTION]              # Project description
       [--version=VERSION]                      # Package version (if git directory given, it will use the latest git tag available)
       [--iteration=ITERATION]                  # Package iteration (you should keep the default here)
-                                               # Default: 20131007132226
+                                               # Default: 20131016164652
       [--user=USER]                            # User to run the app under (defaults to your app name)
       [--group=GROUP]                          # Group to run the app under (defaults to your app name)
       [--compile-cache-dir=COMPILE_CACHE_DIR]  # Where to store the files cached between packaging runs
@@ -54,6 +52,11 @@ Full command line options are given below:
       [--before-precompile=BEFORE_PRECOMPILE]  # Provide a script to run just before the buildpack compilation
       [--host=HOST]                            # Remote host to build on (default: local machine)
       [--auto]                                 # Automatically attempt to install missing dependencies
+      [--clean]                                # Automatically clean up temporary dirs
+                                               # Default: true
+      [--buildpack=BUILDPACK]                  # Custom buildpack to use
+      [--edge]                                 # Always use the latest version of the buildpack if already installed
+                                               # Default: true
       [--verbose]                              # Run verbosely
       [--debug]                                # Run very verbosely
       [--name=NAME]                            # Application name (if directory given, it will default to the directory name)
@@ -85,7 +88,7 @@ Finally, it's a great way to share your open source software with your users and
         my-app scale web=1 worker=1
         ...
 
-* You app will reside in `/opt/app-name`.
+* Your app will reside in `/opt/app-name`.
 
 * You'll also get a upstart based initialization script that you can use directly.
 

data/lib/pkgr.rb

@@ -9,6 +9,7 @@ module Pkgr
   module Errors
     class Base < StandardError; end
     class UnknownAppType < Base; end
+    class UnknownDistribution < Base; end
     class ConfigurationInvalid < Base; end
   end
 

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

@@ -3,16 +3,29 @@ default:
   - mysql-common
   - libpq5
   - libsqlite3-0
-  - libevent-1.4-2
-  - libevent-core-1.4-2
-  - libevent-extra-1.4-2
   - libssl0.9.8
   - openssl
   - libxml2
   - libxslt1.1
   - libreadline5
   - libreadline6
-squeeze:
+debian-squeeze:
   - libmysqlclient16
-wheezy:
+  - libevent-1.4-2
+  - libevent-core-1.4-2
+  - libevent-extra-1.4-2
+ubuntu-lucid:
+  - 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:
   - libmysqlclient18
+  - libevent-2.0-5
+  - libevent-core-2.0-5
+  - libevent-extra-2.0-5

data/lib/pkgr/distributions.rb

@@ -1,17 +1,16 @@
 require 'pkgr/templates/file_template'
 require 'pkgr/templates/dir_template'
 require 'pkgr/distributions/debian'
-
+require 'facter'
 
 module Pkgr
   module Distributions
     def current
-      if File.exist?("/etc/debian_version")
-        distro = File.read("/etc/debian_version").split("/")[0]
-        Debian.new(distro)
-      else
-        raise "Don't know about the current distribution you're on"
-      end
+      osfamily = Facter.value('osfamily')
+      klass = const_get(osfamily)
+      klass.new([Facter.value('operatingsystem'), Facter.value('lsbdistcodename')].join("-").downcase)
+    rescue NameError => e
+      raise Errors::UnknownDistribution, "Don't know about the current distribution you're on: #{osfamily.inspect}"
     end
     module_function :current
   end

data/lib/pkgr/distributions/debian.rb

@@ -97,7 +97,7 @@ module Pkgr
           [Buildpack.new(custom_buildpack_uri, :custom)]
         else
           case version
-          when "wheezy"
+          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

data/lib/pkgr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement