test-kitchen 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3c4db1c478015e6304dfe1664f758171403be58
-  data.tar.gz: 61c4f294a642cf6d300e9388a97919f712875be5
+  metadata.gz: ded765291266ac1c8c46c55e66b5f939b840a5d2
+  data.tar.gz: 725bb4f06f42cb37defa82b0d5683bfb3e04b8e1
 SHA512:
-  metadata.gz: b5b814ee625daaf11b9105476bc1f3c32f8079f22ee19298d787ad1fa41e090253d4a894227f64b10bbaee67775d4e0e755b925f2f3f9199c97d246650584d2a
-  data.tar.gz: 395cd37b2a48b85ee8e2005e27a6038159c2655a920f9d1e466717dd177c9b8adc58a6a0b13063b94d0c70fdc510ecceadc058444be82692b15911d2d9e2159c
+  metadata.gz: 77aa107fcdc3ad04cfde45eb675fa34dec8a75a0b74a7255670f1f6120a5644c87250e98d200b61dac801b22763e716f63c7a9fef28906e6d0689e09af580796
+  data.tar.gz: f6bf66a90f691d3d1550d4e78417bfd778b6452542d9ae2c4b256656bee714018468c468c1c273b00356da3e44f7ac004e1aec2f7b32231b9923e969f3fff7c6

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.2.1 / 2014-02-12
+
+### Bug fixes
+
+* Issue [#357][], pull request [#358][]: Load needed (dynamic) dependencies for provisioners at creation time to prevent any native or dynamic code being loaded in a non-main thread (an issue on Mac with MRI Ruby 1.9/2.0). ([@fnichol][])
+
+### Improvements
+
+* Pull request [#358][]: Output the loaded version of Berkshelf or Librarian-Chef when converging to better help troubleshooting issues. ([@fnichol][])
+
+
 ## 1.2.0 / 2014-02-11
 
 ### Upstream changes
@@ -459,6 +470,8 @@ The initial release.
 [#316]: https://github.com/opscode/test-kitchen/issues/316
 [#318]: https://github.com/opscode/test-kitchen/issues/318
 [#353]: https://github.com/opscode/test-kitchen/issues/353
+[#357]: https://github.com/opscode/test-kitchen/issues/357
+[#358]: https://github.com/opscode/test-kitchen/issues/358
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@adamhjk]: https://github.com/adamhjk
 [@arangamani]: https://github.com/arangamani

data/lib/kitchen/command/diagnose.rb

@@ -31,20 +31,42 @@ module Kitchen
     class Diagnose < Kitchen::Command::Base
 
       def call
-        loader = if options[:all] || options[:loader]
-          @loader
-        else
-          nil
-        end
+        instances = record_failure { load_instances }
+
+        loader = record_failure { load_loader }
+
+        puts Kitchen::Diagnostic.new(
+          :loader => loader, :instances => instances).read.to_yaml
+      end
+
+      private
 
-        instances = if options[:all] || options[:instances]
+      def load_instances
+        if options[:all] || options[:instances]
           parse_subcommand(args.first)
         else
           []
         end
+      end
 
-        puts Kitchen::Diagnostic.new(
-          :loader => loader, :instances => instances).read.to_yaml
+      def load_loader
+        if options[:all] || options[:loader]
+          @loader
+        else
+          nil
+        end
+      end
+
+      def record_failure
+        yield
+      rescue => e
+        {
+          :error => {
+            :exception => e.inspect,
+            :message => e.message,
+            :backtrace => e.backtrace
+          }
+        }
       end
     end
   end

data/lib/kitchen/diagnostic.rb

@@ -50,12 +50,24 @@ module Kitchen
     end
 
     def prepare_loader
-      result[:loader] = loader.diagnose if loader
+      if error_hash?(loader)
+        result[:loader] = loader
+      else
+        result[:loader] = loader.diagnose if loader
+      end
     end
 
     def prepare_instances
       result[:instances] = Hash.new
-      Array(instances).each { |i| result[:instances][i.name] = i.diagnose }
+      if error_hash?(instances)
+        result[:instances][:error] = instances[:error]
+      else
+        Array(instances).each { |i| result[:instances][i.name] = i.diagnose }
+      end
+    end
+
+    def error_hash?(obj)
+      obj.is_a?(Hash) && obj.has_key?(:error)
     end
   end
 end

data/lib/kitchen/errors.rb

@@ -122,7 +122,8 @@ module Kitchen
 
   def self.handle_error(e)
     stderr_log(Error.formatted_exception(e))
-    stderr_log("Please see .kitchen/logs/kitchen.log for more details\n")
+    stderr_log("Please see .kitchen/logs/kitchen.log for more details")
+    stderr_log("Also try running `kitchen diagnose --all` for configuration\n")
     file_log(:error, Error.formatted_trace(e))
   end
 end

data/lib/kitchen/provisioner/base.rb

@@ -41,6 +41,7 @@ module Kitchen
       def instance=(instance)
         @instance = instance
         expand_paths!
+        load_needed_dependencies!
       end
 
       # Returns the name of this driver, suitable for display in a CLI.
@@ -128,6 +129,8 @@ module Kitchen
         end
       end
 
+      def load_needed_dependencies! ; end
+
       def logger
         instance ? instance.logger : Kitchen.logger
       end

data/lib/kitchen/provisioner/chef/berkshelf.rb

@@ -39,12 +39,15 @@ module Kitchen
           @logger     = logger
         end
 
+        def self.load!(logger = Kitchen.logger)
+          load_berkshelf!(logger)
+        end
+
         def resolve
-          info("Resolving cookbook dependencies with Berkshelf...")
+          version = ::Berkshelf::VERSION
+          info("Resolving cookbook dependencies with Berkshelf #{version}...")
           debug("Using Berksfile from #{berksfile}")
 
-          load_berkshelf!
-
           ::Berkshelf.ui.mute do
             if ::Berkshelf::Berksfile.method_defined?(:vendor)
               # Berkshelf 3.0 requires the directory to not exist
@@ -60,10 +63,17 @@ module Kitchen
 
         attr_reader :berksfile, :path, :logger
 
-        def load_berkshelf!
-          require 'berkshelf'
+        def self.load_berkshelf!(logger)
+          first_load = require 'berkshelf'
+
+          version = ::Berkshelf::VERSION
+          if first_load
+            logger.debug("Berkshelf #{version} library loaded")
+          else
+            logger.debug("Berkshelf #{version} previously loaded")
+          end
         rescue LoadError => e
-          fatal("The `berkshelf' gem is missing and must be installed" +
+          logger.fatal("The `berkshelf' gem is missing and must be installed" +
             " or cannot be properly activated. Run" +
             " `gem install berkshelf` or add the following to your" +
             " Gemfile if you are using Bundler: `gem 'berkshelf'`.")

data/lib/kitchen/provisioner/chef/librarian.rb

@@ -33,18 +33,22 @@ module Kitchen
 
         include Logging
 
+
         def initialize(cheffile, path, logger = Kitchen.logger)
           @cheffile   = cheffile
           @path       = path
           @logger     = logger
         end
 
+        def self.load!(logger = Kitchen.logger)
+          load_librarian!(logger)
+        end
+
         def resolve
-          info("Resolving cookbook dependencies with Librarian-Chef")
+          version = ::Librarian::Chef::VERSION
+          info("Resolving cookbook dependencies with Librarian-Chef #{version}...")
           debug("Using Cheffile from #{cheffile}")
 
-          load_librarian!
-
           env = ::Librarian::Chef::Environment.new(
             :project_path => File.dirname(cheffile))
           env.config_db.local["path"] = path
@@ -54,12 +58,19 @@ module Kitchen
 
         attr_reader :cheffile, :path, :logger
 
-        def load_librarian!
-          require 'librarian/chef/environment'
+        def self.load_librarian!(logger)
+          first_load = require 'librarian/chef/environment'
           require 'librarian/action/resolve'
           require 'librarian/action/install'
+
+          version = ::Librarian::Chef::VERSION
+          if first_load
+            logger.debug("Librarian-Chef #{version} library loaded")
+          else
+            logger.debug("Librarian-Chef #{version} previously loaded")
+          end
         rescue LoadError => e
-          fatal("The `librarian-chef' gem is missing and must be installed" +
+          logger.fatal("The `librarian-chef' gem is missing and must be installed" +
             " or cannot be properly activated. Run" +
             " `gem install librarian-chef` or add the following to your" +
             " Gemfile if you are using Bundler: `gem 'librarian-chef'`.")

data/lib/kitchen/provisioner/chef_base.rb

@@ -129,6 +129,16 @@ module Kitchen
 
       protected
 
+      def load_needed_dependencies!
+        if File.exists?(berksfile)
+          debug("Berksfile found at #{berksfile}, loading Berkshelf")
+          Chef::Berkshelf.load!(logger)
+        elsif File.exists?(cheffile)
+          debug("Cheffile found at #{cheffile}, loading Librarian-Chef")
+          Chef::Librarian.load!(logger)
+        end
+      end
+
       def format_config_file(data)
         data.each.map { |attr, value|
           [attr, (value.is_a?(Array) ? value.to_s : %{"#{value}"})].join(" ")

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Fletcher Nichol