summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2017-01-19 10:03:21 -0600
committerTom Duffield <tom@chef.io>2017-01-19 10:03:21 -0600
commitaf9be8fabd1851fcacc6c29c55ac23f2e4f3d46b (patch)
treec08467004e7b877198a1e2c2461bfbf1f035cc2c
parent3d1ca79eaf36c5721531ebc5a7df4d250bd206ba (diff)
downloadchef-af9be8fabd1851fcacc6c29c55ac23f2e4f3d46b.tar.gz
Clarify platform constraints for ios and solaris
Based on feedback. Signed-off-by: Tom Duffield <tom@chef.io>
-rw-r--r--Gemfile.lock8
-rw-r--r--acceptance/Gemfile.lock2
-rw-r--r--chef.gemspec1
-rw-r--r--kitchen-tests/Gemfile.lock2
-rw-r--r--omnibus/Gemfile.lock8
-rw-r--r--omnibus/config/software/chef.rb6
6 files changed, 12 insertions, 15 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4bb1ee7a38..391803237b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,6 @@ PATH
ohai (>= 8.6.0.alpha.1, < 9)
plist (~> 3.2)
proxifier (~> 1.0)
- rbnacl (~> 4.0.0)
rspec-core (~> 3.5)
rspec-expectations (~> 3.5)
rspec-mocks (~> 3.5)
@@ -99,7 +98,6 @@ PATH
ohai (>= 8.6.0.alpha.1, < 9)
plist (~> 3.2)
proxifier (~> 1.0)
- rbnacl (~> 4.0.0)
rspec-core (~> 3.5)
rspec-expectations (~> 3.5)
rspec-mocks (~> 3.5)
@@ -292,7 +290,7 @@ GEM
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
- mixlib-archive (0.2.0)
+ mixlib-archive (0.3.0)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
@@ -404,8 +402,6 @@ GEM
rainbow (2.2.1)
rake (11.3.0)
rb-readline (0.5.3)
- rbnacl (4.0.1)
- ffi
rest-client (2.0.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
@@ -466,7 +462,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.66.4)
+ specinfra (2.66.5)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 82d8cae59c..4489b5f247 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -115,7 +115,7 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-archive (0.2.0)
+ mixlib-archive (0.3.0)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
diff --git a/chef.gemspec b/chef.gemspec
index 3a99d5a0bb..2d5544aa4f 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
s.add_dependency "ffi-yajl", "~> 2.2"
s.add_dependency "net-ssh", ">= 2.9", "< 5.0"
- s.add_dependency "rbnacl", "~> 4.0.0"
s.add_dependency "net-ssh-multi", "~> 1.1"
s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index c9735589c9..83715f58b0 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -111,7 +111,7 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-archive (0.2.0)
+ mixlib-archive (0.3.0)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4e0c7ce66f..9e430e6afc 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/license_scout.git
- revision: b8163fac517b46b4cb043cbee5ef21caa99b80e4
+ revision: 4bf6f5cf21bc0ff8de327dfc0a245b625134d6b0
specs:
license_scout (0.1.2)
ffi-yajl (~> 2.2)
@@ -8,8 +8,8 @@ GIT
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: edf1b47fd065fa1185610185d2f0271e83ca3e99
- branch: rhass/COOL-657_ecc-algorithm-support
+ revision: f4b1c0f2682907967d10c64850f9c607070697dd
+ branch: shain/ruby_windows_monster
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -124,7 +124,7 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-archive (0.2.0)
+ mixlib-archive (0.3.0)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb
index 06e163ac32..c53a2339ae 100644
--- a/omnibus/config/software/chef.rb
+++ b/omnibus/config/software/chef.rb
@@ -44,8 +44,10 @@ dependency "chef-gem-ruby-prof"
dependency "chef-gem-byebug"
dependency "chef-gem-debug_inspector"
dependency "chef-gem-binding_of_caller"
-dependency "chef-gem-rbnacl-libsodium" unless ios_xr?
-dependency "chef-gem-bcrypt_pbkdf-ruby" unless solaris?
+unless ios_xr? || solaris?
+ dependency "chef-gem-rbnacl-libsodium"
+ dependency "chef-gem-bcrypt_pbkdf-ruby"
+end
# Now everyone else, in alphabetical order because we don't care THAT much
Dir.entries(File.dirname(__FILE__)).sort.each do |gem_software|