pkgr 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 88515b775ce0780722e7b2cf547a055eb389d2b1
-  data.tar.gz: 90ea8f15d716c46d2a2ae12a0cfaa77b1ecd5d9c
+SHA256:
+  metadata.gz: 3e4ee7683642379d95db25293212b682d6372658d25f1c4af1c351060ad02c23
+  data.tar.gz: b6395fae78964b3e198c59474290f93136f4e411033c77dda5aa93cc3c05370e
 SHA512:
-  metadata.gz: 8574750422452b0efe2a75d4be2703ccac4a8c33c8936c0b781928d25092a1dced9e07f6eb7fc8e92765292043fa30dbb5a59ea3e60658c67573c9b64ac5be0d
-  data.tar.gz: 1d730a9380f3c66a79f4e596e623028fd0e7637bb559da47b22d35b81f9fea2a184c2cb98878198b6b07e32cfcfafbc91afb5fccc45950844a2ceb215a2ed89e
+  metadata.gz: 7b7698dce4aff8fc9bcdf7dc2d62b1c77187e953d7d9a4852acb25c2f12af0b7f36ae48a5d03befd09889091ada6db67d88813ac78955963af59e460c3b1556a
+  data.tar.gz: 79d7ebb82c466d8b1b4dadcbcbf0912663bb51b959344982beedf506b6ab064da1d0d69782cf641cf1c4bcfbcb486d5208610854823368df5ee66c70c24942c9

data/README.md

@@ -29,12 +29,16 @@ They may just work.
 
 ## Supported distributions (64bits only)
 
+* Ubuntu 20.04 ("focal")
+* Ubuntu 18.04 ("bionic")
 * Ubuntu 16.04 ("xenial")
 * Ubuntu 14.04 ("trusty")
 * Ubuntu 12.04 ("precise")
+* Debian 10 ("buster")
 * Debian 9 ("stretch")
 * Debian 8 ("jessie")
 * Debian 7 ("wheezy")
+* RHEL/CentOS 8
 * RHEL/CentOS 7
 * RHEL/CentOS 6
 * Suse Linux Enterprise Server 12
@@ -48,23 +52,25 @@ See [Packager.io][packager-io] for examples of apps packaged with `pkgr` (Gitlab
 
 ## Installation
 
-You can find DEB and RPM packages for a wide range of distributions on Packager.io:
+Docker images are available for the most recent distributions. If you don't
+have docker or are interested in older distributions, you can also install
+`pkgr` as a ruby gem:
 
-<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
-    sudo gem install pkgr
+    gem install pkgr
 
 ## Usage
 
 To package your app, execute `pkgr` against your app's repository:
 
+    # if using the ruby gem, you need to run it under the distribution you want to package for:
     pkgr package path/to/app/repo
 
-The resulting `.deb` or `.rpm` package will be in your current working directory. That is, you need to run `pkgr` on the target distribution for which you want to generate a package.
+    # if using a docker image, you can run it from any host OS:
+    docker run --rm -it -v $(pwd):/app -v /tmp/cache pkgr/ubuntu:20.04
+    docker run --rm -it -v $(pwd):/app -v /tmp/cache pkgr/el:8
+    docker run --rm -it -v $(pwd):/app -v /tmp/cache pkgr/debian:10
+
+The resulting `.deb` or `.rpm` package will be in your current working directory. 
 
 Full command line options are given below:
 
@@ -81,6 +87,11 @@ Full command line options are given below:
       [--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)
+      [--logrotate-frequency=FREQUENCY]              # Set logrotate frequency
+                                                     # Default: daily
+                                                     # Possible values: daily, weekly, monthly, yearly
+      [--logrotate-backlog=BACKLOG]                  # Set logrotate backlog
+                                                     # Default: 14
       [--homepage=HOMEPAGE]                          # Project homepage (e.g. "https://pkgr.example.org")
       [--home=HOME]                                  # Project home (e.g. "/usr/share/PACKAGE_HOME")
       [--description=DESCRIPTION]                    # Project description
@@ -140,7 +151,7 @@ Finally, it's a great way to share your open source software with your users and
 
 * 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.packager.io/post/81988994454/why-i-made-pkgr-io-digressions-on-software-packaging
+[background-pkgr]: https://blog.packager.io/posts/1-why-i-made-packager-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:
 
@@ -198,5 +209,3 @@ Issue getting nokogiri to compile? Try the following based on this [comment](htt
 ## Copyright
 
 See LICENSE (MIT)
-
-

data/data/build_dependencies/debian.yml

@@ -23,3 +23,7 @@ debian-9:
   - libssl1.0.2
   - libssl1.0-dev
   - default-libmysqlclient-dev
+debian-10:
+  - libssl1.1
+  - libssl-dev
+  - default-libmysqlclient-dev

data/data/build_dependencies/ubuntu.yml

@@ -13,5 +13,11 @@ ubuntu-10.04:
   - libssl0.9.8
 ubuntu-12.04:
   - libssl1.0.0
+ubuntu-14.04:
+  - libssl1.0.0
 ubuntu-16.04:
   - libssl1.0.0
+ubuntu-18.04:
+  - libssl1.0.0
+ubuntu-20.04:
+  - libssl1.1

data/data/buildpacks/amazon-2014

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/amazon-2015

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/centos-6

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/centos-7

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/centos-8

@@ -0,0 +1,4 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
+https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
+https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-10

@@ -0,0 +1,4 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
+https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
+https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-6

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-ruby.git,CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300

data/data/buildpacks/debian-7

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-8

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/debian-9

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/fedora-20

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106

data/data/buildpacks/sles-11

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106

data/data/buildpacks/sles-12

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106

data/data/buildpacks/ubuntu-10.04

@@ -1,3 +1,3 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git

data/data/buildpacks/ubuntu-12.04

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/ubuntu-14.04

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/ubuntu-16.04

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v164-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
 https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
 https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/ubuntu-18.04

@@ -0,0 +1,4 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
+https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
+https://github.com/kr/heroku-buildpack-go.git

data/data/buildpacks/ubuntu-20.04

@@ -0,0 +1,4 @@
+https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
+https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
+https://github.com/heroku/heroku-buildpack-nodejs.git#v106
+https://github.com/kr/heroku-buildpack-go.git

data/data/cli/cli.sh.erb

@@ -28,6 +28,7 @@ usage() {
   echo "  $APP_NAME logs [--tail|-n NUMBER]"
   echo "  $APP_NAME config:get VAR"
   echo "  $APP_NAME config:set VAR=VALUE"
+  echo "  $APP_NAME config:unset VAR"
   echo "  $APP_NAME configure"
   echo "  $APP_NAME reconfigure"
   echo "  $APP_NAME restart"
@@ -46,6 +47,7 @@ usage() {
   echo ""
   echo "  $APP_NAME restart [process]"
   echo "    This will restart the application (or the given process), in a distribution-independent manner."
+  exit 64
 }
 
 DEFAULT_FILE=$(_p "/etc/default/${APP_NAME}")
@@ -59,7 +61,19 @@ for file in $(_p "${APP_HOME}/.profile.d")/*.sh; do
 done
 
 if [ "$APP_CLI" != "" ] ; then
-  exec $APP_HOME/bin/$APP_CLI "$@"
+  cli_path="$APP_CLI"
+  if [ ! -e "$cli_path" ]; then
+    cli_path="$APP_HOME/$APP_CLI"
+  fi
+  if [ ! -e "$cli_path" ]; then
+    cli_path="$APP_HOME/bin/$APP_CLI"
+  fi
+  if [ -e "$cli_path" ]; then
+    exec "$cli_path" "$@"
+  else
+    echo "Error: the given CLI ($APP_CLI) does not point to any valid executable"
+    exit 1
+  fi
 fi
 
 if [ ! -w "$(_p "/etc/${APP_NAME}/conf.d")" ] ; then
@@ -96,14 +110,24 @@ show_env() {
   env -i ROOT_PATH=${ROOT_PATH} ${0} run env | sort
 }
 
+logs_files() {
+  files=$(shopt -s nullglob dotglob; echo $(_p "/var/log/${APP_NAME}")/*.log)
+  echo "$files"
+}
+
 logs_opt() {
+  files=$(logs_files)
+  if [ "$files" == "" ]; then
+    return
+  fi
+
   if [ "$1" == "" ]; then
-    for file in $(_p "/var/log/${APP_NAME}")/*.log ; do
+    for file in $files ; do
       echo "==> ${file} <=="
       cat "${file}"
     done
   else
-    tail $(_p "/var/log/${APP_NAME}")/*.log "$@"
+    tail $files "$@"
   fi
 }
 logs_systemd() {
@@ -121,7 +145,11 @@ logs() {
 }
 
 tail_logs_opt() {
-  tail -f $(_p "/var/log/${APP_NAME}")/*.log
+  files=$(logs_files)
+  if [ "$files" == "" ]; then
+    return
+  fi
+  tail -f $files
 }
 tail_logs_systemd() {
   journalctl -u "$APP_NAME-*" -f "$@"
@@ -154,7 +182,7 @@ process_index() {
   if [ -f "$(_p "${APP_HOME}/Procfile")" ]; then
     index="$(cat "$(_p "${APP_HOME}/Procfile")" | grep -ve '^#' | grep -n "$process_name:" | cut -f 1 -d ':')"
   else
-    index=0
+    index=1
   fi
   echo $(($index - 1))
 }
@@ -367,13 +395,18 @@ reconfigure() {
   configure --reconfigure
 }
 
+config_unset() {
+  local key="${1}"
+  sed -i -r "s/^\s*export\s+${key}.*$//g" $(_p "/etc/${APP_NAME}/conf.d")/*
+}
+
 config_set() {
   # http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02
   local key="${1%%=*}"
   local value="${1#*=}"
   local file=$(_p "/etc/${APP_NAME}/conf.d/other")
   touch "$file"
-  sed -i -r "s/^\s*export\s+${key}.*$//g" $(_p "/etc/${APP_NAME}/conf.d")/*
+  config_unset "$key"
   echo "export ${key}=\"${value}\"" >> "${file}"
   sed -i '/^\s*$/d' "$file"
 }
@@ -466,10 +499,14 @@ while : ; do
       show_env
       break;;
 
+    config:unset)
+      [ $# -lt 2 ] && usage
+      config_unset "$2"
+      break;;
+
     config:set)
       [ $# -lt 2 ] && usage
       config_set "$2"
-
       break;;
 
     config:get)

data/data/dependencies/centos.yml

@@ -4,6 +4,11 @@ default:
   - libxml2
   - libxslt
   - libevent
-  - postgresql-libs
   - mysql-libs
   - sqlite
+centos-6:
+  - postgresql-libs
+centos-7:
+  - postgresql-libs
+centos-8:
+  - libpq

data/data/dependencies/ubuntu.yml

@@ -5,23 +5,44 @@ default:
   - openssl
   - libxml2
   - libxslt1.1
-  - libreadline5
-  - libreadline6
 ubuntu-10.04:
+  - libreadline5
   - libssl0.9.8
   - libmysqlclient16
   - libevent-1.4-2
   - libevent-core-1.4-2
   - libevent-extra-1.4-2
 ubuntu-12.04:
+  - libreadline6
+  - libssl1.0.0
+  - libmysqlclient18
+  - libevent-2.0-5
+  - libevent-core-2.0-5
+  - libevent-extra-2.0-5
+ubuntu-14.04:
+  - libreadline6
   - libssl1.0.0
   - libmysqlclient18
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
 ubuntu-16.04:
+  - libreadline6
   - libssl1.0.0
   - libmysqlclient20
   - libevent-2.0-5
   - libevent-core-2.0-5
   - libevent-extra-2.0-5
+ubuntu-18.04:
+  - libreadline7
+  - libssl1.0.0
+  - libmysqlclient20
+  - libevent-2.1-6
+  - libevent-core-2.1-6
+  - libevent-extra-2.1-6
+ubuntu-20.04:
+  - libreadline8
+  - libssl1.1
+  - libevent-2.1-7
+  - libevent-core-2.1-7
+  - libevent-extra-2.1-7

data/data/logrotate/logrotate.erb

@@ -1,8 +1,8 @@
 # <%= name %> logs:
 /var/log/<%= name %>/*.log {
-  daily
+  <%= logrotate_frequency %>
   missingok
-  rotate 14
+  rotate <%= logrotate_backlog %>
   compress
   delaycompress
   notifempty

data/lib/pkgr/buildpack.rb

@@ -7,8 +7,14 @@ module Pkgr
       attr_writer :buildpacks_cache_dir
 
       def buildpacks_cache_dir
-        @buildpacks_cache_dir ||= File.expand_path("~/.pkgr/buildpacks").tap do |dir|
-          FileUtils.mkdir_p(dir)
+        default_buildpacks_cache_dir = File.expand_path("~/.pkgr/buildpacks")
+        @buildpacks_cache_dir ||= begin
+          default_buildpacks_cache_dir.tap do |dir|
+            FileUtils.mkdir_p(dir)
+          end
+        rescue
+          Pkgr.warn "Unable to create directory at #{default_buildpacks_cache_dir.inspect}. Using temporary directory."
+          Dir.mktmpdir
         end
       end
     end
@@ -36,7 +42,10 @@ module Pkgr
     end
 
     def compile(path, compile_cache_dir, compile_env_dir)
-      cmd = %{env -i #{compound_environment(path)} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" "#{compile_env_dir}" }
+      compile_home_dir = Dir.mktmpdir
+      # Required to work around bundler forcing a writable home dir
+      local_env = Env.new(["HOME=#{compile_home_dir}"])
+      cmd = %{env -i #{compound_environment(path, local_env)} #{dir}/bin/compile "#{path}" "#{compile_cache_dir}" "#{compile_env_dir}" }
       Pkgr.debug "Running #{cmd.inspect}"
 
       Dir.chdir(path) do
@@ -48,7 +57,8 @@ module Pkgr
         end
         raise "compile failed" unless $?.exitstatus.zero?
       end
-
+    ensure
+      FileUtils.remove_entry_secure compile_home_dir
       true
     end
 
@@ -107,8 +117,8 @@ module Pkgr
 
   private
 
-    def compound_environment(path)
-      Env.new(['PATH=$PATH']).merge(env).merge(exported_environment(File.join(path, "export")))
+    def compound_environment(path, local_env = Env.new)
+      Env.new(['PATH=$PATH']).merge(local_env).merge(env).merge(exported_environment(File.join(path, "export")))
     end
 
     def exported_environment(path)

data/lib/pkgr/cli.rb

@@ -51,6 +51,15 @@ module Pkgr
     method_option :runner,
       :type => :string,
       :desc => "Force a specific runner (e.g. upstart-1.5, sysv-lsb-1.3)"
+    method_option :logrotate_frequency,
+      :type => :string,
+      :desc => "Set logrotate backlog",
+      :enum => %w(daily weekly monthly yearly),
+      :default => "daily"
+    method_option :logrotate_backlog,
+      :type => :numeric,
+      :desc => "Set logrotate backlog",
+      :default => 14
     method_option :homepage,
       :type => :string,
       :desc => "Project homepage"

data/lib/pkgr/config.rb

@@ -92,6 +92,14 @@ module Pkgr
       @table[:home] || "/opt/#{name}"
     end
 
+    def logrotate_frequency
+      @table[:logrotate_frequency] || "daily"
+    end
+
+    def logrotate_backlog
+      @table[:logrotate_backlog] || 14
+    end
+
     def user
       @table[:user] || name
     end
@@ -252,6 +260,8 @@ module Pkgr
       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 "--runner \"#{runner}\"" unless runner.nil? || runner.empty?
+      args.push "--logrotate-frequency \"#{logrotate_frequency}\"" unless logrotate_frequency.nil? || logrotate_frequency.empty?
+      args.push "--logrotate-backlog \"#{logrotate_backlog}\"" unless logrotate_backlog.nil?
       args.push "--env #{env.variables.map{|v| "\"#{v}\""}.join(" ")}" if env.present?
       args.push "--auto" if auto
       args.push "--verbose" if verbose

data/lib/pkgr/dispatcher.rb

@@ -42,7 +42,7 @@ module Pkgr
         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/)
+          v = `cd #{path.to_s} && svn info 2>/dev/null | grep Revision`.to_s.gsub!(/\D/, "") if (v !~ /^\d/)
         rescue
         end
         v = "0.0.0" if v !~ /^\d/

data/lib/pkgr/distributions/base.rb

@@ -30,7 +30,8 @@ module Pkgr
       def target
         {
           "centos-6" => "el:6",
-          "centos-7" => "el:7"
+          "centos-7" => "el:7",
+          "centos-8" => "el:8"
         }.fetch(slug, slug.sub("-", ":"))
       end
 

data/lib/pkgr/distributions/debian.rb

@@ -14,7 +14,7 @@ module Pkgr
 
       def runner
         @runner ||= case release
-        when /^8/, /^9/
+        when /^8/, /^9/, /^10/
           Runner.new("systemd", "default", "systemctl")
         else
           Runner.new("sysv", "lsb-3.1", "update-rc.d")

data/lib/pkgr/distributions/ubuntu.rb

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

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.6.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,6 +132,8 @@ files:
 - data/buildpacks/amazon-2015
 - data/buildpacks/centos-6
 - data/buildpacks/centos-7
+- data/buildpacks/centos-8
+- data/buildpacks/debian-10
 - data/buildpacks/debian-6
 - data/buildpacks/debian-7
 - data/buildpacks/debian-8
@@ -143,6 +145,8 @@ files:
 - data/buildpacks/ubuntu-12.04
 - data/buildpacks/ubuntu-14.04
 - data/buildpacks/ubuntu-16.04
+- data/buildpacks/ubuntu-18.04
+- data/buildpacks/ubuntu-20.04
 - data/cli/cli.sh.erb
 - data/dependencies/amazon.yml
 - data/dependencies/centos.yml
@@ -215,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Package any Ruby, NodeJS or Go app as a deb or rpm package