pkgr 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e3a70c418cef9f50841398e35eed52f1101f85
-  data.tar.gz: 8820bd24da8af9c77431e512b4deeb275c4f8a65
+  metadata.gz: cff78ecb5e5e84c04eb9c36a903664cdfc4195c2
+  data.tar.gz: f09cd0f332a66eceee72cf9afd32dba516acf7ae
 SHA512:
-  metadata.gz: acfb11a093245ef31b8f53e29014e229f8dd1befc90afb446e829f8e2ec0825ad0aa13e38c2901cb5b74dc0bc0f9196b9ac116e69aa244a9236e7dcb07465ffe
-  data.tar.gz: a70f79e56a29d9523178e4907dff16d36996b3b725a04c269520fa61e94ed1f6a2daef33e72419fce743eb177943f8ab0f34d01540250fb42193a84dbea94766
+  metadata.gz: 1f620bd526031ff7a80fd21a6fdd745b6fa69578f11215addae6c1105f1670dff0037f504452350bbf9a0edbcc8bd24ca61461be81b7d083aaceb6407ae1eb50
+  data.tar.gz: 07443778726b8dbd8d703a4fd71b7677b3cc6414aa9d5a08156495bb26eb2efcfc2903c0496a9877728a83de56567d1aaa516d5026cdd93bd47a088244c3750e

data/README.md

@@ -2,9 +2,9 @@
 
 ## Goal
 
-Make debian or rpm packages out of any app, including init script, logrotate, etc. Excellent way to distribute apps or command line tools without complicated installation instructions.
+Make debian or rpm packages out of any app, including init script, crons, logrotate, etc. Excellent way to distribute apps or command line tools without complicated installation instructions.
 
-Hosted service available at <https://packager.io/>.
+Hosted service available at <https://packager.io/>. Free for OpenSource apps.
 
 ## Officially supported languages
 
@@ -12,15 +12,19 @@ Hosted service available at <https://packager.io/>.
 * NodeJS
 * Go
 
-You can also point to other buildpacks ([doc](https://packager.io/documentation/reference/the-pkgryml-file.html#buildpack)). They may just work.
+You can also point to other buildpacks ([doc](https://packager.io/documentation/customizing-the-build/#buildpack)). They may just work.
 
 ## Supported distributions (64bits only)
 
 * Ubuntu 14.04 ("trusty")
 * Ubuntu 12.04 ("precise")
+* Debian 8 ("jessie")
 * Debian 7 ("wheezy")
-* Centos 6
+* RHEL/CentOS 7
+* RHEL/CentOS 6
+* Suse Linux Enterprise Server 12
 * Fedora 20
+* Amazon Linux AMI 2014
 
 ## Examples
 
@@ -146,6 +150,14 @@ If you get the following error `ERROR:  While executing gem ... (ArgumentError)
     export LC_ALL=en_US.UTF-8
     sudo gem install pkgr
 
+Looking for the init script? It is created the first time you run this command
+
+    sudo my-app scale web=1 worker=1
+
+Issue getting nokogiri to compile? Try the following based on this [comment](https://github.com/crohr/pkgr/issues/60#issuecomment-96631181):
+
+    bundle config --local build.nokogiri "--use-system-libraries --with-xml2-include=/usr/include/libxml2"
+
 ## Authors
 
 * Cyril Rohr <cyril.rohr@gmail.com> - <http://crohr.me>, <https://packager.io>

data/data/build_dependencies/amazon.yml

@@ -0,0 +1,13 @@
+default:
+  - curl
+  - gcc
+  - gcc-c++
+  - kernel-devel
+  - openssl-devel
+  - readline-devel
+  - libxml2-devel
+  - libxslt-devel
+  - libevent-devel
+  - postgresql-devel
+  - mysql-devel
+  - sqlite-devel

data/data/buildpacks/amazon-2014

@@ -0,0 +1,3 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#universal,BUILDPACK_NODE_VERSION="0.6.8",CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/amazon-2015

@@ -0,0 +1,3 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#universal,BUILDPACK_NODE_VERSION="0.6.8",CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/centos-7

@@ -0,0 +1,3 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#universal,BUILDPACK_NODE_VERSION="0.6.8",CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-8

@@ -0,0 +1,3 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#universal,BUILDPACK_NODE_VERSION="0.6.8",CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300
+https://github.com/heroku/heroku-buildpack-nodejs.git#v58
+https://github.com/kr/heroku-buildpack-go.git

data/data/cli/cli.sh.erb

@@ -29,6 +29,7 @@ usage() {
 }
 
 DEFAULT_FILE=$(_p "/etc/default/${APP_NAME}")
+SYSTEMD_DIR=$(_p "/etc/systemd/system")
 
 . ${DEFAULT_FILE}
 
@@ -86,6 +87,8 @@ current_number_of_processes() {
   PROCESS_NAME="$1"
   if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
     echo $(ls -rv1 $(_p /etc/init/)${APP_NAME}-${PROCESS_NAME}-*.conf 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)\.conf/\1/g')
+  elif [ "${APP_RUNNER_TYPE}" = "systemd" ]; then
+    echo $(ls -rv1 $SYSTEMD_DIR/${APP_NAME}-${PROCESS_NAME}-*.service 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)\.service/\1/g')
   else
     echo $(ls -rv1 $(_p /etc/init.d/)${APP_NAME}-${PROCESS_NAME}-* 2>/dev/null | head -1 | sed -r 's/.*\-([0-9]+)/\1/g')
   fi
@@ -114,6 +117,8 @@ sysv_enable() {
     $APP_RUNNER_CLI "$name" on
   elif [ "$APP_RUNNER_CLI" = "update-rc.d" ] ; then
     $APP_RUNNER_CLI "$name" defaults
+  elif [ "$APP_RUNNER_CLI" = "systemctl" ] ; then
+    $APP_RUNNER_CLI enable "$name"
   fi
 }
 
@@ -123,6 +128,8 @@ sysv_disable() {
     $APP_RUNNER_CLI "$name" off
   elif [ "$APP_RUNNER_CLI" = "update-rc.d" ] ; then
     $APP_RUNNER_CLI -f "$name" remove
+  elif [ "$APP_RUNNER_CLI" = "systemctl" ] ; then
+    $APP_RUNNER_CLI disable "$name"
   fi
 }
 
@@ -157,6 +164,30 @@ scale_up() {
 
     $APP_RUNNER_CLI start ${APP_NAME}-${PROCESS_NAME} || true
     $APP_RUNNER_CLI start ${APP_NAME} || true
+  elif [ "$APP_RUNNER_TYPE" = "systemd" ]; then
+    local source=$(_p "${APP_HOME}/vendor/pkgr/scaling/systemd")
+    # copy master
+    cp ${source}/${APP_NAME}.service $SYSTEMD_DIR
+    # copy master process
+    cp ${source}/${APP_NAME}-${PROCESS_NAME}.service $SYSTEMD_DIR
+
+    $APP_RUNNER_CLI enable ${APP_NAME}.service || true
+    $APP_RUNNER_CLI enable ${APP_NAME}-${PROCESS_NAME}.service || true
+
+    for i in $(seq ${SCALE_DELTA}); do
+      index=$((${i} + ${CURRENT_SCALE}))
+      PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
+      cp ${source}/${APP_NAME}-${PROCESS_NAME}-PROCESS_NUM.service $SYSTEMD_DIR/${PROCESS_ID}.service
+      port=$((${PORT} + ${index} - 1))
+
+      update_port $SYSTEMD_DIR/${PROCESS_ID}.service "${PROCESS_NAME}" $port $index
+
+      $APP_RUNNER_CLI enable "${PROCESS_ID}.service"
+    done
+
+    $APP_RUNNER_CLI daemon-reload
+    $APP_RUNNER_CLI start ${APP_NAME}-${PROCESS_NAME}.service
+    $APP_RUNNER_CLI start ${APP_NAME}.service
   else
     cp $(_p "${APP_HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}") $(_p /etc/init.d/)
     chmod a+x $(_p "/etc/init.d/${APP_NAME}")
@@ -192,8 +223,12 @@ scale_down() {
     PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
 
     if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
-      $APP_RUNNER_CLI stop "${PROCESS_ID}" || /bin/true # dont fail if server stopped differently
+      $APP_RUNNER_CLI stop "${PROCESS_ID}" || true # dont fail if server stopped differently
       rm -f $(_p "/etc/init/${PROCESS_ID}.conf")
+    elif [ "${APP_RUNNER_TYPE}" = "systemd" ]; then
+      $APP_RUNNER_CLI stop "${PROCESS_ID}.service" || true # dont fail if server stopped differently
+      $APP_RUNNER_CLI disable "${PROCESS_ID}.service" || true
+      rm -f $SYSTEMD_DIR/${PROCESS_ID}.service
     else
       $(_p "/etc/init.d/${PROCESS_ID}") stop
       sysv_disable ${PROCESS_ID}
@@ -231,18 +266,7 @@ configure() {
 }
 
 reconfigure() {
-  if [ "$APP_ADDONS" = "" ] ; then
-    configure --reconfigure
-  else
-    # only available for debian for now
-    if which dpkg-reconfigure &>/dev/null ; then
-      for addon in ${APP_ADDONS}; do
-        dpkg-reconfigure "${APP_NAME}-${addon}"
-      done
-      # always reconfigure main package as well
-      dpkg-reconfigure "${APP_NAME}"
-    fi
-  fi
+  configure --reconfigure
 }
 
 while : ; do

data/data/dependencies/amazon.yml

@@ -0,0 +1,9 @@
+default:
+  - openssl
+  - readline
+  - libxml2
+  - libxslt
+  - libevent
+  - postgresql-libs
+  - mysql-libs
+  - sqlite

data/data/environment/default.erb

@@ -7,8 +7,6 @@ export APP_USER="<%= user %>"
 export APP_WIZARDS="<%= wizards.map{|wizard_group| wizard_group.map{|w| w.name}.join("|")}.join(",") %>"
 export APP_RUNNER_TYPE="<%= distribution.runner.type %>"
 export APP_RUNNER_CLI="<%= distribution.runner.cli %>"
-# Legacy addons
-export APP_ADDONS="<%= addons.map{|addon| addon.name}.join(" ") %>"
 export PORT=${PORT:=6000}
 <% if cli.is_a?(String) %>
 export HOME=${HOME:="/home/<%= user %>"}

data/data/hooks/postuninstall.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 

data/data/hooks/preinstall.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 
@@ -8,7 +8,7 @@ export APP_GROUP="<%= group %>"
 export APP_HOME="<%= home %>"
 
 if ! getent passwd "${APP_USER}" > /dev/null; then
-  if [ -f /etc/redhat-release ] || [ -f /etc/SuSE-release ]; then
+  if [ -f /etc/redhat-release ] || [ -f /etc/system-release ] || [ -f /etc/SuSE-release ]; then
     if ! getent group "${APP_GROUP}" > /dev/null ; then
       groupadd --system "${APP_GROUP}"
     fi

data/data/hooks/preuninstall.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 

data/data/init/systemd/default/master.service.erb

@@ -0,0 +1,9 @@
+[Unit]
+StopWhenUnneeded=true
+
+[Service]
+# this service is just a placeholder
+ExecStart=/bin/sleep infinity
+
+[Install]
+WantedBy=multi-user.target

data/data/init/systemd/default/process.service.erb

@@ -0,0 +1,15 @@
+[Unit]
+StopWhenUnneeded=true
+Requires=<%= name %>-<%= process_name %>.service
+After=<%= name %>-<%= process_name %>.service
+
+[Service]
+Environment=PORT=PORT_NUM
+ExecStart=/usr/bin/<%= name %> run <%= process_name %>
+Restart=always
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=%n
+
+[Install]
+WantedBy=<%= name %>-<%= process_name %>.service

data/data/init/systemd/default/process_master.service.erb

@@ -0,0 +1,11 @@
+[Unit]
+StopWhenUnneeded=true
+Requires=<%= name %>.service
+After=<%= name %>.service
+
+[Service]
+# this service is just a placeholder
+ExecStart=/bin/sleep infinity
+
+[Install]
+WantedBy=<%= name %>.service

data/data/init/upstart/1.5/master.conf.erb

@@ -1,6 +1,6 @@
 start on (started network-interface
           or started network-manager
-          or started networking)
+          or started networking) and filesystem
 
 # The `networking` job is a task, which means it will be stopped after the network interfaces have been configured.
 # That's why we don't stop on "stopping networking".

data/lib/pkgr/addon.rb

@@ -1,110 +1,55 @@
+require 'pathname'
+
 module Pkgr
   class Addon
-    attr_reader :nickname, :addons_dir
-    attr_reader :config
-
-    def initialize(nickname, addons_dir, config)
+    def initialize(nickname)
       @nickname = nickname
-      @addons_dir = addons_dir
-      @config = config
     end
 
     def name
-      File.basename(url_without_branch, ".git").sub("addon-", "")
+      File.basename(url).sub("addon-", "")
     end
 
-    def url_without_branch
-      nickname.split("#")[0].sub(/\.git$/,'')
+    def install!(dir, shell = Command.new(Pkgr.logger))
+      addon_dir = "#{dir}/#{name}"
+      FileUtils.mkdir_p addon_dir
+      puts "-----> [wizard] adding #{name} wizard (#{url}##{branch})"
+      if url.is_a?(Pathname)
+        shell.run! "cp -r #{url}/* #{addon_dir}"
+      else
+        shell.run! "curl -L --max-redirs 3 --retry 5 -s '#{tarball_url}' | tar xzf - --strip-components=1 -C '#{addon_dir}'"
+      end
     end
 
-    def url
-      if nickname.start_with?("http")
-        url_without_branch
-      else
-        user, repo = nickname.split("/", 2)
-        user, repo = "pkgr", user if repo.nil?
-        repo = "addon-#{repo}" unless repo.start_with?("addon-")
+  private
 
-        "https://github.com/#{user}/#{repo}"
+    def url
+      @url ||= begin
+        if @nickname.is_a?(Pathname)
+          @nickname
+        elsif @nickname.start_with?("http")
+          url_without_branch
+        else
+          user, repo = @nickname.split("/", 2)
+          user, repo = "pkgr", user if repo.nil?
+          repo = "addon-#{repo}" unless repo.start_with?("addon-")
+
+          "https://github.com/#{user}/#{repo}"
+        end
       end
     end
 
     def branch
-      nickname.split("#")[1] || "master"
+      return if url.is_a?(Pathname)
+      @nickname.split("#")[1] || "master"
     end
 
     def tarball_url
       "#{url}/archive/#{branch}.tar.gz"
     end
 
-    def debian_dependency_name
-      [
-        [config.name, name].join("-"),
-        "(= #{config.version}-#{config.iteration})"
-      ].join(" ")
-    end
-
-    def debtemplates
-      debtemplates_file = File.join(dir, "debian", "templates")
-      if File.exists?(debtemplates_file)
-        File.new(debtemplates_file)
-      else
-        StringIO.new
-      end
-    end
-
-    def debconfig
-      debconfig_file = File.join(dir, "debian", "config")
-      if File.exists?(debconfig_file)
-        File.new(debconfig_file)
-      else
-        StringIO.new
-      end
-    end
-
-    def install!(src_dir)
-      install_addon = Mixlib::ShellOut.new %{curl -L --max-redirs 3 --retry 5 -s '#{tarball_url}' | tar xzf - --strip-components=1 -C '#{dir}'}
-      install_addon.logger = Pkgr.logger
-      install_addon.run_command
-      install_addon.error!
-
-      # TODO: remove args from command once all addons use env variables
-      compile_addon = Mixlib::ShellOut.new(%{#{dir}/bin/compile '#{config.name}' '#{config.version}' '#{config.iteration}' '#{src_dir}' 2>&1}, {
-        :environment => {
-          "APP_NAME" => config.name,
-          "APP_VERSION" => config.version,
-          "APP_ITERATION" => config.iteration,
-          "APP_SAFE_NAME" => config.name.gsub("-", "_"),
-          "APP_USER" => config.user,
-          "APP_GROUP" => config.group,
-          "APP_WORKSPACE" => src_dir
-        }
-      })
-      compile_addon.logger = Pkgr.logger
-      compile_addon.live_stream = LiveStream.new(STDOUT)
-      compile_addon.run_command
-      compile_addon.error!
-    end
-
-    def dir
-      @dir ||= begin
-        directory = File.join(addons_dir, File.basename(name))
-        FileUtils.mkdir_p(directory)
-        directory
-      end
-    end
-
-    class LiveStream
-      attr_reader :stream
-      def initialize(stream = STDOUT)
-        @stream = stream
-      end
-
-      def <<(data)
-        data.split("\n").each do |line|
-          stream.puts "       #{line}"
-        end
-      end
+    def url_without_branch
+      @nickname.split("#")[0].sub(/\.git$/,'')
     end
   end
 end

data/lib/pkgr/builder.rb

@@ -24,13 +24,7 @@ module Pkgr
       update_config
       check
       setup
-
-      if config.installer
-        setup_pipeline
-      else
-        setup_addons
-      end
-
+      setup_pipeline
       compile
       write_env
       write_init
@@ -74,8 +68,6 @@ module Pkgr
         end
       end
       config.distribution = distribution
-      # required to build proper Addon objects
-      config.addons_dir = addons_dir
       # useful for templates that need to read files
       config.source_dir = source_dir
       config.build_dir = build_dir
@@ -112,17 +104,6 @@ module Pkgr
       end
     end
 
-    # LEGACY, remove once openproject no longer needs it
-    # If addons are declared in .pkgr.yml, add them
-    def setup_addons
-      config.addons.each do |addon|
-        puts "-----> [addon] #{addon.name} (#{addon.url} @ #{addon.branch})"
-        addon.install!(source_dir)
-        dependency = distribution.add_addon(addon)
-        config.dependencies.push(dependency) if dependency
-      end
-    end
-
     # Pass the app through the buildpack
     def compile
       if buildpack_for_app
@@ -263,10 +244,6 @@ module Pkgr
       File.join(source_dir, "vendor", "pkgr")
     end
 
-    def addons_dir
-      File.join(vendor_dir, "addons")
-    end
-
     # Directory where binstubs will be created for the corresponding Procfile commands.
     def proc_dir
       File.join(vendor_dir, "processes")

data/lib/pkgr/config.rb

@@ -9,7 +9,8 @@ module Pkgr
       "ubuntu-lucid" => "ubuntu-10.04",
       "ubuntu-precise" => "ubuntu-12.04",
       "debian-squeeze" => "debian-6",
-      "debian-wheezy" => "debian-7"
+      "debian-wheezy" => "debian-7",
+      "debian-jessie" => "debian-8"
     }
 
     class << self
@@ -122,13 +123,6 @@ module Pkgr
       @errors ||= []
     end
 
-    def addons
-      # make proper Addon objects out of existing addon slugs
-      (@table[:addons] || []).map do |addon_slug|
-        Addon.new(addon_slug, addons_dir, self)
-      end
-    end
-
     def installer
       return nil if @table[:installer].nil? || @table[:installer] == false
       @table[:installer]
@@ -137,7 +131,11 @@ module Pkgr
     def wizards
       @wizards ||= (@table[:wizards] || []).map do |wizard_string|
         wizard_string.split(/\s*\|\s*/).map do |wizard|
-          Addon.new(wizard, nil, nil)
+          if wizard.start_with?('.')
+            wizard = Pathname.new(source_dir).join(wizard).realpath
+          end
+
+          Addon.new(wizard)
         end
       end
     end

data/lib/pkgr/dispatcher.rb

@@ -40,6 +40,11 @@ module Pkgr
       # Remove any non-digit characters that may be before the version number
       config.version ||= begin
         v = (Git.new(path).latest_tag || "").gsub(/^[^\d]+(\d.*)/, '\1')
+        # If it's not a Git archive, try to figure out svn revision number
+        begin
+          v = `cd #{path.to_s}&&svn info|grep Revision`.to_s.gsub!(/\D/, "") if (v !~ /^\d/)
+        rescue
+        end
         v = "0.0.0" if v !~ /^\d/
         v
       end

data/lib/pkgr/distributions/amazon.rb

@@ -0,0 +1,6 @@
+module Pkgr
+  module Distributions
+    class Amazon < Redhat
+    end
+  end
+end

data/lib/pkgr/distributions/base.rb

@@ -131,10 +131,6 @@ module Pkgr
         "etc/cron.d"
       end
 
-      def add_addon(addon)
-        nil
-      end
-
       def preinstall_file
         @preinstall_file ||= generate_hook_file("preinstall.sh")
         @preinstall_file.path

data/lib/pkgr/distributions/centos.rb

@@ -1,20 +1,8 @@
-require "pkgr/distributions/fedora"
+require "pkgr/distributions/redhat"
 
 module Pkgr
   module Distributions
-    # Contains the various components required to make a packaged app integrate well with a CentOS system.
-    class Centos < Fedora
-      def runner
-        # in truth it is 0.6.5, but it also works with 1.5 templates.
-        # maybe adopt the same structure as pleaserun, with defaults, etc.
-        @runner ||= Runner.new("upstart", "1.5", "initctl")
-      end
-
-      def templates
-        list = super
-        list.push Templates::DirTemplate.new("etc/init")
-        list
-      end
+    class Centos < Redhat
     end
   end
 end

data/lib/pkgr/distributions/debian.rb

@@ -13,7 +13,12 @@ module Pkgr
       end
 
       def runner
-        @runner ||= Runner.new("sysv", "lsb-3.1", "update-rc.d")
+        @runner ||= case release
+        when /^8/
+          Runner.new("systemd", "default", "systemctl")
+        else
+          Runner.new("sysv", "lsb-3.1", "update-rc.d")
+        end
       end
 
       def package_test_command(package)
@@ -58,19 +63,6 @@ module Pkgr
         @debtemplates ||= Tempfile.new("debtemplates")
       end
 
-      def add_addon(addon)
-        # make a debian package out of the addon
-        Dir.chdir(addon.dir) do
-          make_package = Mixlib::ShellOut.new %{dpkg-buildpackage -b -d}
-          make_package.logger = Pkgr.logger
-          make_package.run_command
-          make_package.error!
-        end
-        FileUtils.mv(Dir.glob(File.join(File.dirname(addon.dir), "*.deb")), Dir.pwd)
-        # return name of the dependency
-        addon.debian_dependency_name
-      end
-
       class DebianFpmCommand < FpmCommand
         def args
           list = super

data/lib/pkgr/distributions/redhat.rb

@@ -2,8 +2,27 @@ module Pkgr
   module Distributions
     class Redhat < Fedora
       def runner
-        @runner ||= Runner.new("sysv", "lsb-3.1", "chkconfig")
+        @runner ||= case release
+        when /^6/
+          Runner.new("upstart", "1.5", "initctl")
+        else
+          # newer releases default to using systemd as the init system
+          Runner.new("systemd", "default", "systemctl")
+        end
       end
+
+      def templates
+        if ["centos-6", "redhat-6"].include?(slug)
+          list = super
+          list.push Templates::DirTemplate.new("etc/init")
+          list
+        else
+          super
+        end
+      end
+
     end
   end
 end
+
+require 'pkgr/distributions/amazon'

data/lib/pkgr/distributions/runner.rb

@@ -9,6 +9,10 @@ module Pkgr
         type == "upstart"
       end
 
+      def systemd?
+        type == "systemd"
+      end
+
       def templates(process, app_name)
         send("templates_#{type}", process, app_name)
       end
@@ -31,6 +35,14 @@ module Pkgr
         ]
       end
 
+      def templates_systemd(process, app_name)
+        [
+          Templates::FileTemplate.new("systemd/#{app_name}.service", data_file("master.service.erb")),
+          Templates::FileTemplate.new("systemd/#{app_name}-#{process.name}.service", data_file("process_master.service.erb")),
+          Templates::FileTemplate.new("systemd/#{app_name}-#{process.name}-PROCESS_NUM.service", data_file("process.service.erb"))
+        ]
+      end
+
       def data_file(name)
         File.new(File.join(Pkgr.data_dir, "init", type, version, name))
       end

data/lib/pkgr/installer.rb

@@ -29,11 +29,7 @@ module Pkgr
       Dir.chdir(installer_tmp_dir) do
         config.wizards.each do |addon_group|
           addon_group.each do |addon|
-            addon_dir = "addons/#{addon.name}"
-            FileUtils.mkdir_p addon_dir
-            puts "-----> [wizard] adding #{addon.name} wizard (#{addon.url}##{addon.branch})"
-            shell.run!(
-              "curl -L --max-redirs 3 --retry 5 -s '#{addon.tarball_url}' | tar xzf - --strip-components=1 -C '#{addon_dir}'")
+            addon.install! 'addons'
           end
         end
 

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,20 +122,26 @@ files:
 - LICENSE
 - README.md
 - bin/pkgr
+- data/build_dependencies/amazon.yml
 - data/build_dependencies/centos.yml
 - data/build_dependencies/debian.yml
 - data/build_dependencies/fedora.yml
 - data/build_dependencies/sles.yml
 - data/build_dependencies/ubuntu.yml
+- data/buildpacks/amazon-2014
+- data/buildpacks/amazon-2015
 - data/buildpacks/centos-6
+- data/buildpacks/centos-7
 - data/buildpacks/debian-6
 - data/buildpacks/debian-7
+- data/buildpacks/debian-8
 - data/buildpacks/fedora-20
 - data/buildpacks/sles-12
 - data/buildpacks/ubuntu-10.04
 - data/buildpacks/ubuntu-12.04
 - data/buildpacks/ubuntu-14.04
 - data/cli/cli.sh.erb
+- data/dependencies/amazon.yml
 - data/dependencies/centos.yml
 - data/dependencies/debian.yml
 - data/dependencies/fedora.yml
@@ -146,6 +152,9 @@ files:
 - data/hooks/postuninstall.sh
 - data/hooks/preinstall.sh
 - data/hooks/preuninstall.sh
+- data/init/systemd/default/master.service.erb
+- data/init/systemd/default/process.service.erb
+- data/init/systemd/default/process_master.service.erb
 - data/init/sysv/lsb-3.1/master.erb
 - data/init/sysv/lsb-3.1/process.erb
 - data/init/sysv/lsb-3.1/process_master.erb
@@ -164,6 +173,7 @@ files:
 - lib/pkgr/cron.rb
 - lib/pkgr/dispatcher.rb
 - lib/pkgr/distributions.rb
+- lib/pkgr/distributions/amazon.rb
 - lib/pkgr/distributions/base.rb
 - lib/pkgr/distributions/centos.rb
 - lib/pkgr/distributions/debian.rb