pkgr 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4295eff26d27f2e59538234d2dd56bbd3cd1f414
-  data.tar.gz: 4cbbec7b378bc664c72f8cf7ab2d146e9311607e
+  metadata.gz: 564ea525211c15964819eae121133db41de7584b
+  data.tar.gz: 9e8d7b4abc90f369062d3d2523a0f6374c9a341a
 SHA512:
-  metadata.gz: 482bb1d56b8d58727326f8e39dfa31b44a6702b04d3d74e871d47b644ed3615233304881b31c8b9fbdfb0dc2f152f689e2ad4129c55c51f386e2ac5b7d431df1
-  data.tar.gz: ba7d6a6bc42b625d0912edcae450f76717820c8ca80bafff7a3a17af3b536eb794c491256fc78bad55f1ab31dfbb0ffd7efd556ebdd9e7a49eb62d5501a81b3c
+  metadata.gz: b78c0884063dbb2eda33c0a072ab788a90e7829f11076ab52f1ab4eba349b2d8ccef416a6544d85e0c6925969bbc1a9d21e98258ed0ef7c5735a3aff842ae204
+  data.tar.gz: f44786665247d5b47b9ed224c7315a5110342640e6a87a2f6695a6d85f7a53e92a674b1e422af03d2eb21dc6f38fdd5bd5699f1dc0494b698bae42b55dd1ed15

data/README.md

@@ -33,6 +33,7 @@ They may just work.
 * Ubuntu 16.04 ("xenial")
 * Ubuntu 14.04 ("trusty")
 * Ubuntu 12.04 ("precise")
+* Debian 10 ("buster")
 * Debian 9 ("stretch")
 * Debian 8 ("jessie")
 * Debian 7 ("wheezy")

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/buildpacks/amazon-2014

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v206-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#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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

@@ -1,4 +1,4 @@
-https://github.com/pkgr/heroku-buildpack-ruby.git#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+https://github.com/pkgr/heroku-buildpack-ruby.git#v206-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
@@ -367,13 +381,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 +485,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/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.7.1"
+  VERSION = "1.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2019-12-03 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