Merge branch 'less-chef-versions'

.travis.yml

@@ -4,33 +4,10 @@ sudo: false
 cache:
   - bundler
 rvm:
-  - 1.9.3
-  - 2.0
   - 2.1
-gemfile:
-  - Gemfile
-  - gemfiles/chef-11.4.4/Gemfile
-  - gemfiles/chef-11.6.2/Gemfile
-  - gemfiles/chef-11.8.2/Gemfile
-  - gemfiles/chef-11.10.4/Gemfile
 matrix:
   fast_finish: true
-  exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.4.4/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.4.4/Gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.6.2/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.6.2/Gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.8.2/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.8.2/Gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/chef-11.10.4/Gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/chef-11.10.4/Gemfile
-  allow_failures:
-    - gemfile: gemfiles/chef-11.4.4/Gemfile
+  include:
+    - rvm: 1.9
+      gemfile: gemfiles/chef-11/Gemfile
+      script: bundle exec rspec spec

Gemfile

@@ -7,6 +7,7 @@ end
 
 group :test do
   gem 'berkshelf'
+  gem 'chef', '= 11.18.12'
   gem 'chefspec'
   gem 'test-kitchen'
   gem 'kitchen-vagrant'

Gemfile.lock

@@ -37,12 +37,12 @@ GEM
     celluloid-io (0.16.0.pre2)
       celluloid (>= 0.16.0.pre)
       nio4r (>= 1.0.0)
-    chef (11.12.8)
-      chef-zero (>= 2.0.2, < 2.1)
+    chef (11.18.12)
+      chef-zero (~> 2.2, >= 2.2.1)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi-yajl (~> 1.2)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.8.1)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
@@ -51,23 +51,23 @@ GEM
       mixlib-shellout (~> 1.4)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 7.0.4)
+      ohai (~> 7.4)
+      plist (~> 3.1.0)
       pry (~> 0.9)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
+      rest-client (>= 1.0.4, <= 1.6.7)
     chef-api (0.5.0)
       logify (~> 0.1)
       mime-types
-    chef-zero (2.0.2)
+    chef-zero (2.2.1)
+      ffi-yajl (~> 1.1)
       hashie (~> 2.0)
-      json
       mixlib-log (~> 1.3)
       rack
-    chefspec (4.0.1)
-      chef (~> 11.12)
-      fauxhai (~> 2.0)
+    chefspec (4.7.0)
+      chef (>= 11.14)
+      fauxhai (~> 3.2)
       rspec (~> 3.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     dep-selector-libgecode (1.0.2)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
@@ -76,10 +76,12 @@ GEM
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    fauxhai (2.1.2)
+    fauxhai (3.8.0)
       net-ssh
-      ohai
     ffi (1.9.3)
+    ffi-yajl (1.4.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.2)
     foodcritic (4.0.0)
       erubis
       gherkin (~> 2.11)
@@ -91,23 +93,24 @@ GEM
     gherkin (2.12.2)
       multi_json (~> 1.3)
     hashie (2.1.2)
-    highline (1.6.21)
+    highline (1.7.8)
     hitimes (1.2.1)
-    ipaddress (0.8.0)
+    ipaddress (0.8.3)
     json (1.8.1)
     kitchen-docker (2.4.0)
       test-kitchen (>= 1.0.0)
     kitchen-vagrant (0.20.0)
       test-kitchen (~> 1.4)
+    libyajl2 (1.2.0)
     logify (0.2.0)
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.6.1)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
-    mixlib-cli (1.5.0)
-    mixlib-config (2.1.0)
+    mixlib-cli (1.7.0)
+    mixlib-config (2.2.1)
     mixlib-install (1.1.0)
       artifactory
       mixlib-shellout
@@ -123,25 +126,28 @@ GEM
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
+    net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nio4r (1.1.1)
     nokogiri (1.6.4.1)
       mini_portile (~> 0.6.0)
     octokit (3.2.0)
       sawyer (~> 0.5.3)
-    ohai (7.0.4)
+    ohai (7.4.1)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.1)
       ipaddress
       mime-types (~> 1.16)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 1.2)
-      systemu (~> 2.5.2)
-      yajl-ruby
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    plist (3.1.0)
     polyglot (0.3.5)
-    pry (0.10.0)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -167,32 +173,33 @@ GEM
       retryable
       semverse (~> 1.1)
       varia_model (~> 0.4)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rufus-lru (1.0.5)
     safe_yaml (1.0.4)
     sawyer (0.5.4)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.1.0)
-    slop (3.5.0)
+    slop (3.6.0)
     solve (1.2.0)
       dep_selector (~> 1.0)
       semverse (~> 1.1)
     stove (3.2.8)
       chef-api (~> 0.5)
       logify (~> 0.2)
-    systemu (2.5.2)
+    systemu (2.6.5)
     test-kitchen (1.8.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -208,6 +215,7 @@ GEM
     varia_model (0.4.0)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 3.0.0)
+    wmi-lite (1.0.0)
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -216,6 +224,7 @@ PLATFORMS
 DEPENDENCIES
   berkshelf
   busser-serverspec
+  chef (= 11.18.12)
   chefspec
   foodcritic
   kitchen-docker