modificationspatrick/chef-acceptance

19 files changed, 23 insertions, 218 deletions

diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 44c6a334e4..807a6960ea 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-#  "mixlib-install", github: "chef/mixlib-install"
+gem "mixlib-install", github: "chef/mixlib-install"
 gem "chef-acceptance", github: "chef/chef-acceptance"
 gem "mixlib-shellout"
 gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-install-update"
-gem 'kitchen-inspec'
+gem "inspec"
+gem "kitchen-inspec"
 
 group(:development) do
   gem "kitchen-vagrant"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 98c877dfa0..69ccd2180a 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -6,6 +6,14 @@ GIT
       thor (~> 0.19)
 
 GIT
+  remote: git://github.com/chef/mixlib-install.git
+  revision: bfa436d281e0afe2020f866acf60b69bfed2a03b
+  specs:
+    mixlib-install (0.8.0.alpha.3)
+      artifactory (~> 2.3.0)
+      mixlib-versioning (~> 1.1.0)
+
+GIT
   remote: git://github.com/sersut/test-kitchen.git
   revision: fd05389ec556fdcac96b92b1aea2a9ed48802e75
   branch: sersut/mixlib-install-update
@@ -20,6 +28,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
+    artifactory (2.3.2)
     builder (3.2.2)
     coderay (1.1.0)
     diff-lcs (1.2.5)
@@ -54,6 +63,7 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     mixlib-shellout (2.2.5)
+    mixlib-versioning (1.1.0)
     multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -114,8 +124,10 @@ PLATFORMS
 
 DEPENDENCIES
   chef-acceptance!
+  inspec
   kitchen-inspec
   kitchen-vagrant
+  mixlib-install!
   mixlib-shellout
   test-kitchen!
   windows_chef_zero
diff --git a/acceptance/bin/bundler b/acceptance/bin/bundler
deleted file mode 100755
index 72ca846efa..0000000000
--- a/acceptance/bin/bundler
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("bundler", "bundler")
diff --git a/acceptance/bin/chef-acceptance b/acceptance/bin/chef-acceptance
deleted file mode 100755
index 680aeaaa21..0000000000
--- a/acceptance/bin/chef-acceptance
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'chef-acceptance' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("chef-acceptance", "chef-acceptance")
diff --git a/acceptance/bin/coderay b/acceptance/bin/coderay
deleted file mode 100755
index b3b3eb1d92..0000000000
--- a/acceptance/bin/coderay
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'coderay' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("coderay", "coderay")
diff --git a/acceptance/bin/htmldiff b/acceptance/bin/htmldiff
deleted file mode 100755
index 2ca984d6ed..0000000000
--- a/acceptance/bin/htmldiff
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("diff-lcs", "htmldiff")
diff --git a/acceptance/bin/httpclient b/acceptance/bin/httpclient
deleted file mode 100755
index 2bdf6fd819..0000000000
--- a/acceptance/bin/httpclient
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'httpclient' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("httpclient", "httpclient")
diff --git a/acceptance/bin/inspec b/acceptance/bin/inspec
deleted file mode 100755
index 0fb3df5f49..0000000000
--- a/acceptance/bin/inspec
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'inspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("inspec", "inspec")
diff --git a/acceptance/bin/kitchen b/acceptance/bin/kitchen
deleted file mode 100755
index 4030b78f12..0000000000
--- a/acceptance/bin/kitchen
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'kitchen' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("test-kitchen", "kitchen")
diff --git a/acceptance/bin/ldiff b/acceptance/bin/ldiff
deleted file mode 100755
index 0be9dc455a..0000000000
--- a/acceptance/bin/ldiff
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("diff-lcs", "ldiff")
diff --git a/acceptance/bin/pry b/acceptance/bin/pry
deleted file mode 100755
index b80f4a7f08..0000000000
--- a/acceptance/bin/pry
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'pry' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("pry", "pry")
diff --git a/acceptance/bin/rspec b/acceptance/bin/rspec
deleted file mode 100755
index 3e07513cd8..0000000000
--- a/acceptance/bin/rspec
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")
diff --git a/acceptance/bin/rwinrm b/acceptance/bin/rwinrm
deleted file mode 100755
index bc57c129d8..0000000000
--- a/acceptance/bin/rwinrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rwinrm' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("winrm", "rwinrm")
diff --git a/acceptance/bin/safe_yaml b/acceptance/bin/safe_yaml
deleted file mode 100755
index d6ad2ce229..0000000000
--- a/acceptance/bin/safe_yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'safe_yaml' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("safe_yaml", "safe_yaml")
diff --git a/acceptance/bin/thor b/acceptance/bin/thor
deleted file mode 100755
index 5769ec97ba..0000000000
--- a/acceptance/bin/thor
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'thor' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("thor", "thor")
diff --git a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb
index cefbc67aa6..7d31d29ddd 100644
--- a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb
+++ b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -1,9 +1,9 @@
-execute '../bin/kitchen destroy' do
+execute 'bundle exec kitchen destroy' do
   cwd node['chef-acceptance']['suite-dir']
 
-  environment({
-    "GEM_PATH" => "/Users/salam/.chefdk/gem/ruby/2.1.0:/opt/chefdk/embedded/lib/ruby/gems/2.1.0",
-    "GEM_ROOT" => "/opt/chefdk/embedded/lib/ruby/gems/2.1.0",
-    "GEM_HOME" => "/Users/salam/.chefdk/gem/ruby/2.1.0"
-  })
+  # environment({
+  #   "GEM_PATH" => "/Users/salam/.chefdk/gem/ruby/2.1.0:/opt/chefdk/embedded/lib/ruby/gems/2.1.0",
+  #   "GEM_ROOT" => "/opt/chefdk/embedded/lib/ruby/gems/2.1.0",
+  #   "GEM_HOME" => "/Users/salam/.chefdk/gem/ruby/2.1.0"
+  # })
 end
diff --git a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb
index ebd8718538..2763aba70c 100644
--- a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb
+++ b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb
@@ -1,3 +1,3 @@
-execute '../bin/kitchen converge' do
+execute 'bundle exec kitchen converge' do
   cwd node['chef-acceptance']['suite-dir']
 end
diff --git a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb
index ca019682e8..eb58f81f79 100644
--- a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb
+++ b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb
@@ -1,4 +1,4 @@
 # execute "inspec exec inspec/test.rb -t ssh://vagrant@chef-current-install-ubuntu-1404" do
-execute "../bin/kitchen verify" do
+execute "bundle exec kitchen verify" do
   cwd node['chef-acceptance']['suite-dir']
 end
diff --git a/acceptance/trivial/inspec/test.rb b/acceptance/trivial/test/integration/default/chef_client_spec.rb
index ddb9144e45..ddb9144e45 100644
--- a/acceptance/trivial/inspec/test.rb
+++ b/acceptance/trivial/test/integration/default/chef_client_spec.rb