summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-10-26 12:45:32 -0700
committerTim Smith <tsmith@chef.io>2018-10-26 12:45:32 -0700
commit5836a4cd4b35d8fa8843c75b3a6aea990b89ba0a (patch)
tree89956dbdac0494864b3907db270bdfb634aa1d08
parent8f97c84db49b62a77667afda672cccb0e1cb41bd (diff)
downloadchef-5836a4cd4b35d8fa8843c75b3a6aea990b89ba0a.tar.gz
Pull ohai from github so we can relax the chef-config dep
Ohai has a ceiling on the chef-config version it will accept. I just kicked master to ohai 15 in the ohai repo. Pulling from master should allow this all to work now. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock45
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock55
4 files changed, 57 insertions, 48 deletions
diff --git a/Gemfile b/Gemfile
index 91cf837a90..a3e020b4c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,9 @@ source "https://rubygems.org"
# of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
gem "chef", path: "."
+# necessary until we release ohai 15
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
+
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
gem "cheffish", "~> 14"
diff --git a/Gemfile.lock b/Gemfile.lock
index acc32e0fe9..6bf5282b67 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,13 +6,31 @@ GIT
chefstyle (0.11.0)
rubocop (= 0.55.0)
+GIT
+ remote: https://github.com/chef/ohai.git
+ revision: 2dd9de9143afac54de475d730572897ab4730a06
+ branch: master
+ specs:
+ ohai (15.0.0)
+ chef-config (>= 12.8, < 16)
+ ffi (~> 1.9)
+ ffi-yajl (~> 2.2)
+ ipaddress
+ mixlib-cli (>= 1.7.0)
+ mixlib-config (~> 2.0)
+ mixlib-log (~> 2.0, >= 2.0.1)
+ mixlib-shellout (~> 2.0)
+ plist (~> 3.1)
+ systemu (~> 2.6.4)
+ wmi-lite (~> 1.0)
+
PATH
remote: .
specs:
- chef (14.6.47)
+ chef (15.0.0)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.47)
+ chef-config (= 15.0.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -28,7 +46,7 @@ PATH
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (~> 14.0)
+ ohai (~> 15.0)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@@ -39,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.47-universal-mingw32)
+ chef (15.0.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.47)
+ chef-config (= 15.0.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -59,7 +77,7 @@ PATH
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (~> 14.0)
+ ohai (~> 15.0)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@@ -85,7 +103,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.6.47)
+ chef-config (15.0.0)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -206,18 +224,6 @@ GEM
netrc (0.11.0)
octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.6.2)
- chef-config (>= 12.8, < 15)
- ffi (~> 1.9)
- ffi-yajl (~> 2.2)
- ipaddress
- mixlib-cli (>= 1.7.0)
- mixlib-config (~> 2.0)
- mixlib-log (~> 2.0, >= 2.0.1)
- mixlib-shellout (~> 2.0)
- plist (~> 3.1)
- systemu (~> 2.6.4)
- wmi-lite (~> 1.0)
parallel (1.12.1)
parser (2.5.1.2)
ast (~> 2.4.0)
@@ -364,6 +370,7 @@ DEPENDENCIES
inspec-core (~> 3)
netrc
octokit
+ ohai!
pry
pry-byebug
pry-remote
diff --git a/chef.gemspec b/chef.gemspec
index 13ec88f223..1db824c927 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.add_dependency "mixlib-authentication", "~> 2.1"
s.add_dependency "mixlib-shellout", "~> 2.4"
s.add_dependency "mixlib-archive", "~> 0.4"
- s.add_dependency "ohai", "~> 14.0"
+ s.add_dependency "ohai", "~> 15.0"
s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"
s.add_dependency "ffi-yajl", "~> 2.2"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 36e0961c4e..575ca1f61b 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 1d0fbaba922b31444c91f8e5a440ca3ac50aae67
+ revision: 3b6ef4c42d8c2f9f9e1c6e285b2ea48e0d0f0fdd
branch: master
specs:
omnibus-software (4.0.0)
@@ -63,10 +63,10 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
- chef (14.5.33)
+ chef (14.6.47)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.33)
+ chef-config (= 14.6.47)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -74,7 +74,6 @@ GEM
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
- iso8601 (~> 0.11.0)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
@@ -86,18 +85,18 @@ GEM
ohai (~> 14.0)
plist (~> 3.2)
proxifier (~> 1.0)
- rspec-core (~> 3.5, < 3.8)
- rspec-expectations (~> 3.5, < 3.8)
- rspec-mocks (~> 3.5, < 3.8)
+ rspec-core (~> 3.5)
+ rspec-expectations (~> 3.5)
+ rspec-mocks (~> 3.5)
rspec_junit_formatter (~> 0.2.0)
serverspec (~> 2.7)
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.5.33-universal-mingw32)
+ chef (14.6.47-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.33)
+ chef-config (= 14.6.47)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -105,7 +104,7 @@ GEM
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
- iso8601 (~> 0.11.0)
+ iso8601 (~> 0.12.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
@@ -117,9 +116,9 @@ GEM
ohai (~> 14.0)
plist (~> 3.2)
proxifier (~> 1.0)
- rspec-core (~> 3.5, < 3.8)
- rspec-expectations (~> 3.5, < 3.8)
- rspec-mocks (~> 3.5, < 3.8)
+ rspec-core (~> 3.5)
+ rspec-expectations (~> 3.5)
+ rspec-mocks (~> 3.5)
rspec_junit_formatter (~> 0.2.0)
serverspec (~> 2.7)
specinfra (~> 2.10)
@@ -133,10 +132,10 @@ GEM
win32-mutex (~> 0.4.2)
win32-process (~> 0.8.2)
win32-service (~> 1.0)
- win32-taskscheduler (~> 1.0.0)
+ win32-taskscheduler (~> 2.0)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
- chef-config (14.5.33)
+ chef-config (14.6.47)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -176,7 +175,7 @@ GEM
iniparse (1.4.4)
iostruct (0.0.4)
ipaddress (0.8.3)
- iso8601 (0.11.0)
+ iso8601 (0.12.1)
jmespath (1.4.0)
kitchen-vagrant (1.3.5)
test-kitchen (~> 1.4)
@@ -259,22 +258,22 @@ GEM
public_suffix (3.0.3)
rack (2.0.5)
retryable (2.0.4)
- rspec (3.7.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-core (3.7.1)
- rspec-support (~> 3.7.0)
- rspec-expectations (3.7.0)
+ rspec (3.8.0)
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-core (3.8.0)
+ rspec-support (~> 3.8.0)
+ rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
+ rspec-support (~> 3.8.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
- rspec-mocks (3.7.0)
+ rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-support (3.7.1)
+ rspec-support (~> 3.8.0)
+ rspec-support (3.8.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
@@ -335,7 +334,7 @@ GEM
win32-service (1.0.1)
ffi
ffi-win32-extensions
- win32-taskscheduler (1.0.12)
+ win32-taskscheduler (2.0.0)
ffi
structured_warnings
windows-api (0.4.4)