diff --git a/Gemfile b/Gemfile index a234afe..c4cb6bf 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby File.open(File.expand_path('.ruby-version', File.dirname(__FILE__))) { |f| f.read.chomp } gem 'berkshelf' -gem 'chef', '~> 12' +gem 'chef' group :ci do gem 'bump' diff --git a/Gemfile.lock b/Gemfile.lock index e6f868b..6256b95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,25 +49,27 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef (12.22.5) + chef (14.3.37) addressable bundler (>= 1.10) - chef-config (= 12.22.5) - chef-zero (>= 4.8, < 13) + chef-config (= 14.3.37) + chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) + ffi (~> 1.9, >= 1.9.25) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) + iso8601 (~> 0.9.1) mixlib-archive (~> 0.4) - mixlib-authentication (~> 1.4) + mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) - mixlib-log (~> 1.3) + mixlib-log (~> 2.0, >= 2.0.3) mixlib-shellout (~> 2.0) net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 2.9, < 5.0) + net-ssh (~> 4.2) net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (>= 8.6.0.alpha.1, < 13) + ohai (~> 14.0) plist (~> 3.2) proxifier (~> 1.0) rspec-core (~> 3.5) @@ -81,15 +83,16 @@ GEM chef-api (0.8.0) logify (~> 0.1) mime-types - chef-config (12.22.5) + chef-config (14.3.37) addressable fuzzyurl - mixlib-config (~> 2.0) + mixlib-config (>= 2.2.12, < 3.0) mixlib-shellout (~> 2.0) - chef-zero (5.3.2) + tomlrb (~> 1.2) + chef-zero (14.0.6) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) - mixlib-log (~> 1.3) + mixlib-log (~> 2.0) rack (~> 2.0) uuidtools (~> 2.1) chefspec (7.2.1) @@ -171,6 +174,7 @@ GEM concurrent-ruby (~> 1.0) iniparse (1.4.4) ipaddress (0.8.3) + iso8601 (0.9.1) jmespath (1.3.1) json (2.1.0) kitchen-docker (2.7.0) @@ -203,7 +207,7 @@ GEM minitest (5.11.3) mixlib-archive (0.4.8) mixlib-log - mixlib-authentication (1.4.2) + mixlib-authentication (2.1.1) mixlib-cli (1.7.0) mixlib-config (2.2.13) tomlrb @@ -211,7 +215,7 @@ GEM mixlib-shellout mixlib-versioning thor - mixlib-log (1.7.1) + mixlib-log (2.0.4) mixlib-shellout (2.4.0) mixlib-versioning (1.2.2) molinillo (0.6.5) @@ -238,14 +242,14 @@ GEM shellany (~> 0.0) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.26.1) - chef-config (>= 12.5.0.alpha.1, < 14) + ohai (14.3.0) + chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress mixlib-cli mixlib-config (~> 2.0) - mixlib-log (>= 1.7.1, < 2.0) + mixlib-log (~> 2.0, >= 2.0.1) mixlib-shellout (~> 2.0) plist (~> 3.1) systemu (~> 2.6.4) @@ -392,7 +396,7 @@ PLATFORMS DEPENDENCIES berkshelf bump - chef (~> 12) + chef (~> 14) chef-zero chefspec foodcritic