pkgr 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88515b775ce0780722e7b2cf547a055eb389d2b1
-  data.tar.gz: 90ea8f15d716c46d2a2ae12a0cfaa77b1ecd5d9c
+  metadata.gz: 5bc2c3b54c7392441fcb7245dd55d92f50c079d7
+  data.tar.gz: 651f0aace529cd1fb2b4094cee35664544febb82
 SHA512:
-  metadata.gz: 8574750422452b0efe2a75d4be2703ccac4a8c33c8936c0b781928d25092a1dced9e07f6eb7fc8e92765292043fa30dbb5a59ea3e60658c67573c9b64ac5be0d
-  data.tar.gz: 1d730a9380f3c66a79f4e596e623028fd0e7637bb559da47b22d35b81f9fea2a184c2cb98878198b6b07e32cfcfafbc91afb5fccc45950844a2ceb215a2ed89e
+  metadata.gz: f3056964307ef13fb6d2180451bde13ef3dbdcb1b8e7aaf78aad32de65d075eff37237bcc78559ed20b3ac0626f4840a525f7fa59c828de0c1fadf6ca88fa929
+  data.tar.gz: adfc0cc6caa99afa30339503b98a65f8efa5fc9665d2aa67939f209a5f46f538df8e0ce2cc07a95bfdb4b34de53454b0661537dff4de178c1315df650546d38e

data/README.md

@@ -29,6 +29,7 @@ They may just work.
 
 ## Supported distributions (64bits only)
 
+* Ubuntu 18.04 ("bionic")
 * Ubuntu 16.04 ("xenial")
 * Ubuntu 14.04 ("trusty")
 * Ubuntu 12.04 ("precise")
@@ -81,6 +82,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
@@ -198,5 +204,3 @@ Issue getting nokogiri to compile? Try the following based on this [comment](htt
 ## Copyright
 
 See LICENSE (MIT)
-
-

data/data/build_dependencies/ubuntu.yml

@@ -13,5 +13,9 @@ 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

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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
 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#v183-1,BUILDPACK_NODE_VERSION="0.6.8"
+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/dependencies/ubuntu.yml

@@ -5,23 +5,38 @@ 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

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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,6 +143,7 @@ files:
 - data/buildpacks/ubuntu-12.04
 - data/buildpacks/ubuntu-14.04
 - data/buildpacks/ubuntu-16.04
+- data/buildpacks/ubuntu-18.04
 - data/cli/cli.sh.erb
 - data/dependencies/amazon.yml
 - data/dependencies/centos.yml