git: 4303a6c8bf13 - main - devel/rubygem-pdk: Update to 2.2.0
Romain Tartière
romain at FreeBSD.org
Sun Aug 8 21:26:26 UTC 2021
The branch main has been updated by romain:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4303a6c8bf133e031c35763f00610e2ea165a9b8
commit 4303a6c8bf133e031c35763f00610e2ea165a9b8
Author: Romain Tartière <romain at FreeBSD.org>
AuthorDate: 2021-08-08 20:45:48 +0000
Commit: Romain Tartière <romain at FreeBSD.org>
CommitDate: 2021-08-08 21:22:02 +0000
devel/rubygem-pdk: Update to 2.2.0
With hat: puppet
---
devel/rubygem-pdk/Makefile | 21 ++++---
devel/rubygem-pdk/distinfo | 6 +-
.../files/patch-lib_pdk_cli_exec_command.rb | 11 ++++
.../files/patch-lib_pdk_util_bundler.rb | 24 ++++++++
devel/rubygem-pdk/files/patch-pdk.gemspec | 68 ++++++++++++++++------
5 files changed, 99 insertions(+), 31 deletions(-)
diff --git a/devel/rubygem-pdk/Makefile b/devel/rubygem-pdk/Makefile
index d9e52179c727..0bd780fe1ff7 100644
--- a/devel/rubygem-pdk/Makefile
+++ b/devel/rubygem-pdk/Makefile
@@ -1,5 +1,5 @@
PORTNAME= pdk
-PORTVERSION= 1.13.0
+PORTVERSION= 2.2.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -9,25 +9,24 @@ COMMENT= CLI for development of Puppet modules
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= facter>=2.5.1:sysutils/facter \
- rubygem-bundler>=1.15:sysutils/rubygem-bundler \
- rubygem-childprocess>=0.7.1:devel/rubygem-childprocess \
+RUN_DEPENDS= rubygem-bundler>=1.15:sysutils/rubygem-bundler \
+ rubygem-childprocess>=4.0.0:devel/rubygem-childprocess \
rubygem-concurrent-ruby>=1.1.5:devel/rubygem-concurrent-ruby \
rubygem-cri>=2.10.1:devel/rubygem-cri \
rubygem-deep_merge>=1.1:devel/rubygem-deep_merge \
- rubygem-diff-lcs>=1.3:textproc/rubygem-diff-lcs \
+ rubygem-diff-lcs>=1.4.4:textproc/rubygem-diff-lcs \
+ rubygem-facter>=2.5.1:sysutils/rubygem-facter \
rubygem-ffi>=1.9:devel/rubygem-ffi \
rubygem-gettext-setup>=0.24:devel/rubygem-gettext-setup \
- rubygem-hitimes>=1.3.0:devel/rubygem-hitimes \
+ rubygem-hitimes>=2.0.0:devel/rubygem-hitimes \
rubygem-httpclient>=2.8.3:www/rubygem-httpclient \
- rubygem-json-schema>=2.8.0:devel/rubygem-json-schema \
rubygem-json_pure>=2.1.0:devel/rubygem-json_pure \
+ rubygem-json-schema>=2.8.0:devel/rubygem-json-schema \
rubygem-minitar>=0.6.1:archivers/rubygem-minitar \
- rubygem-net-ssh>=4.2.0:security/rubygem-net-ssh \
rubygem-pathspec>=0.2.1:devel/rubygem-pathspec \
- rubygem-tty-prompt>=0.13.1:devel/rubygem-tty-prompt \
- rubygem-tty-spinner>=0.5.0:devel/rubygem-tty-spinner \
- rubygem-tty-which>=0.3.0:devel/rubygem-tty-which
+ rubygem-tty-prompt>=0.22:devel/rubygem-tty-prompt \
+ rubygem-tty-spinner>=0.5:devel/rubygem-tty-spinner \
+ rubygem-tty-which>=0.3:devel/rubygem-tty-which
USES= gem
USE_RUBY= yes
diff --git a/devel/rubygem-pdk/distinfo b/devel/rubygem-pdk/distinfo
index b54fbbc2432d..b1399d6785d2 100644
--- a/devel/rubygem-pdk/distinfo
+++ b/devel/rubygem-pdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569180408
-SHA256 (rubygem/pdk-1.13.0.gem) = b0fbfb2127c121ef212bb29304255bef0761561540e724788dded87d63b68d34
-SIZE (rubygem/pdk-1.13.0.gem) = 113664
+TIMESTAMP = 1628455569
+SHA256 (rubygem/pdk-2.2.0.gem) = b85546bef4c5fb0abdb523911f190e943d78019a35804e9d42238ac4d7d1d12d
+SIZE (rubygem/pdk-2.2.0.gem) = 160256
diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb
new file mode 100644
index 000000000000..acbd22d88129
--- /dev/null
+++ b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb
@@ -0,0 +1,11 @@
+--- lib/pdk/cli/exec/command.rb.orig 2021-08-08 20:46:32 UTC
++++ lib/pdk/cli/exec/command.rb
+@@ -187,7 +187,7 @@ module PDK
+
+ resolved_env['GEM_HOME'] = PDK::Util::RubyVersion.gem_home
+ gem_path = PDK::Util::RubyVersion.gem_path
+- resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path
++ # resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path
+
+ # Make sure invocation of Ruby prefers our private installation.
+ package_binpath = PDK::Util.package_install? ? File.join(PDK::Util.pdk_package_basedir, 'bin') : nil
diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb b/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb
new file mode 100644
index 000000000000..247d9ac4baf6
--- /dev/null
+++ b/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb
@@ -0,0 +1,24 @@
+--- lib/pdk/util/bundler.rb.orig 2021-08-08 21:11:44 UTC
++++ lib/pdk/util/bundler.rb
+@@ -21,12 +21,7 @@ module PDK
+ return
+ end
+
+- unless bundle.locked?
+- # Generate initial default Gemfile.lock, either from package cache or
+- # by invoking `bundle lock`
+- bundle.lock!
+- end
+-
++ if bundle.locked?
+ # Check if all dependencies will be available once we update the lockfile.
+ begin
+ original_lockfile = bundle.gemfile_lock
+@@ -40,6 +35,7 @@ module PDK
+ end
+
+ bundle.update_lock!(with: gem_overrides, local: all_deps_available)
++ end
+
+ # If there are missing dependencies after updating the lockfile, let `bundle install`
+ # go out and get them. If the specified puppet gem version points to a remote location
diff --git a/devel/rubygem-pdk/files/patch-pdk.gemspec b/devel/rubygem-pdk/files/patch-pdk.gemspec
index 2e0278296668..7d6f8aa5267b 100644
--- a/devel/rubygem-pdk/files/patch-pdk.gemspec
+++ b/devel/rubygem-pdk/files/patch-pdk.gemspec
@@ -1,31 +1,65 @@
---- pdk.gemspec.orig 2019-09-22 19:33:51 UTC
+--- pdk.gemspec.orig 2021-08-08 20:47:41 UTC
+++ pdk.gemspec
-@@ -24,21 +24,21 @@ Gem::Specification.new do |s|
+@@ -24,16 +24,16 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<bundler>.freeze, [">= 1.15.0", "< 3.0.0"])
-- s.add_runtime_dependency(%q<childprocess>.freeze, ["~> 0.7.1"])
-+ s.add_runtime_dependency(%q<childprocess>.freeze, [">= 0.7.1"])
+- s.add_runtime_dependency(%q<childprocess>.freeze, ["~> 4.0.0"])
++ s.add_runtime_dependency(%q<childprocess>.freeze, [">= 4.0.0"])
s.add_runtime_dependency(%q<cri>.freeze, ["~> 2.10"])
- s.add_runtime_dependency(%q<diff-lcs>.freeze, ["= 1.3"])
-- s.add_runtime_dependency(%q<ffi>.freeze, ["~> 1.9.0"])
-+ s.add_runtime_dependency(%q<ffi>.freeze, [">= 1.9.0"])
+ s.add_runtime_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
+ s.add_runtime_dependency(%q<ffi>.freeze, [">= 1.9.25", "< 2.0.0"])
s.add_runtime_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
-- s.add_runtime_dependency(%q<hitimes>.freeze, ["= 1.3.0"])
+ s.add_runtime_dependency(%q<hitimes>.freeze, ["= 2.0.0"])
- s.add_runtime_dependency(%q<json-schema>.freeze, ["= 2.8.0"])
-+ s.add_runtime_dependency(%q<hitimes>.freeze, [">= 1.3.0"])
+- s.add_runtime_dependency(%q<json_pure>.freeze, ["~> 2.1.0"])
+ s.add_runtime_dependency(%q<json-schema>.freeze, [">= 2.8.0"])
- s.add_runtime_dependency(%q<json_pure>.freeze, ["~> 2.1.0"])
-- s.add_runtime_dependency(%q<minitar>.freeze, ["~> 0.6.1"])
++ s.add_runtime_dependency(%q<json_pure>.freeze, [">= 2.1.0"])
+ s.add_runtime_dependency(%q<minitar>.freeze, ["~> 0.6"])
- s.add_runtime_dependency(%q<pathspec>.freeze, ["~> 0.2.1"])
-+ s.add_runtime_dependency(%q<minitar>.freeze, [">= 0.6.1"])
+ s.add_runtime_dependency(%q<pathspec>.freeze, [">= 0.2.1"])
- s.add_runtime_dependency(%q<tty-prompt>.freeze, ["~> 0.13"])
+ s.add_runtime_dependency(%q<tty-prompt>.freeze, ["~> 0.22"])
s.add_runtime_dependency(%q<tty-spinner>.freeze, ["~> 0.5"])
s.add_runtime_dependency(%q<tty-which>.freeze, ["~> 0.3"])
- s.add_runtime_dependency(%q<concurrent-ruby>.freeze, ["~> 1.1.5"])
-- s.add_runtime_dependency(%q<facter>.freeze, ["~> 2.5.1"])
-+ s.add_runtime_dependency(%q<facter>.freeze, [">= 2.5.1"])
- s.add_runtime_dependency(%q<httpclient>.freeze, ["~> 2.8.3"])
+@@ -43,16 +43,16 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<deep_merge>.freeze, ["~> 1.1"])
else
+ s.add_dependency(%q<bundler>.freeze, [">= 1.15.0", "< 3.0.0"])
+- s.add_dependency(%q<childprocess>.freeze, ["~> 4.0.0"])
++ s.add_dependency(%q<childprocess>.freeze, [">= 4.0.0"])
+ s.add_dependency(%q<cri>.freeze, ["~> 2.10"])
+ s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
+ s.add_dependency(%q<ffi>.freeze, [">= 1.9.25", "< 2.0.0"])
+ s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
+ s.add_dependency(%q<hitimes>.freeze, ["= 2.0.0"])
+- s.add_dependency(%q<json-schema>.freeze, ["= 2.8.0"])
+- s.add_dependency(%q<json_pure>.freeze, ["~> 2.1.0"])
++ s.add_dependency(%q<json-schema>.freeze, [">= 2.8.0"])
++ s.add_dependency(%q<json_pure>.freeze, [">= 2.1.0"])
+ s.add_dependency(%q<minitar>.freeze, ["~> 0.6"])
+- s.add_dependency(%q<pathspec>.freeze, ["~> 0.2.1"])
++ s.add_dependency(%q<pathspec>.freeze, [">= 0.2.1"])
+ s.add_dependency(%q<tty-prompt>.freeze, ["~> 0.22"])
+ s.add_dependency(%q<tty-spinner>.freeze, ["~> 0.5"])
+ s.add_dependency(%q<tty-which>.freeze, ["~> 0.3"])
+@@ -63,16 +63,16 @@ Gem::Specification.new do |s|
+ end
+ else
+ s.add_dependency(%q<bundler>.freeze, [">= 1.15.0", "< 3.0.0"])
+- s.add_dependency(%q<childprocess>.freeze, ["~> 4.0.0"])
++ s.add_dependency(%q<childprocess>.freeze, [">= 4.0.0"])
+ s.add_dependency(%q<cri>.freeze, ["~> 2.10"])
+ s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
+ s.add_dependency(%q<ffi>.freeze, [">= 1.9.25", "< 2.0.0"])
+ s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
+ s.add_dependency(%q<hitimes>.freeze, ["= 2.0.0"])
+- s.add_dependency(%q<json-schema>.freeze, ["= 2.8.0"])
+- s.add_dependency(%q<json_pure>.freeze, ["~> 2.1.0"])
++ s.add_dependency(%q<json-schema>.freeze, [">= 2.8.0"])
++ s.add_dependency(%q<json_pure>.freeze, [">= 2.1.0"])
+ s.add_dependency(%q<minitar>.freeze, ["~> 0.6"])
+- s.add_dependency(%q<pathspec>.freeze, ["~> 0.2.1"])
++ s.add_dependency(%q<pathspec>.freeze, [">= 0.2.1"])
+ s.add_dependency(%q<tty-prompt>.freeze, ["~> 0.22"])
+ s.add_dependency(%q<tty-spinner>.freeze, ["~> 0.5"])
+ s.add_dependency(%q<tty-which>.freeze, ["~> 0.3"])
More information about the dev-commits-ports-main
mailing list