pkgr 1.8.0 → 1.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3e4ee7683642379d95db25293212b682d6372658d25f1c4af1c351060ad02c23
4
- data.tar.gz: b6395fae78964b3e198c59474290f93136f4e411033c77dda5aa93cc3c05370e
3
+ metadata.gz: 97cad2ada805d4a5d186aa6e8dac7def0ba3d1d6dc80255ded270149ed4d8333
4
+ data.tar.gz: f6b258481d1081548ba9a6b0f1f0e78002379c7123c1e7bb9c85b9bdab5027b8
5
5
  SHA512:
6
- metadata.gz: 7b7698dce4aff8fc9bcdf7dc2d62b1c77187e953d7d9a4852acb25c2f12af0b7f36ae48a5d03befd09889091ada6db67d88813ac78955963af59e460c3b1556a
7
- data.tar.gz: 79d7ebb82c466d8b1b4dadcbcbf0912663bb51b959344982beedf506b6ab064da1d0d69782cf641cf1c4bcfbcb486d5208610854823368df5ee66c70c24942c9
6
+ metadata.gz: 5c8606fde8bdb86b138c3079289177f4ec28db16e174ea5f328fe477933c6a2aaf37499321e009fe34777696c08abf7e472b3ea802af6a20cb5ba1945965d456
7
+ data.tar.gz: '0179edc432d6f0f8f2c81ec5f1bafd306112463fe7029778397d75436e430245a7985989ff5c2ad6d11aa895c510b689969cfc4600a9462f2386a8f05ff6cb72'
data/README.md CHANGED
@@ -29,11 +29,13 @@ They may just work.
29
29
 
30
30
  ## Supported distributions (64bits only)
31
31
 
32
+ * Ubuntu 22.04 ("jammy")
32
33
  * Ubuntu 20.04 ("focal")
33
34
  * Ubuntu 18.04 ("bionic")
34
35
  * Ubuntu 16.04 ("xenial")
35
36
  * Ubuntu 14.04 ("trusty")
36
37
  * Ubuntu 12.04 ("precise")
38
+ * Debian 11 ("bullseye")
37
39
  * Debian 10 ("buster")
38
40
  * Debian 9 ("stretch")
39
41
  * Debian 8 ("jessie")
@@ -66,9 +68,9 @@ To package your app, execute `pkgr` against your app's repository:
66
68
  pkgr package path/to/app/repo
67
69
 
68
70
  # if using a docker image, you can run it from any host OS:
69
- docker run --rm -it -v $(pwd):/app -v /tmp/cache pkgr/ubuntu:20.04
70
- docker run --rm -it -v $(pwd):/app -v /tmp/cache pkgr/el:8
71
- docker run --rm -it -v $(pwd):/app -v /tmp/cache pkgr/debian:10
71
+ docker run --rm -it -v $(pwd):/app -v /tmp/cache:/cache pkgr/ubuntu:20.04
72
+ docker run --rm -it -v $(pwd):/app -v /tmp/cache:/cache pkgr/el:8
73
+ docker run --rm -it -v $(pwd):/app -v /tmp/cache:/cache pkgr/debian:10
72
74
 
73
75
  The resulting `.deb` or `.rpm` package will be in your current working directory.
74
76
 
@@ -9,5 +9,10 @@ default:
9
9
  - libxslt-devel
10
10
  - libevent-devel
11
11
  - postgresql-devel
12
- - mysql-devel
13
12
  - sqlite-devel
13
+ centos-6:
14
+ - mysql-devel
15
+ centos-7:
16
+ - mariadb-devel
17
+ centos-8:
18
+ - mariadb-devel
@@ -27,3 +27,7 @@ debian-10:
27
27
  - libssl1.1
28
28
  - libssl-dev
29
29
  - default-libmysqlclient-dev
30
+ debian-11:
31
+ - libssl1.1
32
+ - libssl-dev
33
+ - default-libmysqlclient-dev
@@ -21,3 +21,5 @@ ubuntu-18.04:
21
21
  - libssl1.0.0
22
22
  ubuntu-20.04:
23
23
  - libssl1.1
24
+ ubuntu-22.04:
25
+ - libssl3
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -0,0 +1,4 @@
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
+ https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
+ https://github.com/kr/heroku-buildpack-go.git
@@ -1,3 +1,3 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
3
  https://github.com/heroku/heroku-buildpack-ruby.git,CURL_CONNECT_TIMEOUT=60,CURL_TIMEOUT=300
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,3 +1,3 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
@@ -1,3 +1,3 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
@@ -1,3 +1,3 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
@@ -1,3 +1,3 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
3
  https://github.com/heroku/heroku-buildpack-nodejs.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -1,4 +1,4 @@
1
- https://github.com/pkgr/heroku-buildpack-ruby.git#v227-1
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
2
  https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
- https://github.com/heroku/heroku-buildpack-nodejs.git#v106
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
4
  https://github.com/kr/heroku-buildpack-go.git
@@ -0,0 +1,4 @@
1
+ https://github.com/pkgr/heroku-buildpack-ruby.git#v242-1
2
+ https://github.com/pkgr/heroku-buildpack-python.git#buildcurl
3
+ https://github.com/heroku/heroku-buildpack-nodejs.git#v197
4
+ https://github.com/kr/heroku-buildpack-go.git
@@ -4,7 +4,6 @@ default:
4
4
  - libxml2
5
5
  - libxslt
6
6
  - libevent
7
- - mysql-libs
8
7
  - sqlite
9
8
  centos-6:
10
9
  - postgresql-libs
@@ -1,5 +1,4 @@
1
1
  default:
2
- - mysql-common
3
2
  - libpq5
4
3
  - libsqlite3-0
5
4
  - openssl
@@ -7,7 +6,6 @@ default:
7
6
  - libxslt1.1
8
7
  debian-6:
9
8
  - libssl0.9.8
10
- - libmysqlclient16
11
9
  - libevent-1.4-2
12
10
  - libevent-core-1.4-2
13
11
  - libevent-extra-1.4-2
@@ -15,7 +13,6 @@ debian-6:
15
13
  - libreadline6
16
14
  debian-7:
17
15
  - libssl1.0.0
18
- - libmysqlclient18
19
16
  - libevent-2.0-5
20
17
  - libevent-core-2.0-5
21
18
  - libevent-extra-2.0-5
@@ -23,7 +20,6 @@ debian-7:
23
20
  - libreadline6
24
21
  debian-8:
25
22
  - libssl1.0.0
26
- - libmysqlclient18
27
23
  - libevent-2.0-5
28
24
  - libevent-core-2.0-5
29
25
  - libevent-extra-2.0-5
@@ -31,7 +27,6 @@ debian-8:
31
27
  - libreadline6
32
28
  debian-9:
33
29
  - libssl1.0.2
34
- - libmariadbclient18
35
30
  - libevent-2.0-5
36
31
  - libevent-core-2.0-5
37
32
  - libevent-extra-2.0-5
@@ -7,9 +7,6 @@ default:
7
7
  - sqlite3
8
8
  - shadow
9
9
  sles-11:
10
- - libmysqlclient15
11
- - libmysqlclient_r15
12
10
  - postgresql
13
11
  sles-12:
14
- - libmysqlclient18
15
12
  - postgresql
@@ -1,5 +1,4 @@
1
1
  default:
2
- - mysql-common
3
2
  - libpq5
4
3
  - libsqlite3-0
5
4
  - openssl
@@ -8,35 +7,30 @@ default:
8
7
  ubuntu-10.04:
9
8
  - libreadline5
10
9
  - libssl0.9.8
11
- - libmysqlclient16
12
10
  - libevent-1.4-2
13
11
  - libevent-core-1.4-2
14
12
  - libevent-extra-1.4-2
15
13
  ubuntu-12.04:
16
14
  - libreadline6
17
15
  - libssl1.0.0
18
- - libmysqlclient18
19
16
  - libevent-2.0-5
20
17
  - libevent-core-2.0-5
21
18
  - libevent-extra-2.0-5
22
19
  ubuntu-14.04:
23
20
  - libreadline6
24
21
  - libssl1.0.0
25
- - libmysqlclient18
26
22
  - libevent-2.0-5
27
23
  - libevent-core-2.0-5
28
24
  - libevent-extra-2.0-5
29
25
  ubuntu-16.04:
30
26
  - libreadline6
31
27
  - libssl1.0.0
32
- - libmysqlclient20
33
28
  - libevent-2.0-5
34
29
  - libevent-core-2.0-5
35
30
  - libevent-extra-2.0-5
36
31
  ubuntu-18.04:
37
32
  - libreadline7
38
33
  - libssl1.0.0
39
- - libmysqlclient20
40
34
  - libevent-2.1-6
41
35
  - libevent-core-2.1-6
42
36
  - libevent-extra-2.1-6
@@ -46,3 +40,7 @@ ubuntu-20.04:
46
40
  - libevent-2.1-7
47
41
  - libevent-core-2.1-7
48
42
  - libevent-extra-2.1-7
43
+ ubuntu-22.04:
44
+ - libreadline8
45
+ - libssl3
46
+ - libev4
@@ -27,6 +27,10 @@ chown ${APP_USER}.${APP_GROUP} /var/db/${APP_NAME}
27
27
  chmod 0750 /etc/${APP_NAME} /etc/${APP_NAME}/conf.d
28
28
  find /etc/${APP_NAME} -type f -exec chmod 0640 {} +
29
29
 
30
+ <% if crons.any? %>
31
+ mkdir -p "<%= crons_dir %>"
32
+ <% end %>
33
+
30
34
  <% crons.each do |cron| %>
31
35
  rm -f <%= cron.destination %>
32
36
  cp <%= cron.source %> <%= cron.destination %>
data/lib/pkgr/builder.rb CHANGED
@@ -166,6 +166,7 @@ module Pkgr
166
166
  # Write cron files
167
167
  def setup_crons
168
168
  crons_dir = File.join("/", distribution.crons_dir)
169
+ config.crons_dir = crons_dir
169
170
 
170
171
  config.crons.map! do |cron_path|
171
172
  Cron.new(File.expand_path(cron_path, config.home), File.join(crons_dir, File.basename(cron_path)))
@@ -24,7 +24,7 @@ module Pkgr
24
24
  def initialize(url, type = :builtin, env = nil)
25
25
  @uuid = Digest::SHA1.hexdigest(url)
26
26
  @url, @branch = url.split("#")
27
- @branch ||= "master"
27
+ @branch ||= "main"
28
28
  @type = type
29
29
  @env = env || Env.new
30
30
  end
@@ -14,7 +14,7 @@ module Pkgr
14
14
 
15
15
  def runner
16
16
  @runner ||= case release
17
- when /^8/, /^9/, /^10/
17
+ when /^8/, /^9/, /^10/, /^11/
18
18
  Runner.new("systemd", "default", "systemctl")
19
19
  else
20
20
  Runner.new("sysv", "lsb-3.1", "update-rc.d")
@@ -41,7 +41,7 @@ module Pkgr
41
41
  Dir.glob(File.join(output_dir, "*deb")).each do |package|
42
42
  puts "-----> Verifying package #{File.basename(package)}"
43
43
  Dir.mktmpdir do |dir|
44
- verify_package = Mixlib::ShellOut.new %{dpkg-deb -x #{package} #{dir}}
44
+ verify_package = Mixlib::ShellOut.new %{dpkg-deb -x "#{package}" "#{dir}"}
45
45
  verify_package.logger = Pkgr.logger
46
46
  verify_package.run_command
47
47
  verify_package.error!
@@ -20,7 +20,12 @@ module Pkgr
20
20
  end
21
21
 
22
22
  def package_install_command(packages)
23
- "sudo zypper refresh ; sudo zypper install -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
23
+ # --no-gpg-checks helps with outdated repos for SLES
24
+ zypper_flags = []
25
+ if release.to_i <= 12
26
+ zypper_flags.push("--no-gpg-checks")
27
+ end
28
+ "sudo zypper refresh ; sudo zypper #{zypper_flags.join(" ")} install -y #{packages.map{|package| "\"#{package}\""}.join(" ")}"
24
29
  end
25
30
 
26
31
  def installer_dependencies
@@ -37,6 +37,10 @@ class EnvValue < String
37
37
  "#{f}#{self}#{b}"
38
38
  end
39
39
 
40
+ def strip
41
+ self.class.new(super)
42
+ end
43
+
40
44
  def unquote
41
45
  s = self.dup
42
46
 
data/lib/pkgr/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Pkgr
2
- VERSION = "1.8.0"
2
+ VERSION = "1.9.0"
3
3
  end
data/lib/pkgr.rb CHANGED
@@ -2,6 +2,14 @@ require 'pkgr/version'
2
2
  require 'pkgr/cli'
3
3
  require 'pkgr/dispatcher'
4
4
  require 'mixlib/log'
5
+ require 'yaml'
6
+
7
+ # https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias/71192990#71192990
8
+ module YAML
9
+ class << self
10
+ alias_method :load, :unsafe_load if YAML.respond_to? :unsafe_load
11
+ end
12
+ end
5
13
 
6
14
  module Pkgr
7
15
  extend Mixlib::Log
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pkgr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.0
4
+ version: 1.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Cyril Rohr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-05-28 00:00:00.000000000 Z
11
+ date: 2022-06-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -134,6 +134,7 @@ files:
134
134
  - data/buildpacks/centos-7
135
135
  - data/buildpacks/centos-8
136
136
  - data/buildpacks/debian-10
137
+ - data/buildpacks/debian-11
137
138
  - data/buildpacks/debian-6
138
139
  - data/buildpacks/debian-7
139
140
  - data/buildpacks/debian-8
@@ -147,6 +148,7 @@ files:
147
148
  - data/buildpacks/ubuntu-16.04
148
149
  - data/buildpacks/ubuntu-18.04
149
150
  - data/buildpacks/ubuntu-20.04
151
+ - data/buildpacks/ubuntu-22.04
150
152
  - data/cli/cli.sh.erb
151
153
  - data/dependencies/amazon.yml
152
154
  - data/dependencies/centos.yml
@@ -218,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
218
220
  - !ruby/object:Gem::Version
219
221
  version: '1.3'
220
222
  requirements: []
221
- rubyforge_project:
222
- rubygems_version: 2.7.9
223
+ rubygems_version: 3.2.22
223
224
  signing_key:
224
225
  specification_version: 4
225
226
  summary: Package any Ruby, NodeJS or Go app as a deb or rpm package