diff options
| author | Nikhil Gupta <35272911+nikhil2611@users.noreply.github.com> | 2023-03-01 14:24:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-01 19:54:55 +0530 |
| commit | ffe18d3144da81de1340a6b199f4271bb9cd445f (patch) | |
| tree | b05fcd31cad21c9ed5df441480f55e5854c0a0a8 /knife | |
| parent | e8b0fe1681fed81af9f17579df046e43897964e9 (diff) | |
| download | chef-ffe18d3144da81de1340a6b199f4271bb9cd445f.tar.gz | |
proxifier2 gem in sync with repo fork (#13617)
* New gem proxifier2 published from fork in chef/ruby-proxifier
* Key change in proxifier2 gem enables Ruby 3.1 compatibility
* Older way caused inconsistency for chef gem users.
---------
Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
Signed-off-by: Ashique P S <Ashique.saidalavi@progress.com>
Co-authored-by: Ashique P S <Ashique.saidalavi@progress.com>
Diffstat (limited to 'knife')
| -rw-r--r-- | knife/Gemfile | 3 | ||||
| -rw-r--r-- | knife/Gemfile.lock | 1 | ||||
| -rw-r--r-- | knife/knife.gemspec | 2 |
3 files changed, 2 insertions, 4 deletions
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 } |