berkshelf_ext 1.0.12 → 1.0.14

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.0.14
+* Use chef configurations from berks config if unset by knife
+* Fix exception namespacing
+* Provide path information when Berksfile processing fails
+* Allow limiting depth of nested berksfiles `--nested-depth n`
+* Attempt to properly identify cookbook causing solution failure
+  * Provide better output for solution failures
+
 ## v1.0.12
 * Add proper support for metadata with missing name
 

data/lib/berkshelf_ext/addons/knife_uploader.rb

@@ -44,20 +44,30 @@ class RidleyMocker
     cv.manifest['name'] = "#{cv.metadata.name}-#{cv.version}"
     cv.name = cv.manifest['cookbook_name'] = cv.metadata.name
     cv.freeze_version if upload_options.delete(:freeze)
+    puts "  -> Knife upload to: #{Chef::Config[:chef_server_url]}"
     Chef::CookbookUploader.new([cv], cookbook.path, upload_options).upload_cookbooks
     @ckbk = cv
   end
 
   def chef_config!
     cwd = Dir.pwd.split('/')
-    until(cwd.empty?)
+    found = false
+    until(found || cwd.empty?)
       knife_conf = File.join(cwd.join('/'), '.chef/knife.rb')
-      if(File.exists?(knife_conf))
-        Chef::Config.from_file(knife_conf)
-        return
+      if(found = File.exists?(knife_conf))
+        begin
+          Chef::Config.from_file(knife_conf)
+        rescue
+        end
+      end
+      cwd.pop
+    end
+    %w(chef_server_url validation_client_name validation_key client_key node_name).each do |k|
+      key = k.to_sym
+      if(value = Berkshelf::Config.instance[:chef][key])
+        Chef::Config[key] = value
       end
     end
-    raise 'Failed to locate knife.rb file to configure chef!'
   end
       
 end

data/lib/berkshelf_ext/berksfile_loader_context.rb

@@ -22,7 +22,7 @@ module BerkshelfExt
             Dir.chdir(File.dirname(path))
             instance_eval(content, File.expand_path(path), 1)
           rescue => e
-            raise BerksfileReadError.new(e), "An error occurred while reading the Berksfile: #{e.to_s}"
+            raise ::Berkshelf::BerksfileReadError.new(e), "An error occurred while reading the Berksfile (#{path}): #{e.to_s}"
           ensure
             Dir.chdir(initial_path)
           end

data/lib/berkshelf_ext/dependency_chains.rb

@@ -84,13 +84,23 @@ module BerkshelfExt
         # solution and not the dependency that caused the failure, run
         # each dependency through the graph individually so we can
         # provide a useful error string
-        demands.each do |demand|
+        demands.reverse.each do |demand|
           begin
             solution = Solve.it!(graph, [demand])
           rescue Solve::Errors::NoSolutionError
-             raise Berkshelf::NoSolution.new(
-              "Failed to resolve dependencies for:\n#{demand.join(': ')}\nDependencies: " <<
-              @sources[demand.first].cached_cookbook.dependencies.map{|n,v| "  #{n}: #{v}"}.join("\n")
+            deps = @sources[demand.first].cached_cookbook.dependencies.map{|n,v| "#{n.strip}-#{v.sub(%r{^[^0-9]+}, '').strip}"}
+            cur = @sources.values.map(&:cached_cookbook).map{|c| "#{c.metadata.name}-#{c.metadata.version}"}
+            failed_on = Array(deps - cur)
+            # TODO: if failed on is empty, resort and solve to attempt
+            # to locate root cause
+            raise Berkshelf::NoSolution.new(
+              "\n\nFailed to resolve dependencies for:\n#{demand.join(': ')}\n" <<
+              "Probable failure on: #{failed_on.empty? ? 'UNKNOWN!?' : failed_on.join(', ')}\n" << 
+              "Dependencies:\n" <<
+              @sources[demand.first].cached_cookbook.dependencies.map{|n,v| "  #{n}: #{v}"}.sort.join("\n") <<
+              "\nCurrently loaded:\n" <<
+              @sources.values.map(&:cached_cookbook).map{|c| "  #{c.name}: #{c.metadata.name} - #{c.metadata.version}"}.sort.join("\n") <<
+              "\n"
             )
           end
         end

data/lib/berkshelf_ext/nested_berksfiles.rb

@@ -3,9 +3,15 @@ module BerkshelfExt
     module Cli
       class << self
         def included(klass)
-          klass.tasks['upload'].options[:nested_berksfiles] = Thor::Option.new(
-            'nested_berksfiles', :type => :boolean, :default => false,
-            :desc => 'Use Berksfiles found within cookbooks specifed in Berksfile'
+          klass.tasks['upload'].options.update(
+            :nested_berksfiles => Thor::Option.new(
+              'nested_berksfiles', :type => :boolean, :default => false,
+              :desc => 'Use Berksfiles found within cookbooks specifed in Berksfile'
+            ),
+            :nested_depth => Thor::Option.new(
+              'nested_depth', :type => :numeric, :default => 0,
+              :desc => 'Restrict nesting to this depth. Defaults to "0" (no restriction)'
+            )
           )
         end
       end
@@ -26,7 +32,8 @@ module BerkshelfExt
           self.downloader,
           sources: sources(options),
           skip_dependencies: options[:skip_dependencies],
-          nested_berksfiles: options[:nested_berksfiles]
+          nested_berksfiles: options[:nested_berksfiles],
+          nested_depth: options[:nested_depth]
         )
       end
     end
@@ -43,6 +50,7 @@ module BerkshelfExt
       end
       
       def nested_berksfiles_initialize(downloader, options={})
+        @nested_depth_limit = options[:nested_depth].to_i
         skip_deps = options[:skip_dependencies]
         options[:skip_dependencies] = true
         non_nested_berksfiles_initialize(downloader, options)
@@ -57,18 +65,24 @@ module BerkshelfExt
         end
       end
 
-      def process_nested_berksfiles(srcs)
+      def process_nested_berksfiles(srcs, depth=0)
         srcs.map(&:name).each do |name|
+          next unless @sources[name].location.is_a?(Berkshelf::GitLocation) || @sources[name].location.is_a?(Berkshelf::PathLocation)
           berks_path = File.join(@sources[name].cached_cookbook.path, 'Berksfile')
           if(File.exists?(berks_path))
             berksfile = Berkshelf::Berksfile.from_file(berks_path)
+            puts "processing berksfile: #{berks_path}"
             new_sources = berksfile.sources.delete_if do |new_src|
-              @sources.has_key?(new_src.name)
+              @sources.has_key?(new_src.name) || new_src.location.class != Berkshelf::GitLocation
             end
             new_sources.each do |source|
               add_source(source, false)
             end
-            process_nested_berksfiles(new_sources)
+            if((depth + 1) >= @nested_depth_limit)
+              puts "Nested depth threshold reached. Halting nesting on this branch path is halted! (leaf file: #{berks_path})"
+            else
+              process_nested_berksfiles(new_sources, depth + 1)
+            end
           end
         end
       end

data/lib/berkshelf_ext/version.rb

@@ -2,6 +2,6 @@ module BerkshelfExt
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('1.0.12')
+  VERSION = Version.new('1.0.14')
   BERKSHELF_CONSTRAINT = '~> 1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf_ext
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf