pkgr 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e98f1b219e5532799c5127fd9796eaebe923e44446c0456157dbea92d2603047
-  data.tar.gz: 0e374445dac42c0e483e53e9fd9763296d7ba079c2ea1e94b7e683ef7b99e8ce
+  metadata.gz: 3e4ee7683642379d95db25293212b682d6372658d25f1c4af1c351060ad02c23
+  data.tar.gz: b6395fae78964b3e198c59474290f93136f4e411033c77dda5aa93cc3c05370e
 SHA512:
-  metadata.gz: 0e7ef7cefe654a5349b8e2ace2d42b63fc2fe71c05216d9f76235c498f80636cee4bb858c3a4afed5cf8f69c8d4a934e41fbf2cd67bb9901199aaf0afe1efaa2
-  data.tar.gz: f208b312bd1a128d2f755863dc1bb01b54353a727c68381a8eb62321a22d1c2e330c56abc1475900be4623443cb95ee4fb2b5b7fa0dba072e96b7c67815e1a9f
+  metadata.gz: 7b7698dce4aff8fc9bcdf7dc2d62b1c77187e953d7d9a4852acb25c2f12af0b7f36ae48a5d03befd09889091ada6db67d88813ac78955963af59e460c3b1556a
+  data.tar.gz: 79d7ebb82c466d8b1b4dadcbcbf0912663bb51b959344982beedf506b6ab064da1d0d69782cf641cf1c4bcfbcb486d5208610854823368df5ee66c70c24942c9

data/README.md

@@ -52,15 +52,25 @@ See [Packager.io][packager-io] for examples of apps packaged with `pkgr` (Gitlab
 
 ## Installation
 
+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:
+
     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:
 

data/data/buildpacks/amazon-2014

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

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

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

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

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

@@ -110,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() {
@@ -135,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 "$@"
@@ -168,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))
 }

data/lib/pkgr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake