pkgr 1.3.0 → 1.3.1

data/README.md

@@ -8,6 +8,7 @@ More languages and target distributions will be added after thorough testing, th
 
 ## Supported distributions (64bits only)
 
+* Ubuntu 14.04 ("Trusty")
 * Ubuntu 12.04 ("Precise")
 * Debian 7.4 ("Wheezy")
 * Ubuntu 10.04 ("Lucid")
@@ -44,33 +45,42 @@ Full command line options are given below:
       pkgr package TARBALL
 
     Options:
-      [--target=TARGET]                        # Target package to build (only 'deb' supported for now)
-                                               # Default: deb
-      [--changelog=CHANGELOG]                  # Changelog
-      [--architecture=ARCHITECTURE]            # Target architecture for the package
-                                               # Default: x86_64
-      [--homepage=HOMEPAGE]                    # Project homepage
-      [--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: 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
-      [--dependencies=one two three]           # Specific system dependencies that you want to install with the package
-      [--build-dependencies=one two three]     # Specific system dependencies that must be present before building
-      [--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)
-      [--env="RACK_ENV=staging" ]              # Specify environment variables for buildpack
+      [--buildpack=BUILDPACK]                        # Custom buildpack to use
+      [--buildpack-list=BUILDPACK_LIST]              # Specify a file containing a list of buildpacks to use (--buildpack takes precedence if given)
+      [--changelog=CHANGELOG]                        # Changelog
+      [--maintainer=MAINTAINER]                      # Maintainer
+      [--architecture=ARCHITECTURE]                  # Target architecture for the package
+                                                     # Default: x86_64
+      [--runner=RUNNER]                              # Force a specific runner (e.g. upstart-1.5, sysv-lsb-1.3)
+      [--homepage=HOMEPAGE]                          # Project homepage
+      [--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: 20140502095614
+      [--license=LICENSE]                            # The license of your package (see <https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#license-short-name>)
+      [--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. Path will be resolved from the temporary code repository folder, so use absolute paths if needed.
+      [--before-precompile=BEFORE_PRECOMPILE]        # Provide a script to run just before the buildpack compilation, on the build machine. Path will be resolved from the temporary code repository folder, so use absolute paths if needed.
+      [--after-precompile=AFTER_PRECOMPILE]          # Provide a script to run just after the buildpack compilation, on the build machine. Path will be resolved from the temporary code repository folder, so use absolute paths if needed.
+      [--before-install=BEFORE_INSTALL]              # Provide a script to run just before a package gets installated or updated, on the target machine.
+      [--after-install=AFTER_INSTALL]                # Provide a script to run just after a package gets installated or updated, on the target machine.
+      [--dependencies=one two three]                 # Specific system dependencies that you want to install with the package
+      [--build-dependencies=one two three]           # Specific system dependencies that must be present before building
+      [--host=HOST]                                  # Remote host to build on (default: local machine)
+      [--auto], [--no-auto]                          # Automatically attempt to install missing dependencies
+      [--clean], [--no-clean]                        # Automatically clean up temporary dirs
+                                                     # Default: true
+      [--edge], [--no-edge]                          # Always use the latest version of the buildpack if already installed
+                                                     # Default: true
+      [--env=one two three]                          # Specify environment variables for buildpack (--env "CURL_TIMEOUT=2" "BUNDLE_WITHOUT=development test")
+      [--force-os=FORCE_OS]                          # Force a specific distribution to build for (e.g. --force-os "ubuntu-12.04"). This may result in a broken package.
+      [--verbose], [--no-verbose]                    # Run verbosely
+      [--debug], [--no-debug]                        # Run very verbosely
+      [--name=NAME]                                  # Application name (if directory given, it will default to the directory name)
+      [--buildpacks-cache-dir=BUILDPACKS_CACHE_DIR]  # Directory where to store the buildpacks
+                                                     # Default: /home/vagrant/.pkgr/buildpacks
+
 
 ## Why?
 

data/data/buildpacks/ubuntu-14.04

@@ -0,0 +1,2 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#487c79e8cc3ab038ac13fef82d1e59a9c6ac39e6,BUILDPACK_VENDOR_URL="https://s3-external-1.amazonaws.com/pkgr-buildpack-ruby/20140408175240-ubuntu-14.04",BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58

data/data/hooks/postinstall.sh

@@ -2,10 +2,11 @@
 
 set -e
 
-APP_NAME="<%= name %>"
-APP_USER="<%= user %>"
-APP_GROUP="<%= group %>"
-APP_HOME="<%= home %>"
+export APP_NAME="<%= name %>"
+export APP_USER="<%= user %>"
+export APP_GROUP="<%= group %>"
+export APP_HOME="<%= home %>"
+
 HOME_LOGS="${APP_HOME}/log"
 LOGS="/var/log/${APP_NAME}"
 
@@ -28,3 +29,14 @@ chown -R ${APP_USER}.${APP_GROUP} /etc/${APP_NAME}
 
 chmod 0750 /etc/${APP_NAME} /etc/${APP_NAME}/conf.d
 find /etc/${APP_NAME} -type f -exec chmod 0640 {} +
+
+<% if after_install && File.readable?(after_install) %>
+# Call custom postinstall script.
+CUSTOM_POSTINSTALL_SCRIPT="<%= Base64.encode64 File.read(after_install) %>"
+
+tmpfile=$(mktemp)
+chmod a+x "${tmpfile}"
+echo "${CUSTOM_POSTINSTALL_SCRIPT}" | base64 -d - > ${tmpfile}
+
+"${tmpfile}" "$@"
+<% end %>

data/data/hooks/preinstall.sh

@@ -2,7 +2,10 @@
 
 set -e
 
-APP_USER="<%= user %>"
+export APP_NAME="<%= name %>"
+export APP_USER="<%= user %>"
+export APP_GROUP="<%= group %>"
+export APP_HOME="<%= home %>"
 
 if ! getent passwd "${APP_USER}" > /dev/null; then
   if [ -f /etc/redhat-release ]; then
@@ -11,3 +14,16 @@ if ! getent passwd "${APP_USER}" > /dev/null; then
     adduser "${APP_USER}" --disabled-login --group --system --quiet --shell /bin/bash
   fi
 fi
+
+<% if before_install && File.readable?(before_install) %>
+# Call custom preinstall script. The package will not yet be unpacked, so the
+# preinst script cannot rely on any files included in its package.
+# https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html
+CUSTOM_PREINSTALL_SCRIPT="<%= Base64.encode64 File.read(before_install) %>"
+
+tmpfile=$(mktemp)
+chmod a+x "${tmpfile}"
+echo "${CUSTOM_PREINSTALL_SCRIPT}" | base64 -d - > ${tmpfile}
+
+"${tmpfile}" "$@"
+<% end %>

data/lib/pkgr/builder.rb

@@ -38,6 +38,8 @@ module Pkgr
     # Setup the build directory structure
     def setup
       Dir.chdir(build_dir) do
+        # useful for templates that need to read files
+        config.source_dir = source_dir
         distribution.templates(config).each do |template|
           template.install(config.sesame)
         end

data/lib/pkgr/cli.rb

@@ -70,10 +70,16 @@ module Pkgr
       :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."
+      :desc => "Provide a script to run just before the buildpack compilation, on the build machine. Path will be resolved from the temporary code repository folder, so use absolute paths if needed."
     method_option :after_precompile,
       :type => :string,
-      :desc => "Provide a script to run just after the buildpack compilation. Path will be resolved from the temporary code repository folder, so use absolute paths if needed."
+      :desc => "Provide a script to run just after the buildpack compilation, on the build machine. Path will be resolved from the temporary code repository folder, so use absolute paths if needed."
+    method_option :before_install,
+      :type => :string,
+      :desc => "Provide a script to run just before a package gets installated or updated, on the target machine."
+    method_option :after_install,
+      :type => :string,
+      :desc => "Provide a script to run just after a package gets installated or updated, on the target machine."
     method_option :dependencies,
       :type => :array,
       :default => [],

data/lib/pkgr/config.rb

@@ -1,5 +1,7 @@
 require 'ostruct'
 require 'yaml'
+require 'pathname'
+require 'base64'
 
 module Pkgr
   class Config < OpenStruct
@@ -143,6 +145,16 @@ module Pkgr
       end
     end
 
+    def before_install
+      return nil if @table[:before_install].nil?
+      Pathname.new(source_dir).join(@table[:before_install]).realpath.to_s
+    end
+
+    def after_install
+      return nil if @table[:after_install].nil?
+      Pathname.new(source_dir).join(@table[:after_install]).realpath.to_s
+    end
+
     # TODO: DRY this with cli.rb
     def to_args
       args = [
@@ -161,6 +173,8 @@ 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 "--after-precompile \"#{after_precompile}\"" unless after_precompile.nil? || after_precompile.empty?
+      args.push "--before-install \"#{before_install}\"" unless before_install.nil? || before_install.empty?
+      args.push "--after-install \"#{after_install}\"" unless after_install.nil? || after_install.empty?
       args.push "--license \"#{license}\"" unless license.nil? || license.empty?
       args.push "--buildpack \"#{buildpack}\"" unless buildpack.nil? || buildpack.empty?
       args.push "--buildpack_list \"#{buildpack_list}\"" unless buildpack_list.nil? || buildpack_list.empty?

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,6 +162,7 @@ files:
 - data/buildpacks/debian-7
 - data/buildpacks/ubuntu-10.04
 - data/buildpacks/ubuntu-12.04
+- data/buildpacks/ubuntu-14.04
 - data/cli/cli.sh.erb
 - data/dependencies/centos.yml
 - data/dependencies/debian.yml