pkgr 1.1.8 → 1.2.0

data/README.md

@@ -2,18 +2,20 @@
 
 ## Goal
 
-Make debian packages out of any app that can run on Heroku.
+Make debian packages out of any Ruby or NodeJS app that can run on Heroku. Hosted service available at <https://pkgr.io/>.
 
-## Supported distributions (64bits only)
+More languages and target distributions will be added after thorough testing, though nothing prevents you from specifying a specific buildpack (see Usage).
 
-* Ubuntu precise
-* Debian squeeze / Ubuntu lucid
+## Supported distributions (64bits only)
 
-Note: packages can work on Debian wheezy, provided that libssl0.9.8 is installed. It has to be done manually though, as they're no longer provided in the default repositories.
+* Ubuntu 12.04 ("Precise")
+* Debian 7.4 ("Wheezy")
+* Ubuntu 10.04 ("Lucid")
+* Debian 6 ("Squeeze")
 
 ## Examples
 
-* See <http://deb.pkgr.io/> for examples of apps packaged with `pkgr` (e.g. Gitlab, Discourse).
+See <https://pkgr.io/showcase> for examples of apps packaged with `pkgr` (Gitlab, Redmine, Discourse, Ghost, etc.).
 
 ## Installation
 
@@ -86,19 +88,24 @@ Finally, it's a great way to share your open source software with your users and
 
 ## What this does
 
-* Uses Heroku buildpacks to embed all your dependencies within the debian package. That way, no need to mess with stale system dependencies, and no need to install anything by hand. Also, we get for free all the hard work done by Heroku developers to make sure your app runs fine in an isolated way.
+* Uses Heroku buildpacks to embed all the dependencies related to your application runtime within the debian package. For a Rails app for instance, this means that `pkgr` will embed the specific ruby runtime you asked for, along with all the gems specified in your Gemfile. However, all other dependencies you may need must be specified as additional system dependencies (see Usage). This avoids the 'packaging-the-world' approach used by other tools such as omnibus (with the pros and cons that come with it), but it still allows you to use the latest and greatest libraries for your language of choice. See this [blog post][background-pkgr] for more background.
+
+[background-pkgr]: http://blog.pkgr.io/post/81988994454/why-i-made-pkgr-io-digressions-on-software-packaging
 
 * Gives you a nice executable, which closely replicates the Heroku toolbelt utility. For instance, assuming you're packaging an app called `my-app`, you can do the following:
 
         my-app config:set VAR=value
         my-app config:get VAR
-        my-app run [procfile process] # e.g. my-app run rake db:migrate, my-app run console, etc.
+        my-app run [procfile process] # e.g. my-app run rake db:migrate; my-app run console; etc.
+        my-app run [arbitrary process] # e.g. my-app run ruby -v; my-app run bundle install; etc.
         my-app scale web=1 worker=1
         ...
 
 * Your app will reside in `/opt/app-name`.
 
-* You'll also get a upstart based initialization script that you can use directly.
+* You'll also get upstart (or sysvinit) initialization scripts that you can use directly:
+
+        service my-app start/stop/restart/status
 
 * Logs will be stored in `/var/log/app-name/`, with a proper logrotate config automatically added.
 

data/lib/pkgr/builder.rb

@@ -95,6 +95,8 @@ module Pkgr
         process_file = File.join(proc_dir, process.name)
 
         File.open(process_file, "w+") do |f|
+          f.puts "#!/bin/sh"
+          f << "exec "
           f << process.command
           f << " $@"
         end

data/lib/pkgr/buildpack.rb

@@ -37,6 +37,7 @@ module Pkgr
 
     def compile(path, compile_cache_dir)
       cmd = %{env -i PATH="$PATH"#{env} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" }
+      Pkgr.debug "Running #{cmd.inspect}"
 
       Dir.chdir(path) do
         IO.popen(cmd) do |io|

data/lib/pkgr/cli.rb

@@ -26,6 +26,9 @@ module Pkgr
     method_option :buildpack,
       :type => :string,
       :desc => "Custom buildpack to use"
+    method_option :buildpack_list,
+      :type => :string,
+      :desc => "Specify a file containing a list of buildpacks to use (--buildpack takes precedence if given)"
     method_option :target,
       :type => :string,
       :default => "deb",
@@ -33,6 +36,9 @@ module Pkgr
     method_option :changelog,
       :type => :string,
       :desc => "Changelog"
+    method_option :maintainer,
+      :type => :string,
+      :desc => "Maintainer"
     method_option :architecture,
       :type => :string,
       :default => "x86_64",
@@ -101,10 +107,17 @@ module Pkgr
 
       packager = Dispatcher.new(tarball, options)
       packager.call
-    rescue Pkgr::Errors::Base => e
-      Pkgr.error "#{e.class.name} : #{e.message}"
-      puts "* ERROR: #{e.message}"
+    rescue => e
+      Pkgr.debug "#{e.class.name} : #{e.message}"
+      e.backtrace.each{|line| Pkgr.debug line}
+      puts "  ! ERROR: #{e.message}"
       exit 1
+    # Only used for logging. Re-raise immediately.
+    rescue Exception => e
+      Pkgr.debug "#{e.class.name} : #{e.message}"
+      e.backtrace.each{|line| Pkgr.debug line}
+      puts "  ! SYSTEM ERROR: #{e.class.name} : #{e.message}"
+      raise e
     end
   end
 end

data/lib/pkgr/config.rb

@@ -71,6 +71,10 @@ module Pkgr
       @table[:description] || "No description given"
     end
 
+    def maintainer
+      @table[:maintainer] || "<someone@pkgr>"
+    end
+
     def env
       Pkgr::Env.new(@table[:env])
     end
@@ -135,12 +139,14 @@ module Pkgr
         "--architecture \"#{architecture}\"",
         "--target \"#{target}\"",
         "--description \"#{description}\"",
+        "--maintainer \"#{maintainer}\""
       ]
       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 before_precompile.nil? || before_precompile.empty?
       args.push "--buildpack \"#{buildpack}\"" unless buildpack.nil? || buildpack.empty?
+      args.push "--buildpack_list \"#{buildpack_list}\"" unless buildpack_list.nil? || buildpack_list.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

data/lib/pkgr/data/distributions/debian/buildpacks/debian_squeeze

@@ -0,0 +1,2 @@
+https://github.com/heroku/heroku-buildpack-ruby.git
+https://github.com/heroku/heroku-buildpack-nodejs.git

data/lib/pkgr/data/distributions/debian/buildpacks/debian_wheezy

@@ -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-debian-7.4",BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58

data/lib/pkgr/data/distributions/debian/buildpacks/ubuntu_lucid

@@ -0,0 +1,2 @@
+https://github.com/heroku/heroku-buildpack-ruby.git
+https://github.com/heroku/heroku-buildpack-nodejs.git

data/lib/pkgr/data/distributions/debian/buildpacks/ubuntu_precise

@@ -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-12.04",BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58

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

@@ -1,5 +1,4 @@
 default:
-  - upstart
   - mysql-common
   - libpq5
   - libsqlite3-0

data/lib/pkgr/data/distributions/debian/hooks/postinstall.sh

@@ -24,4 +24,4 @@ export DATABASE_URL=db_adapter://db_user:db_password@db_host/db_name
 export PORT=\${PORT:=6000}
 CONF
 
-chmod -R 0600 /etc/${APP_NAME}
+chmod -R 0600 /etc/${APP_NAME}/conf.d

data/lib/pkgr/data/distributions/debian/runner.erb

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Generated by pkgr.
 
 set -e
 
@@ -20,8 +21,149 @@ fi
 
 DEFAULT_FILE=/etc/default/<%= name %>
 
+# Source all environment variables for the app. This must be done as
+# privileged user since the config variables are only readable by root.
 . ${DEFAULT_FILE}
 
+# Returns the type of process manager supported by the current distribution.
+function process_manager() {
+  version=$(cat /etc/debian_version)
+
+  case "$version" in
+    wheezy*|squeeze*)
+      init_system="upstart"
+      ;;
+    *)
+      init_system="sysv"
+      ;;
+  esac
+
+  echo "${init_system}"
+}
+
+# You can force a specific process manager by setting the PROCESS_MANAGER
+# environment variable.
+PROCESS_MANAGER=${PROCESS_MANAGER:=$(process_manager)}
+
+function current_number_of_processes() {
+  PROCESS_NAME="$1"
+  if [ "${PROCESS_MANAGER}" = "upstart" ]; then
+    echo $(ls -rv1 /etc/init/${APP_NAME}-${PROCESS_NAME}-*.conf 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)\.conf/\1/g')
+  else
+    echo $(ls -rv1 /etc/init.d/${APP_NAME}-${PROCESS_NAME}-* 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)/\1/g')
+  fi
+
+  return 0
+}
+
+function update_port() {
+  file="$1"
+  process_name="$2"
+  port="$3"
+  index="$4"
+
+  sed -i "s/PROCESS_NUM/${index}/g" "${file}"
+  if [ "${process_name}" = "web" ]; then
+    sed -i "s/PORT_NUM/${port}/g" "${file}"
+  else
+    sed -i "s/^env .*PORT_NUM.*$//g" "${file}"
+    sed -i "s/^export PORT=PORT_NUM$//g" "${file}"
+  fi
+}
+
+function scale_up() {
+  PROCESS_NAME="${1}"
+  CURRENT_SCALE=${2}
+  NEW_SCALE=${3}
+  SCALE_DELTA=${4}
+
+  echo "Scaling up..."
+
+  if [ "${PROCESS_MANAGER}" = "upstart" ]; then
+    cp "${HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}.conf" /etc/init/
+    cp "${HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}-${PROCESS_NAME}.conf" /etc/init/
+    for i in $(seq ${SCALE_DELTA}); do
+      index=$((${i} + ${CURRENT_SCALE}))
+      PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
+      cp "${HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}-${PROCESS_NAME}-PROCESS_NUM.conf" "/etc/init/${PROCESS_ID}.conf"
+      port=$((${PORT} + ${index} - 1))
+
+      update_port "/etc/init/${PROCESS_ID}.conf" "${PROCESS_NAME}" $port $index
+
+      service "${PROCESS_ID}" start
+    done
+
+    service ${APP_NAME}-${PROCESS_NAME} start || true
+    service ${APP_NAME} start || true
+  else
+    cp "${HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}" /etc/init.d/
+    chmod a+x /etc/init.d/${APP_NAME}
+    update-rc.d ${APP_NAME} defaults
+    cp "${HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}-${PROCESS_NAME}" /etc/init.d/
+    chmod a+x /etc/init.d/${APP_NAME}-${PROCESS_NAME}
+    update-rc.d ${APP_NAME}-${PROCESS_NAME} defaults
+    for i in $(seq ${SCALE_DELTA}); do
+      index=$((${i} + ${CURRENT_SCALE}))
+      PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
+      cp "${HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}-${PROCESS_NAME}-PROCESS_NUM" "/etc/init.d/${PROCESS_ID}"
+      port=$((${PORT} + ${index} - 1))
+
+      update_port "/etc/init.d/${PROCESS_ID}" "${PROCESS_NAME}" $port $index
+
+      chmod a+x /etc/init.d/${PROCESS_ID}
+      update-rc.d ${PROCESS_ID} defaults
+      /etc/init.d/${PROCESS_ID} start
+    done
+  fi
+  echo "--> done."
+}
+
+function scale_down() {
+  PROCESS_NAME="${1}"
+  CURRENT_SCALE=${2}
+  NEW_SCALE=${3}
+  SCALE_DELTA=${4}
+
+  echo "Scaling down..."
+  for i in $(seq $(($SCALE_DELTA * -1))); do
+    index=$((${i} + ${NEW_SCALE}))
+    PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
+
+    if [ "${PROCESS_MANAGER}" = "upstart" ]; then
+      service "${PROCESS_ID}" stop
+      rm -f "/etc/init/${PROCESS_ID}.conf"
+    else
+      /etc/init.d/${PROCESS_ID} stop
+      update-rc.d -f ${PROCESS_ID} remove
+      rm -f "/etc/init.d/${PROCESS_ID}"
+    fi
+  done
+  echo "--> done."
+}
+
+# Scale processes
+function scale() {
+  PROCESS_NAME="$1"
+  NEW_SCALE="$2"
+
+  CURRENT_SCALE=$(current_number_of_processes ${PROCESS_NAME})
+  CURRENT_SCALE=${CURRENT_SCALE:="0"}
+  SCALE_DELTA=$((${NEW_SCALE} - ${CURRENT_SCALE}))
+
+  if [ $SCALE_DELTA -gt 0 ]; then
+    scale_up "${PROCESS_NAME}" $CURRENT_SCALE $NEW_SCALE $SCALE_DELTA
+  elif [ $SCALE_DELTA -lt 0 ]; then
+    scale_down "${PROCESS_NAME}" $CURRENT_SCALE $NEW_SCALE $SCALE_DELTA
+  else
+    echo "Nothing to do."
+  fi
+}
+
+# Return all the environment variables accessible to the app.
+function show_env() {
+  env -i ${0} run env | sort
+}
+
 while : ; do
   case "$1" in
     run)
@@ -29,7 +171,25 @@ while : ; do
       COMMAND="$2"
       shift 2
 
-      exec su -m - "${APP_USER}" -c ". ${DEFAULT_FILE} && cd ${HOME} && if [ -f vendor/pkgr/processes/${COMMAND} ]; then vendor/pkgr/processes/${COMMAND} ${*}; else ${COMMAND} ${*}; fi"
+      runnable=$(echo -n "cd ${HOME} && exec")
+
+      if [ -f "${HOME}/vendor/pkgr/processes/${COMMAND}" ]; then
+        # Command alias defined in Procfile
+        runnable="${runnable}$(printf " %q" "vendor/pkgr/processes/${COMMAND}" "$@")"
+      else
+        # Everything else.
+        #
+        # We're going through printf to preserve quotes in arguments. See
+        # <http://stackoverflow.com/questions/10835933 /preserve-quotes-in-
+        # bash-arguments>.
+        runnable="${runnable}$(printf " %q" ${COMMAND} "$@")"
+      fi
+
+      # Do not use su, to avoid creating a new process. Note: chroot version
+      # is too old on Ubuntu Lucid, so this will fail. It works on Debian
+      # Squeeze though (and later).
+      exec chroot --userspec ${APP_USER}:${APP_GROUP} / sh -c "$runnable"
+
       break ;;
 
     scale)
@@ -37,57 +197,18 @@ while : ; do
       for arg in "$@"; do
         [ "$arg" = "" ] && usage
 
-        PROCESS=(${arg//=/ })
-
-        set +e
-        PROCESS_NAME=${PROCESS[0]}
-        NEW_SCALE=${PROCESS[1]}
-        CURRENT_SCALE=$(ls -rv1 /etc/init/${APP_NAME}-${PROCESS_NAME}-*.conf 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)\.conf/\1/g')
-        CURRENT_SCALE=${CURRENT_SCALE:="0"}
-        SCALE_DELTA=$(expr ${NEW_SCALE} - ${CURRENT_SCALE})
-        set -e
-
-        if [ $NEW_SCALE -eq 0 ]; then
-          echo "Stopping all ${PROCESS_NAME} processes... "
-          for file in `ls -1 /etc/init/${APP_NAME}-${PROCESS_NAME}-*.conf 2>/dev/null`; do
-            service "$(basename ${file} .conf)" stop || true
-            rm "${file}"
-          done
-          # Finally, remove master process
-          rm -f "/etc/init/${APP_NAME}-${PROCESS_NAME}.conf"
-          echo "--> done."
-        elif [ $SCALE_DELTA -gt 0 ]; then
-          echo "Scaling up..."
-          cp "${HOME}/vendor/pkgr/scaling/${APP_NAME}-${PROCESS_NAME}.conf" /etc/init/
-          for i in $(seq ${SCALE_DELTA}); do
-            PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${i}"
-            i=$(expr ${i} + ${CURRENT_SCALE})
-            cp "${HOME}/vendor/pkgr/scaling/${APP_NAME}-${PROCESS_NAME}-PROCESS_NUM.conf" "/etc/init/${PROCESS_ID}.conf"
-            sed -i "s/PROCESS_NUM/${i}/g" "/etc/init/${PROCESS_ID}.conf"
-            if [ "${PROCESS_NAME}" = "web" ]; then
-              port=$(expr ${PORT} + ${i} - 1)
-              sed -i "s/PORT_NUM/${port}/g" "/etc/init/${PROCESS_ID}.conf"
-            else
-              sed -i "s/^env .*PORT_NUM.*$//g" "/etc/init/${PROCESS_ID}.conf"
-            fi
-            service "${PROCESS_ID}" start
-          done
-          echo "--> done."
-        elif [ $SCALE_DELTA -lt 0 ]; then
-          echo "Scaling down..."
-          for i in $(seq $(expr $SCALE_DELTA \* -1)); do
-            PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${i}"
-            i=$(expr ${i} + ${NEW_SCALE})
-            service "${PROCESS_ID}" stop || true
-            rm -f "/etc/init/${PROCESS_ID}.conf"
-          done
-          echo "--> done."
-        else
-          echo "Nothing to do."
-        fi
+        process=(${arg//=/ })
+        process_name=${process[0]}
+        new_scale=${process[1]}
+
+        scale "${process_name}" "${new_scale}"
       done
       break ;;
 
+    config)
+      show_env
+      break;;
+
     config:set)
       [ $# -lt 2 ] && usage
 
@@ -106,8 +227,7 @@ while : ; do
 
     config:get)
       [ $# -lt 2 ] && usage
-      result=$(grep --no-filename "${2}" ${DEFAULT_FILE} /etc/${APP_NAME}/conf.d/*)
-      echo "${result}" | sed -r "s/^export\s+${2}=//g"
+      show_env | grep -e "^${2}=" | sed -r "s/^${2}=//"
       break;;
 
     *)

data/lib/pkgr/data/distributions/debian/sysv/master.erb

@@ -0,0 +1,34 @@
+#!/bin/sh
+# Init script for <%= name %>
+# Generated by pkgr.
+# Implemented based on LSB Core 3.1:
+#   * Sections: 20.2, 20.3
+#
+### BEGIN INIT INFO
+# Provides:          <%= name %>
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Description:       <%= description %>
+### END INIT INFO
+
+set -e
+
+name="<%= name %>"
+
+delegate() {
+  for file in $(ls -1 /etc/init.d/${name}-*[!-0-9] 2>/dev/null); do
+    ${file} "${1}"
+  done
+}
+
+case "$1" in
+  start|stop|force-stop|status|restart) delegate "${1}" ;;
+  *)
+    echo "Usage: $SCRIPTNAME {start|stop|force-stop|status|restart}" >&2
+    exit 3
+  ;;
+esac
+
+exit $?

data/lib/pkgr/data/distributions/debian/sysv/process.erb

@@ -0,0 +1,103 @@
+#!/bin/sh
+# Init script for <%= name %>-<%= process_name %>-PROCESS_NUM
+# Generated by pkgr, heavily borrowed from pleaserun
+# Implemented based on LSB Core 3.1:
+#   * Sections: 20.2, 20.3
+#
+### BEGIN INIT INFO
+# Provides:          <%= name %>-<%= process_name %>-PROCESS_NUM
+# Required-Start:    <%= name %>-<%= process_name %>
+# Required-Stop:     <%= name %>-<%= process_name %>
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Description:       <%= process_name %> component of <%= name %> (PROCESS_NUM)
+### END INIT INFO
+
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PORT=PORT_NUM
+
+name="<%= name %>"
+process_name="<%= process_name %>"
+user="<%= user %>"
+group="<%= group %>"
+full_process_name="${name}-${process_name}-PROCESS_NUM"
+pidfile="/var/run/${full_process_name}.pid"
+
+
+start() {
+  # Run the program!
+  /usr/local/bin/${name} run ${process_name} >> /var/log/${name}/${process_name}-PROCESS_NUM.log 2>&1 &
+
+  # Generate the pidfile from here. If we instead made the forked process
+  # generate it there will be a race condition between the pidfile writing
+  # and a process possibly asking for status.
+  echo $! > $pidfile
+
+  echo "${full_process_name} started."
+  return 0
+}
+
+stop() {
+  # Try a few times to kill TERM the program
+  if status ; then
+    pid=`cat "$pidfile"`
+    echo "Killing ${full_process_name} (pid $pid) with SIGTERM"
+    kill -TERM $pid
+    # Wait for it to exit.
+    for i in 1 2 3 4 5 ; do
+      echo "Waiting ${full_process_name} (pid $pid) to die..."
+      status || break
+      sleep 1
+    done
+    if status ; then
+      echo "${full_process_name} stop failed; still running."
+    else
+      echo "${full_process_name} stopped."
+    fi
+  fi
+}
+
+status() {
+  if [ -f "$pidfile" ] ; then
+    pid=`cat "$pidfile"`
+    if kill -0 $pid > /dev/null 2> /dev/null ; then
+      return 0
+    else
+      return 2 # program is dead but pid file exists
+    fi
+  else
+    return 3 # program is not running
+  fi
+}
+
+force_stop() {
+  if status ; then
+    stop
+    status && kill -KILL `cat "$pidfile"`
+  fi
+}
+
+case "$1" in
+  start) status || start ;;
+  stop) stop ;;
+  force-stop) force_stop ;;
+  status)
+    status
+    code=$?
+    if [ $code -eq 0 ] ; then
+      echo "${full_process_name} is running"
+    else
+      echo "${full_process_name} is not running"
+    fi
+    exit $code
+    ;;
+  restart)
+    stop && start
+    ;;
+  *)
+    echo "Usage: $SCRIPTNAME {start|stop|force-stop|status|restart}" >&2
+    exit 3
+  ;;
+esac
+
+exit $?

data/lib/pkgr/data/distributions/debian/sysv/process_master.erb

@@ -0,0 +1,35 @@
+#!/bin/sh
+# Init script for <%= name %>-<%= process_name %>
+# Generated by pkgr.
+# Implemented based on LSB Core 3.1:
+#   * Sections: 20.2, 20.3
+#
+### BEGIN INIT INFO
+# Provides:          <%= name %>-<%= process_name %>
+# Required-Start:    <%= name %>
+# Required-Stop:     <%= name %>
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Description:       <%= process_name %> component of <%= name %>
+### END INIT INFO
+
+set -e
+
+name="<%= name %>"
+process_name="<%= process_name %>"
+
+delegate() {
+  for file in $(ls -1 /etc/init.d/${name}-${process_name}-* 2>/dev/null); do
+    ${file} "${1}"
+  done
+}
+
+case "$1" in
+  start|stop|force-stop|status|restart) delegate "${1}" ;;
+  *)
+    echo "Usage: $SCRIPTNAME {start|stop|force-stop|status|restart}" >&2
+    exit 3
+  ;;
+esac
+
+exit $?

data/lib/pkgr/data/distributions/debian/upstart/init.d.sh.erb

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "This job runs via upstart, invoking upstart now..."
+exec initctl $1 <%= name %>

data/lib/pkgr/distributions/debian.rb

@@ -35,8 +35,6 @@ module Pkgr
 
         # default
         list.push Templates::FileTemplate.new("etc/default/#{app_name}", File.new(File.join(data_dir, "default.erb")))
-        # upstart master
-        list.push Templates::FileTemplate.new("etc/init/#{app_name}.conf", data_file("upstart/master.conf.erb"))
         # executable
         list.push Templates::FileTemplate.new("usr/local/bin/#{app_name}", File.new(File.join(data_dir, "runner.erb")), mode: 0755)
         # logrotate
@@ -52,8 +50,15 @@ module Pkgr
         list = []
         procfile_entries.select(&:daemon?).each do |process|
           Pkgr.debug "Adding #{process.inspect} to initialization scripts"
-          list.push [process, Templates::FileTemplate.new("#{app_name}-#{process.name}.conf", data_file("upstart/process_master.conf.erb"))]
-          list.push [process, Templates::FileTemplate.new("#{app_name}-#{process.name}-PROCESS_NUM.conf", data_file("upstart/process.conf.erb"))]
+          # sysvinit
+          list.push [process, Templates::FileTemplate.new("sysv/#{app_name}", data_file("sysv/master.erb"))]
+          list.push [process, Templates::FileTemplate.new("sysv/#{app_name}-#{process.name}", data_file("sysv/process_master.erb"))]
+          list.push [process, Templates::FileTemplate.new("sysv/#{app_name}-#{process.name}-PROCESS_NUM", data_file("sysv/process.erb"))]
+          # upstart
+          list.push [process, Templates::FileTemplate.new("upstart/#{app_name}", data_file("upstart/init.d.sh.erb"))]
+          list.push [process, Templates::FileTemplate.new("upstart/#{app_name}.conf", data_file("upstart/master.conf.erb"))]
+          list.push [process, Templates::FileTemplate.new("upstart/#{app_name}-#{process.name}.conf", data_file("upstart/process_master.conf.erb"))]
+          list.push [process, Templates::FileTemplate.new("upstart/#{app_name}-#{process.name}-PROCESS_NUM.conf", data_file("upstart/process.conf.erb"))]
         end
         list
       end
@@ -91,6 +96,7 @@ module Pkgr
           --deb-group "root" \
           -a "#{config.architecture}" \
           --description "#{config.description}" \
+          --maintainer "#{config.maintainer}" \
           --template-scripts \
           --before-install #{preinstall_file(config)} \
           --after-install #{postinstall_file(config)} \
@@ -105,13 +111,12 @@ module Pkgr
           uuid = Digest::SHA1.hexdigest(custom_buildpack_uri)
           [Buildpack.new(custom_buildpack_uri, :custom, config.env)]
         else
-          default_buildpacks.map{|url| Buildpack.new(url, :builtin, config.env)}
+          load_buildpack_list(config)
         end
       end
 
-      # Return the default buildpacks. Must be subclassed.
-      def default_buildpacks
-        []
+      def default_buildpack_list
+        data_file(File.join("buildpacks", "#{osfamily}_#{codename}"))
       end
 
       def preinstall_file(config)
@@ -155,6 +160,19 @@ module Pkgr
       def data_dir
         File.join(Pkgr.data_dir, "distributions", "debian")
       end
+
+      protected
+
+      def load_buildpack_list(config)
+        file = config.buildpack_list || default_buildpack_list
+        return [] if file.nil?
+
+        File.read(file).split("\n").map do |line|
+          url, *raw_env = line.split(",")
+          buildpack_env = (config.env || Env.new).merge(Env.new(raw_env))
+          Buildpack.new(url, :builtin, buildpack_env)
+        end
+      end
     end
   end
 end

data/lib/pkgr/distributions/debian_squeeze.rb

@@ -6,17 +6,6 @@ module Pkgr
       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

@@ -6,17 +6,6 @@ module Pkgr
       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/env.rb

@@ -2,7 +2,7 @@ module Pkgr
   class Env
     attr_reader :variables
 
-    def initialize(variables)
+    def initialize(variables = nil)
       @variables = variables || []
     end
 
@@ -18,6 +18,10 @@ module Pkgr
       create_env_hash_from_string
     end
 
+    def merge(other)
+      self.class.new(self.variables + other.variables)
+    end
+
     private
 
     def create_env_hash_from_string

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.1.8"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,6 +143,10 @@ files:
 - lib/pkgr/data/bin/executable
 - lib/pkgr/data/config/pre_boot.rb
 - lib/pkgr/data/distributions/debian/build_dependencies.yml
+- lib/pkgr/data/distributions/debian/buildpacks/debian_squeeze
+- lib/pkgr/data/distributions/debian/buildpacks/debian_wheezy
+- lib/pkgr/data/distributions/debian/buildpacks/ubuntu_lucid
+- lib/pkgr/data/distributions/debian/buildpacks/ubuntu_precise
 - lib/pkgr/data/distributions/debian/cron.d
 - lib/pkgr/data/distributions/debian/default.erb
 - lib/pkgr/data/distributions/debian/dependencies.yml
@@ -150,6 +154,10 @@ files:
 - lib/pkgr/data/distributions/debian/hooks/preinstall.sh
 - lib/pkgr/data/distributions/debian/logrotate.erb
 - lib/pkgr/data/distributions/debian/runner.erb
+- lib/pkgr/data/distributions/debian/sysv/master.erb
+- lib/pkgr/data/distributions/debian/sysv/process.erb
+- lib/pkgr/data/distributions/debian/sysv/process_master.erb
+- lib/pkgr/data/distributions/debian/upstart/init.d.sh.erb
 - lib/pkgr/data/distributions/debian/upstart/master.conf.erb
 - lib/pkgr/data/distributions/debian/upstart/process.conf.erb
 - lib/pkgr/data/distributions/debian/upstart/process_master.conf.erb