Merge pull request #6 from opscode/CC-44

CC-44: Verify chef-dk gem during "chef verify"

chef-dk.gemspec

@@ -30,7 +30,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0'
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files = %w(Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject do |f|
+    File.directory?(f)
+  end
   gem.executables   = %w( chef )
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]

lib/chef-dk/command/verify.rb

@@ -63,6 +63,9 @@ def components
         :base_dir => "chef",
         :test_cmd => "bundle exec rspec"
 
+      component "chef-dk",
+        :base_dir => "chef-dk",
+        :test_cmd => "bundle exec rspec"
 
       attr_reader :omnibus_dir
       attr_reader :verification_threads
@@ -111,10 +114,13 @@ def invoke_tests
         components.each do |component, component_info|
           # Run the component specs in parallel
           verification_threads << Thread.new do
+            bin_path = File.expand_path(File.join(omnibus_dir, "..", "bin"))
             result = system_command component_info[:test_cmd],
               :cwd => component_path(component_info),
               :env => {
-                "PATH" => "#{File.join(omnibus_dir, "bin")}:#{ENV['PATH']}"
+                # Add the embedded/bin to the PATH so that bundle executable can
+                # be found while running the tests.
+                "PATH" => "#{bin_path}:#{ENV['PATH']}"
               },
               :timeout => 3600
 

spec/unit/command/verify_spec.rb

@@ -80,6 +80,10 @@ def stdout
         run_command(0)
       end
 
+      it "should have embedded/bin on the PATH" do
+        expect(stdout).to include(File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin"))
+      end
+
       it "should report the success of the command" do
         expect(stdout).to include("Verification of component 'successful_comp' succeeded.")
       end

spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/verify_me

@@ -1 +1,3 @@
+echo $PATH
+
 echo "you are good to go..."