berkshelf_ext 1.0.8 → 1.0.10

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.10
+* Forcibly set name when uploading via knife
+* Only load sources of specified cookbooks when uploading with `--skip-dependencies`
+
 ## v1.0.8
 * Add environment variable to allow loading all available extensions
 * Add new addon extension fast_resolution to locate and use cached cookbooks faster

data/lib/berkshelf_ext/addons/knife_uploader.rb

@@ -40,8 +40,8 @@ class RidleyMocker
     loader.load_cookbooks
     cv = loader.cookbook_version
     cv.send(:generate_manifest)
-    cv.manifest['name'] = "#{cv.name}-#{cv.version}" #.sub!(%r{-[^-]+$}, '')
-    cv.manifest['cookbook_name'] = cv.name
+    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)
     Chef::CookbookUploader.new([cv], cookbook.path, upload_options).upload_cookbooks
     @ckbk = cv

data/lib/berkshelf_ext/dependency_chains.rb

@@ -14,12 +14,18 @@ module BerkshelfExt
       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)
 
         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?

data/lib/berkshelf_ext/version.rb

@@ -2,6 +2,6 @@ module BerkshelfExt
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('1.0.8')
+  VERSION = Version.new('1.0.10')
   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.8
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf