From 85209ab9d7ee11a173485fadedc4a5dac986b64f Mon Sep 17 00:00:00 2001 From: avilevy Date: Thu, 5 Dec 2024 16:38:19 +0000 Subject: [PATCH 1/5] Updating thor --- ui_gems.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_gems.rb b/ui_gems.rb index ae7bffe3..e672b0e9 100644 --- a/ui_gems.rb +++ b/ui_gems.rb @@ -14,7 +14,7 @@ download "tilt", "1.4.1" download "settingslogic", "2.0.9" download "erubis", "2.7.0" -download "thor", "0.19.1" +download "thor", "1.3.2" download "builder", "3.2.2" download "request_store", "1.1.0" download "timers", "1.1.0" From bda60ba9fb26ddd12cc6d4e13492ab75ab2c34e3 Mon Sep 17 00:00:00 2001 From: avilevy Date: Thu, 5 Dec 2024 17:35:09 +0000 Subject: [PATCH 2/5] Attempting to override the thor dependency for omnibus --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 46ea3ec5..dd7f65d5 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ gem 'berkshelf', '~> 3.0' # Install omnibus software gem 'omnibus', :github => 'chef/omnibus' gem 'omnibus-software', :github => 'chef/omnibus-software' +gem 'thor', '1.3.2', override: true gem 'kubeclient', '4.10.1' From daba92d2ef7b3666619682ad78b1acfcd938f68e Mon Sep 17 00:00:00 2001 From: avilevy Date: Thu, 5 Dec 2024 18:02:24 +0000 Subject: [PATCH 3/5] bug fix --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index dd7f65d5..bdd4e58e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'berkshelf', '~> 3.0' # Install omnibus software gem 'omnibus', :github => 'chef/omnibus' gem 'omnibus-software', :github => 'chef/omnibus-software' -gem 'thor', '1.3.2', override: true +gem 'thor', '1.3.2' gem 'kubeclient', '4.10.1' From 5c5483e0f19059b2850941aec9020add426d56f5 Mon Sep 17 00:00:00 2001 From: avilevy Date: Thu, 5 Dec 2024 18:49:50 +0000 Subject: [PATCH 4/5] Reverting changes --- Gemfile | 1 - ui_gems.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index bdd4e58e..46ea3ec5 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,6 @@ gem 'berkshelf', '~> 3.0' # Install omnibus software gem 'omnibus', :github => 'chef/omnibus' gem 'omnibus-software', :github => 'chef/omnibus-software' -gem 'thor', '1.3.2' gem 'kubeclient', '4.10.1' diff --git a/ui_gems.rb b/ui_gems.rb index e672b0e9..ae7bffe3 100644 --- a/ui_gems.rb +++ b/ui_gems.rb @@ -14,7 +14,7 @@ download "tilt", "1.4.1" download "settingslogic", "2.0.9" download "erubis", "2.7.0" -download "thor", "1.3.2" +download "thor", "0.19.1" download "builder", "3.2.2" download "request_store", "1.1.0" download "timers", "1.1.0" From d2da72701213f3f367130ac435035dfbd9aa595a Mon Sep 17 00:00:00 2001 From: avilevy Date: Mon, 9 Dec 2024 20:23:13 +0000 Subject: [PATCH 5/5] Update `did_you_mean` --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 46ea3ec5..c9ffb68f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source 'https://rubygems.org' +gem 'did_you_mean', '<2.0.0' + # Use Berkshelf for resolving cookbook dependencies gem 'berkshelf', '~> 3.0'