berkshelf_ext 1.0.16 → 1.0.18

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.0.18
+* Include full source loading all the time (missed when extracting from the 302 PR)
+
 ## v1.0.16
 * Add nesting support to `install` command (#2)
 

data/lib/berkshelf_ext/dependency_chains.rb

@@ -11,30 +11,27 @@ module BerkshelfExt
           end
         end
       end
+
       def dependency_chains_sources(options = {})
         l_sources = @sources.collect { |name, source| source }.flatten
 
-        cookbooks  = options[:skip_dependencies] ? Array(options.fetch(:cookbooks, nil)) : []
-        except    = Array(options.fetch(:except, nil)).collect(&:to_sym)
-        only      = Array(options.fetch(:only, nil)).collect(&:to_sym)
+        except = Array(options.fetch(:except, nil)).collect(&:to_sym)
+        only = Array(options.fetch(:only, nil)).collect(&:to_sym)
 
         case
         when !except.empty? && !only.empty?
           raise Berkshelf::ArgumentError, "Cannot specify both :except and :only"
-        when !cookbooks.empty?
-          if !except.empty? && !only.empty?
-            Berkshelf.ui.warn "Cookbooks were specified, ignoring :except and :only"
-          end
-          l_sources.select { |source| options[:cookbooks].include?(source.name) }
         when !except.empty?
           l_sources.select { |source| (except & source.groups).empty? }
         when !only.empty?
           l_sources.select { |source| !(only & source.groups).empty? }
+        when options[:skip_dependencies]
+          l_sources.select { |source| options[:cookbooks].include?(source.name) }
         else
           l_sources
         end
       end
-
+ 
       def dependency_chains_resolve(options={})
         resolver(options).resolve(options.fetch(:cookbooks, nil))
       end

data/lib/berkshelf_ext/version.rb

@@ -2,6 +2,6 @@ module BerkshelfExt
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('1.0.16')
+  VERSION = Version.new('1.0.18')
   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.16
+  version: 1.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -60,6 +60,7 @@ files:
 - lib/berkshelf_ext/non_recommends_depends.rb
 - lib/berkshelf_ext/berksfile_loader_context.rb
 - lib/berkshelf_ext.rb
+- berkshelf_ext-1.0.16.gem
 - README.md
 - berkshelf_ext-1.0.14.gem
 - berkshelf_ext.gemspec