pkgr 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cff78ecb5e5e84c04eb9c36a903664cdfc4195c2
-  data.tar.gz: f09cd0f332a66eceee72cf9afd32dba516acf7ae
+  metadata.gz: 06310dd9deefd66e4d67362d37d7dccdcdf0c67a
+  data.tar.gz: 3510327310565582d099096ca2a1f5d1d45c0a8a
 SHA512:
-  metadata.gz: 1f620bd526031ff7a80fd21a6fdd745b6fa69578f11215addae6c1105f1670dff0037f504452350bbf9a0edbcc8bd24ca61461be81b7d083aaceb6407ae1eb50
-  data.tar.gz: 07443778726b8dbd8d703a4fd71b7677b3cc6414aa9d5a08156495bb26eb2efcfc2903c0496a9877728a83de56567d1aaa516d5026cdd93bd47a088244c3750e
+  metadata.gz: aef9f329e3ae1f861d301d93ebb57b09e694220cc67ff981b1c626f37b903d656236a4d2eeef63c27209b876cd95a98e508995c3265c1df2942fbe51d3207413
+  data.tar.gz: 846f1f6ae5c13d848cae05bed22b896e608a7160c455c9836246cb95a7872c41c3712f4281921291fe8794f3758011fb335cc91bdd895df1daa40455ca9101d0

data/README.md

@@ -32,7 +32,11 @@ See <https://packager.io/> for examples of apps packaged with `pkgr` (Gitlab, Op
 
 ## Installation
 
-On a debian based build machine:
+You can find DEB and RPM packages for a wide range of distributions on Packager.io:
+
+<https://packager.io/gh/crohr/pkgr>
+
+Or, installing as a gem, on debian-based machines:
 
     sudo apt-get update
     sudo apt-get install -y build-essential ruby1.9.1-full rubygems1.9.1
@@ -57,11 +61,14 @@ Full command line options are given below:
       [--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
+      [--vendor=VENDOR]                              # Package vendor
       [--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
+      [--category=CATEGORY]                          # Category this package belongs to
+                                                     # Default: none
       [--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: 20141015024539
@@ -73,6 +80,8 @@ Full command line options are given below:
       [--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.
+      [--before-remove=BEFORE_REMOVE]                # Provide a script to run just before a package gets uninstallated, on the target machine.
+      [--after-remove=AFTER_REMOVE]                  # Provide a script to run just after a package gets uninstallated, 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)
@@ -84,6 +93,11 @@ Full command line options are given below:
       [--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.
       [--store-cache], [--no-store-cache]            # Output a tarball of the cache in the current directory (name: cache.tar.gz)
+      [--verify], [--no-verify]                      # Verifies output package
+                                                     # Default: true
+      [--data-dir=DATA_DIR]                          # Custom path to data directory. Can be used for overriding default templates, hooks(pre-, post- scripts), configs (buildpacks, distro dependencies), environments, etc.
+                                                     # Default: ./pkgr/data
+      [--directories=DIRECTORIES]                    # Recursively mark a directory as being owned by the 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)
@@ -92,7 +106,7 @@ Full command line options are given below:
 
 ## Why?
 
-Tools such as [Capistrano](http://capify.org/) are great for deploying
+Tools such as [Capistrano](http://capistranorb.com/) are great for deploying
 applications, but the deployment recipe can quickly become a mess, and scaling
 the deployment to more than a few servers can prove to be difficult. Plus, if
 you're already using automation tools such as

data/data/build_dependencies/sles.yml

@@ -2,12 +2,17 @@ default:
   - curl
   - gcc
   - gcc-c++
-  - kernel-devel
   - libopenssl-devel
   - readline-devel
   - libxml2-devel
   - libxslt-devel
   - libevent-devel
-  - postgresql-devel
   - libmysqlclient-devel
   - sqlite3-devel
+  - timezone
+sles-11:
+  - kernel-default-devel
+  - postgresql94-devel
+sles-12:
+  - kernel-devel
+  - postgresql-devel

data/data/build_dependencies/ubuntu.yml

@@ -13,3 +13,5 @@ ubuntu-10.04:
   - libssl0.9.8
 ubuntu-12.04:
   - libssl1.0.0
+ubuntu-16.04:
+  - libssl1.0.0

data/data/buildpacks/sles-11

@@ -0,0 +1,2 @@
+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

data/data/buildpacks/sles-12

@@ -1,2 +1,2 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#universal-staging,BUILDPACK_NODE_VERSION="0.6.8",CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300
+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

data/data/buildpacks/ubuntu-16.04

@@ -0,0 +1,3 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git,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

@@ -50,6 +50,7 @@ fi
 
 # Source all environment variables for the app. This must be done as
 # privileged user since the config variables are only readable by root.
+PORT_WAS=$PORT
 for file in $(_p "/etc/${APP_NAME}/conf.d")/*; do
   if [ -f $file ]; then . $file; fi
 done
@@ -142,14 +143,6 @@ scale_up() {
   echo "Scaling up..."
 
   if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
-    # copy initd
-    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}") $(_p "/etc/init.d/")
-    chmod 0755 $(_p "/etc/init.d/${APP_NAME}")
-    # copy master
-    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}.conf") $(_p "/etc/init/")
-    # copy master process
-    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}-${PROCESS_NAME}.conf") $(_p "/etc/init/")
-
     for i in $(seq ${SCALE_DELTA}); do
       index=$((${i} + ${CURRENT_SCALE}))
       PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
@@ -165,15 +158,6 @@ 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}"
@@ -189,12 +173,6 @@ scale_up() {
     $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}")
-    sysv_enable ${APP_NAME}
-    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}-${PROCESS_NAME}") $(_p /etc/init.d/)
-    chmod a+x $(_p "/etc/init.d/${APP_NAME}-${PROCESS_NAME}")
-    sysv_enable ${APP_NAME}-${PROCESS_NAME}
     for i in $(seq ${SCALE_DELTA}); do
       index=$((${i} + ${CURRENT_SCALE}))
       PROCESS_ID="${APP_NAME}-${PROCESS_NAME}-${index}"
@@ -247,6 +225,32 @@ scale() {
   CURRENT_SCALE=${CURRENT_SCALE:="0"}
   SCALE_DELTA=$((${NEW_SCALE} - ${CURRENT_SCALE}))
 
+  if [ "${APP_RUNNER_TYPE}" = "upstart" ]; then
+    # copy initd
+    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}") $(_p "/etc/init.d/")
+    chmod 0755 $(_p "/etc/init.d/${APP_NAME}")
+    # copy master
+    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}.conf") $(_p "/etc/init/")
+    # copy master process
+    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/upstart/${APP_NAME}-${PROCESS_NAME}.conf") $(_p "/etc/init/")
+  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
+  else
+    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}") $(_p /etc/init.d/)
+    chmod a+x $(_p "/etc/init.d/${APP_NAME}")
+    sysv_enable ${APP_NAME}
+    cp $(_p "${APP_HOME}/vendor/pkgr/scaling/sysv/${APP_NAME}-${PROCESS_NAME}") $(_p /etc/init.d/)
+    chmod a+x $(_p "/etc/init.d/${APP_NAME}-${PROCESS_NAME}")
+    sysv_enable ${APP_NAME}-${PROCESS_NAME}
+  fi
+
   if [ $SCALE_DELTA -gt 0 ]; then
     scale_up "${PROCESS_NAME}" $CURRENT_SCALE $NEW_SCALE $SCALE_DELTA
   elif [ $SCALE_DELTA -lt 0 ]; then
@@ -290,6 +294,9 @@ while : ; do
         runnable="${runnable}$(printf " %q" ${COMMAND} "$@")"
       fi
 
+      # fix port
+      export PORT=$PORT_WAS
+
       # 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).
@@ -297,7 +304,8 @@ while : ; do
       if [ $(id -u) = $(id -u ${APP_USER}) ]; then
         exec sh -c "cd $(_p ${APP_HOME}) && $runnable"
       else
-        exec chroot --userspec ${APP_USER}:${APP_GROUP} "/" sh -c "cd $(_p ${APP_HOME}) && $runnable"
+        additional_groups="$(id -Gn ${APP_USER} |  tr ' ' ',')"
+        exec chroot --userspec ${APP_USER}:${APP_GROUP} --groups="${additional_groups}" "/" sh -c "cd $(_p ${APP_HOME}) && $runnable"
       fi
 
       break ;;

data/data/dependencies/debian.yml

@@ -19,3 +19,9 @@ debian-7:
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
+ubuntu-16.04:
+  - libssl1.0.0
+  - libmysqlclient20
+  - libevent-2.0-5
+  - libevent-core-2.0-5
+  - libevent-extra-2.0-5

data/data/dependencies/sles.yml

@@ -4,7 +4,12 @@ default:
   - libxml2
   - libxslt
   - libevent
-  - postgresql93
-  - libmysqlclient18
   - sqlite3
   - shadow
+sles-11:
+  - libmysqlclient15
+  - libmysqlclient_r15
+  - postgresql
+sles-12:
+  - libmysqlclient18
+  - postgresql93

data/data/dependencies/ubuntu.yml

@@ -19,3 +19,9 @@ ubuntu-12.04:
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
+ubuntu-16.04:
+  - libssl1.0.0
+  - libmysqlclient20
+  - libevent-2.0-5
+  - libevent-core-2.0-5
+  - libevent-extra-2.0-5

data/data/hooks/postinstall.sh

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

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

@@ -1,8 +1,2 @@
-start on (started network-interface
-          or started network-manager
-          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".
-# See <https://github.com/ddollar/foreman/issues/263>
-stop on runlevel [!2345]
+start on runlevel [2345]
+stop on runlevel [06]

data/lib/pkgr.rb

@@ -13,8 +13,13 @@ module Pkgr
     class ConfigurationInvalid < Base; end
   end
 
+  def data_dir=(path)
+    @data_dir = path
+  end
+  module_function :data_dir=
+
   def data_dir
-    File.expand_path("../../data", __FILE__)
+    @data_dir ||= File.expand_path("../../data", __FILE__)
   end
   module_function :data_dir
 end

data/lib/pkgr/builder.rb

@@ -68,6 +68,7 @@ module Pkgr
         end
       end
       config.distribution = distribution
+      config.env.variables.push("TARGET=#{distribution.target}")
       # useful for templates that need to read files
       config.source_dir = source_dir
       config.build_dir = build_dir
@@ -109,11 +110,17 @@ module Pkgr
       if buildpack_for_app
         puts "-----> #{buildpack_for_app.banner} app"
 
+        begin
+          FileUtils.mkdir_p(app_home_dir)
+        rescue Errno::EACCES => e
+          Pkgr.logger.warn "Can't create #{app_home_dir.inspect}, which may be needed by some buildpacks."
+        end
         FileUtils.mkdir_p(compile_cache_dir)
+        FileUtils.mkdir_p(compile_env_dir)
 
         run_hook config.before_hook
-        buildpack_for_app.compile(source_dir, compile_cache_dir)
-        buildpack_for_app.release(source_dir, compile_cache_dir)
+        buildpack_for_app.compile(source_dir, compile_cache_dir, compile_env_dir)
+        buildpack_for_app.release(source_dir)
         run_hook config.after_hook
       else
         raise Errors::UnknownAppType, "Can't find a buildpack for your app"
@@ -258,11 +265,21 @@ module Pkgr
       File.join(source_dir, "Procfile")
     end
 
+    # Some buildpacks may need the target home dir to exist
+    def app_home_dir
+      config.home
+    end
+
     # Directory where the buildpacks can store stuff.
     def compile_cache_dir
       config.compile_cache_dir || File.join(source_dir, ".git/cache")
     end
 
+    # Directory where the buildpacks can store config envs.
+    def compile_env_dir
+      config.compile_env_dir ||= Dir.mktmpdir
+    end
+
     # Returns the current distribution we're packaging for.
     def distribution
       @distribution ||= Distributions.current(config)

data/lib/pkgr/buildpack.rb

@@ -35,8 +35,8 @@ module Pkgr
       buildpack_detect.exitstatus == 0
     end
 
-    def compile(path, compile_cache_dir)
-      cmd = %{env -i PATH="$PATH"#{env} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" }
+    def compile(path, compile_cache_dir, compile_env_dir)
+      cmd = %{env -i PATH="$PATH"#{env} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" "#{compile_env_dir}" }
       Pkgr.debug "Running #{cmd.inspect}"
 
       Dir.chdir(path) do
@@ -52,8 +52,8 @@ module Pkgr
       true
     end
 
-    def release(path, compile_cache_dir)
-      buildpack_release = Mixlib::ShellOut.new("#{dir}/bin/release \"#{path}\" \"#{compile_cache_dir}\" > #{path}/.release")
+    def release(path)
+      buildpack_release = Mixlib::ShellOut.new("#{dir}/bin/release \"#{path}\" > #{path}/.release")
       buildpack_release.logger = Pkgr.logger
       buildpack_release.run_command
       buildpack_release.exitstatus == 0
@@ -75,7 +75,7 @@ module Pkgr
     def refresh(edge = true)
       return if !edge
       Dir.chdir(dir) do
-        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && git reset --hard $(git describe 'origin/#{branch}' || git describe '#{branch}')")
+        buildpack_refresh = Mixlib::ShellOut.new("git fetch origin && ( git reset --hard #{branch} || git reset --hard origin/#{branch} )")
         buildpack_refresh.logger = Pkgr.logger
         buildpack_refresh.run_command
         buildpack_refresh.error!
@@ -83,20 +83,22 @@ module Pkgr
     end
 
     def install
-      FileUtils.mkdir_p(buildpack_cache_dir)
-      Dir.chdir(buildpack_cache_dir) do
-        puts "-----> Fetching buildpack #{url} at #{branch}"
-        buildpack_install = Mixlib::ShellOut.new("git clone \"#{url}\"")
-        buildpack_install.logger = Pkgr.logger
-        buildpack_install.run_command
-        buildpack_install.error!
+      unless exists?
+        FileUtils.mkdir_p(buildpack_cache_dir)
+        Dir.chdir(buildpack_cache_dir) do
+          puts "-----> Fetching buildpack #{url} at #{branch}"
+          buildpack_install = Mixlib::ShellOut.new("git clone '#{url}'")
+          buildpack_install.logger = Pkgr.logger
+          buildpack_install.run_command
+          buildpack_install.error!
+        end
       end
       refresh(true)
     end
 
     def replace_app_with_app_home(app_home)
       Dir.chdir(dir) do
-        buildpack_replace = Mixlib::ShellOut.new("find . -type f -print0 | xargs -0 perl -pi -e s,/app,#{app_home},g")
+        buildpack_replace = Mixlib::ShellOut.new("find . -type f -not -path '*/.git/*' -print0 | xargs -0 perl -pi -e s,/app/,#{app_home}/,g")
         buildpack_replace.logger = Pkgr.logger
         buildpack_replace.run_command
         buildpack_replace.error!

data/lib/pkgr/cli.rb

@@ -5,6 +5,12 @@ require 'pkgr/env'
 
 module Pkgr
   class CLI < Thor
+    no_tasks do
+      def self.default_data_dir
+        File.expand_path("../../../data", __FILE__)
+      end
+    end
+
     class_option :verbose,
       :type => :boolean,
       :default => false,
@@ -37,8 +43,7 @@ module Pkgr
       :desc => "Maintainer"
     method_option :vendor,
       :type => :string,
-      :desc => "Package vendor",
-      :default => "pkgr <https://github.com/crohr/pkgr>"
+      :desc => "Package vendor"
     method_option :architecture,
       :type => :string,
       :default => "x86_64",
@@ -52,6 +57,10 @@ module Pkgr
     method_option :description,
       :type => :string,
       :desc => "Project description"
+    method_option :category,
+      :type => :string,
+      :default => "none",
+      :desc => "Category this package belongs to"
     method_option :version,
       :type => :string,
       :desc => "Package version (if git directory given, it will use the latest git tag available)"
@@ -100,6 +109,10 @@ module Pkgr
       :type => :array,
       :default => [],
       :desc => "Specific system dependencies that must be present before building"
+    method_option :disable_default_dependencies,
+      :type => :boolean,
+      :default => false,
+      :desc => "Disable default dependencies"
     method_option :host,
       :type => :string,
       :desc => "Remote host to build on (default: local machine)"
@@ -129,10 +142,23 @@ module Pkgr
       :type => :boolean,
       :default => true,
       :desc => "Verifies output package"
+    method_option :data_dir,
+      :type => :string,
+      :default => default_data_dir,
+      :desc => "Custom path to data directory. Can be used for overriding default templates, hooks(pre-, post- scripts), configs (buildpacks, distro dependencies), environments, etc."
+    method_option :directories,
+      :type => :string,
+      :default => nil,
+      :desc => "Recursively mark a directory as being owned by the package"
+    method_option :disable_cli,
+      :type => :boolean,
+      :default => false,
+      :desc => "Disable installing CLI"
 
     def package(tarball)
       Pkgr.level = Logger::INFO if options[:verbose]
       Pkgr.level = Logger::DEBUG if options[:debug]
+      Pkgr.data_dir = options[:data_dir]
 
       Pkgr::Buildpack.buildpacks_cache_dir = options[:buildpacks_cache_dir] if options[:buildpacks_cache_dir]
 

data/lib/pkgr/config.rb

@@ -73,7 +73,19 @@ module Pkgr
     end
 
     def cli?
-      @table.has_key?(:cli) ? @table[:cli] : true
+      if disable_cli.nil?
+        @table.has_key?(:cli) ? @table[:cli] : true
+      else
+        !disable_cli
+      end
+    end
+
+    def skip_default_dependencies?
+      if disable_default_dependencies.nil?
+        @table[:default_dependencies] === false
+      else
+        disable_default_dependencies == true
+      end
     end
 
     def home
@@ -104,6 +116,10 @@ module Pkgr
       @table[:maintainer] || "<someone@pkgr>"
     end
 
+    def vendor
+      @table[:vendor] || "pkgr <https://github.com/crohr/pkgr>"
+    end
+
     def env
       @table[:env].is_a?(Pkgr::Env) ? @table[:env] : Pkgr::Env.new(@table[:env])
     end

data/lib/pkgr/distributions/base.rb

@@ -27,6 +27,13 @@ module Pkgr
         [os, release].join("-")
       end # def slug
 
+      def target
+        {
+          "centos-6" => "el:6",
+          "centos-7" => "el:7"
+        }.fetch(slug, slug.sub("-", ":"))
+      end
+
       def package_test_command(package)
         raise NotImplementedError, "package_test_command must be implemented"
       end
@@ -80,6 +87,7 @@ module Pkgr
 
       def dependencies(other_dependencies = nil)
         deps = YAML.load_file(data_file("dependencies", "#{os}.yml"))
+        deps = {} if config.skip_default_dependencies?
         (deps["default"] || []) | (deps[slug] || []) | (other_dependencies || [])
       end # def dependencies
 

data/lib/pkgr/distributions/sles.rb

@@ -5,7 +5,6 @@ require 'pkgr/fpm_command'
 
 module Pkgr
   module Distributions
-    # Contains the various components required to make a packaged app integrate well with a Debian system.
     class Sles < Base
       # Only keep major digits
       def release
@@ -25,7 +24,12 @@ module Pkgr
       end
 
       def installer_dependencies
-        super.push("which").push("net-tools").uniq
+        if release.to_i > 11
+          super.push("which").push("net-tools").uniq
+        else
+          # sles-11 already has which installed
+          super.push("net-tools").uniq
+        end
       end
 
       def fpm_command(build_dir)
@@ -42,6 +46,3 @@ module Pkgr
     end
   end
 end
-
-require 'pkgr/distributions/redhat'
-require 'pkgr/distributions/centos'

data/lib/pkgr/distributions/ubuntu.rb

@@ -10,7 +10,12 @@ module Pkgr
       end
 
       def runner
-        @runner ||= Runner.new("upstart", "1.5", "initctl")
+        @runner ||= case release
+        when /^16.04/
+          Runner.new("systemd", "default", "systemctl")
+        else
+          Runner.new("upstart", "1.5", "initctl")
+        end
       end
 
       def templates

data/lib/pkgr/fpm_command.rb

@@ -31,11 +31,13 @@ module Pkgr
       list << "--description" << config.description
       list << "--maintainer" << config.maintainer
       list << "--vendor" << config.vendor
-      list << %{--template-scripts}
+      list << "--category" << config.category
+      list << "--template-scripts"
       list << "--before-install" << distribution.preinstall_file
       list << "--after-install" << distribution.postinstall_file
       list << "--before-remove" << distribution.preuninstall_file
       list << "--after-remove" << distribution.postuninstall_file
+      list << "--directories" << config.directories unless config.directories.nil?
       distribution.dependencies(config.dependencies).each{|d| list << "-d" << d}
       list.compact
     end

data/lib/pkgr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,10 +136,12 @@ files:
 - data/buildpacks/debian-7
 - data/buildpacks/debian-8
 - data/buildpacks/fedora-20
+- data/buildpacks/sles-11
 - data/buildpacks/sles-12
 - data/buildpacks/ubuntu-10.04
 - data/buildpacks/ubuntu-12.04
 - data/buildpacks/ubuntu-14.04
+- data/buildpacks/ubuntu-16.04
 - data/cli/cli.sh.erb
 - data/dependencies/amazon.yml
 - data/dependencies/centos.yml