summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeha Pansare <neha.pansare@progress.com>2022-09-22 18:30:57 +0530
committerNeha Pansare <neha.pansare@progress.com>2022-09-22 18:30:57 +0530
commit4d3cd62b8a07d4986c76763ce661fe211ccffbe4 (patch)
tree2c134afb16b6a9278d528b2fce0181c94fe2827f
parent4a692429d8bdff36ed8253305042311e5dab2765 (diff)
downloadchef-4d3cd62b8a07d4986c76763ce661fe211ccffbe4.tar.gz
Resolve 'lock file is unreadable error' for chef's lockfile
Signed-off-by: Neha Pansare <neha.pansare@progress.com>
-rw-r--r--Gemfile.lock14
-rw-r--r--chef-universal-mingw-ucrt.gemspec1
-rw-r--r--chef.gemspec2
-rw-r--r--knife/Gemfile.lock1
4 files changed, 10 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e3d6001dbf..8e7e84aae2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GIT
branch: lcg/ruby-3.0
specs:
ruby-shadow (2.5.0)
-
+
GIT
remote: https://github.com/chef/ruby-proxifier
revision: 8b87d0b5b469adbd93eabc0d20f3e47007aef743
@@ -97,11 +97,11 @@ PATH
corefoundation (~> 0.3.4)
diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
erubis (~> 2.7)
- ffi (>= 1.5.0)
+ ffi (>= 1.15.5)
ffi-libarchive (~> 1.0, >= 1.0.3)
ffi-yajl (~> 2.2)
iniparse (~> 1.4)
- inspec-core (~> 4.23)
+ inspec-core (>= 5)
iso8601 (>= 0.12.1, < 0.14)
license-acceptance (>= 1.0.5, < 3)
mixlib-archive (>= 0.4, < 2.0)
@@ -115,7 +115,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.2, >= 3.2.28)
+ train-core (~> 3.10, >= 3.2.28)
train-rest (>= 0.4.1)
train-winrm (>= 0.2.5)
unf_ext (>= 0.0.8.2)
@@ -127,7 +127,7 @@ PATH
win32-eventlog (= 0.6.3)
win32-mmap (~> 0.4.1)
win32-mutex (~> 0.4.2)
- win32-process (~> 0.10)
+ win32-process (~> 0.9)
win32-service (>= 2.1.5, < 3.0)
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
@@ -433,7 +433,8 @@ GEM
tty-screen (~> 0.8)
unf (0.1.4)
unf_ext
- unf_ext (>= 0.0.8.2)
+ unf_ext (0.0.8.2)
+ unf_ext (0.0.8.2-x64-mingw-ucrt)
unicode-display_width (2.2.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
@@ -513,6 +514,7 @@ DEPENDENCIES
rb-readline
rest-client!
rspec
+ ruby-shadow!
webmock
BUNDLED WITH
diff --git a/chef-universal-mingw-ucrt.gemspec b/chef-universal-mingw-ucrt.gemspec
index 4e099b6184..2edfd751f9 100644
--- a/chef-universal-mingw-ucrt.gemspec
+++ b/chef-universal-mingw-ucrt.gemspec
@@ -1,4 +1,3 @@
-#This is windows gemspec
gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt})
diff --git a/chef.gemspec b/chef.gemspec
index 849a9b3230..d745b1f5fe 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -9,7 +9,7 @@ else
require "chef-utils/version_string"
end
require "chef/version"
-#This gemspec is common for windows and other platforms
+
Gem::Specification.new do |s|
s.name = "chef"
s.version = Chef::VERSION
diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock
index faccd7714e..5a2596bdd9 100644
--- a/knife/Gemfile.lock
+++ b/knife/Gemfile.lock
@@ -30,6 +30,7 @@ DEPENDENCIES
rb-readline
rest-client!
rspec
+ ruby-shadow!
webmock
BUNDLED WITH