diff options
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 13 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | knife/Gemfile | 3 | ||||
| -rw-r--r-- | knife/Gemfile.lock | 1 | ||||
| -rw-r--r-- | knife/knife.gemspec | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 10 |
8 files changed, 12 insertions, 24 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 9f7a3f22da..1357f447c2 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -266,7 +266,7 @@ subscriptions: - workload: ruby_gem_published:addressable-* actions: - bash:.expeditor/update_dep.sh - - workload: ruby_gem_published:proxifier-* + - workload: ruby_gem_published:proxifier2-* actions: - bash:.expeditor/update_dep.sh - workload: ruby_gem_published:syslog-logger-* @@ -37,9 +37,6 @@ group(:omnibus_package, :pry) do gem "pry-stack_explorer" end -# proxifier gem is busted on ruby 3.1 and seems abandoned so use git fork of gem -gem "proxifier", git: "https://github.com/chef/ruby-proxifier", branch: "lcg/ruby-3" - # Everything except AIX and Windows group(:ruby_shadow) do # if ruby-shadow does a release that supports ruby-3.0 this can be removed diff --git a/Gemfile.lock b/Gemfile.lock index 9bfce4cdee..02d2ac25e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,13 +40,6 @@ GIT specs: ruby-shadow (2.5.0) -GIT - remote: https://github.com/chef/ruby-proxifier - revision: 8b87d0b5b469adbd93eabc0d20f3e47007aef743 - branch: lcg/ruby-3 - specs: - proxifier (1.0.3) - PATH remote: . specs: @@ -76,7 +69,7 @@ PATH net-sftp (>= 2.1.2, < 5.0) ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) train-core (~> 3.10) train-rest (>= 0.4.1) @@ -112,7 +105,7 @@ PATH net-sftp (>= 2.1.2, < 5.0) ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) train-core (~> 3.10) train-rest (>= 0.4.1) @@ -327,6 +320,7 @@ GEM pastel (0.8.0) tty-color (~> 0.5) plist (3.6.0) + proxifier2 (1.1.0) pry (0.13.0) coderay (~> 1.1) method_source (~> 1.0) @@ -496,7 +490,6 @@ DEPENDENCIES ffi (>= 1.15.5) inspec-core-bin (>= 5) ohai! - proxifier! pry (= 0.13.0) pry-byebug pry-stack_explorer diff --git a/chef.gemspec b/chef.gemspec index 867a52e4b6..d98b74a7d7 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -61,7 +61,7 @@ Gem::Specification.new do |s| s.add_dependency "unf_ext", ">= 0.0.8.2" # This is ruby31 compatible ucrt gem version s.add_dependency "corefoundation", "~> 0.3.4" # macos_userdefaults resource - s.add_dependency "proxifier", "~> 1.0" + s.add_dependency "proxifier2", "~> 1.1" s.add_dependency "aws-sdk-s3", "~> 1.91" # s3 recipe-url support s.add_dependency "aws-sdk-secretsmanager", "~> 1.46" diff --git a/knife/Gemfile b/knife/Gemfile index ed6bf36acb..a2321726c7 100644 --- a/knife/Gemfile +++ b/knife/Gemfile @@ -2,9 +2,6 @@ source "https://rubygems.org" gem "knife", path: "." -# proxifier gem is busted on ruby 3.1 and seems abandoned so use git fork of gem -gem "proxifier", git: "https://github.com/chef/ruby-proxifier", branch: "lcg/ruby-3" - group(:development, :test) do gem "cheffish", ">= 14" # testing only , but why didn't this need to explicit in chef? gem "webmock" # testing only diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock index 7b29d8743a..042ffd9b4a 100644 --- a/knife/Gemfile.lock +++ b/knife/Gemfile.lock @@ -22,7 +22,6 @@ DEPENDENCIES ffi (>= 1.15.5) inspec-core-bin (>= 5) ohai! - proxifier! pry (= 0.13.0) pry-byebug pry-stack_explorer diff --git a/knife/knife.gemspec b/knife/knife.gemspec index 7bd8b345b9..212452db61 100644 --- a/knife/knife.gemspec +++ b/knife/knife.gemspec @@ -42,6 +42,8 @@ Gem::Specification.new do |s| s.add_development_dependency "chefstyle" + s.add_dependency "proxifier2", "~> 1.1" + s.bindir = "bin" s.executables = %w{ knife } diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 9d90793879..ee4ae10916 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -17,7 +17,7 @@ GIT chef-utils (>= 15.4) contracts (>= 0.16.0, < 0.17.0) ffi-yajl (~> 2.2) - license_scout (~> 1.0) + license_scout (~> 1.3) mixlib-shellout (>= 2.0, < 4.0) mixlib-versioning ohai (>= 16, < 19) @@ -93,7 +93,7 @@ GEM net-sftp (>= 2.1.2, < 5.0) ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) train-core (~> 3.10) train-rest (>= 0.4.1) @@ -129,7 +129,7 @@ GEM net-sftp (>= 2.1.2, < 5.0) ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) train-core (~> 3.10) train-rest (>= 0.4.1) @@ -249,7 +249,7 @@ GEM tomlrb (>= 1.2, < 3.0) tty-box (~> 0.6) tty-prompt (~> 0.20) - license_scout (1.3.4) + license_scout (1.3.5) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) @@ -332,7 +332,7 @@ GEM rainbow zhexdump (>= 0.0.2) plist (3.7.0) - proxifier (1.0.3) + proxifier2 (1.1.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) |