Merge pull request #35 from atheiman/chef-13

chef 13 (and 12), version constant in code (1.0.0)

.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
+cache: bundler
+gemfile:
+- Gemfile
+- chef-12.Gemfile
 rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.9
+- 2.4.2
+- 2.3.5
 script:
 - bundle exec rubocop --lint --display-style-guide --extra-details --display-cop-names
 - bundle exec rspec

Gemfile

@@ -1,11 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 12.11'
-gem 'sinatra', '~> 1.4'
-gem 'passenger', '~> 5.0', require: 'phusion_passenger/rack_handler'
+gem 'chef'
+gem 'passenger', require: 'phusion_passenger/rack_handler'
+gem 'sinatra'
 
 group :development do
-  gem 'sinatra-contrib'
   gem 'chef-zero'
+  gem 'rack-test'
   gem 'rubocop'
+  gem 'sinatra-contrib'
 end

Gemfile.lock

@@ -1,167 +1,182 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
-    backports (3.6.8)
-    builder (3.2.2)
-    chef (12.11.18)
+    backports (3.10.3)
+    builder (3.2.3)
+    chef (13.6.4)
+      addressable
       bundler (>= 1.10)
-      chef-config (= 12.11.18)
-      chef-zero (~> 4.5)
+      chef-config (= 13.6.4)
+      chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       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-cli (~> 1.4)
+      mixlib-cli (~> 1.7)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-multi (~> 1.1)
-      ohai (>= 8.6.0.alpha.1, < 9)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (~> 13.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.4)
-      rspec-expectations (~> 3.4)
-      rspec-mocks (~> 3.4)
+      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-config (12.11.18)
-      fuzzyurl (~> 0.8.0)
+    chef-config (13.6.4)
+      addressable
+      fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (4.6.2)
+    chef-zero (13.1.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
-      rack
+      rack (~> 2.0)
       uuidtools (~> 2.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     erubis (2.7.0)
-    ffi (1.9.10)
-    ffi-yajl (2.2.3)
+    ffi (1.9.18)
+    ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
-    fuzzyurl (0.8.0)
-    hashie (3.4.4)
-    highline (1.7.8)
-    iniparse (1.4.2)
+    fuzzyurl (0.9.0)
+    hashie (3.5.6)
+    highline (1.7.10)
+    iniparse (1.4.4)
     ipaddress (0.8.3)
+    iso8601 (0.9.1)
     libyajl2 (1.2.0)
-    mixlib-authentication (1.4.1)
+    mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-cli (1.6.0)
-    mixlib-config (2.2.1)
-    mixlib-log (1.6.0)
-    mixlib-shellout (2.2.6)
-    multi_json (1.12.1)
+    mixlib-authentication (1.4.2)
+    mixlib-cli (1.7.0)
+    mixlib-config (2.2.4)
+    mixlib-log (1.7.1)
+    mixlib-shellout (2.3.2)
+    multi_json (1.12.2)
+    mustermann (1.0.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
+    net-ssh (4.2.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    ohai (8.16.0)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    ohai (13.6.0)
+      chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli
       mixlib-config (~> 2.0)
-      mixlib-log
+      mixlib-log (>= 1.7.1, < 2.0)
       mixlib-shellout (~> 2.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parser (2.3.1.2)
-      ast (~> 2.2)
-    passenger (5.0.28)
+    parallel (1.12.0)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    passenger (5.1.12)
       rack
       rake (>= 0.8.1)
-    plist (3.2.0)
+    plist (3.3.0)
     powerpack (0.1.1)
     proxifier (1.0.3)
-    rack (1.6.4)
-    rack-protection (1.5.3)
+    public_suffix (3.0.1)
+    rack (2.0.3)
+    rack-protection (2.0.0)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rainbow (2.1.0)
-    rake (11.2.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rainbow (2.2.2)
+      rake
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.4.1)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.41.1)
-      parser (>= 2.3.1.1, < 3.0)
+    rubocop (0.51.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    serverspec (2.36.0)
+    ruby-progressbar (1.9.0)
+    serverspec (2.41.3)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.53)
-    sfl (2.2)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
+      specinfra (~> 2.72)
+    sfl (2.3)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.0)
       backports (>= 2.0)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.0)
+      sinatra (= 2.0.0)
       tilt (>= 1.3, < 3)
-    specinfra (2.59.0)
+    specinfra (2.72.1)
       net-scp
-      net-ssh (>= 2.7, < 4.0)
+      net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    tilt (2.0.5)
-    unicode-display_width (1.1.0)
+    tilt (2.0.8)
+    unicode-display_width (1.3.0)
     uuidtools (2.1.5)
     wmi-lite (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef (~> 12.11)
+  chef
   chef-zero
-  passenger (~> 5.0)
+  passenger
+  rack-test
   rubocop
-  sinatra (~> 1.4)
+  sinatra
   sinatra-contrib
 
 BUNDLED WITH
-   1.14.6
+   1.16.0

chef-12.Gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'chef', '~> 12.21'
+gem 'passenger', require: 'phusion_passenger/rack_handler'
+gem 'sinatra'
+
+group :development do
+  gem 'chef-zero'
+  gem 'rack-test'
+  gem 'rubocop'
+  gem 'sinatra-contrib'
+end