berkshelf_ext 1.0.14 → 1.0.16

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.0.16
+* Add nesting support to `install` command (#2)
+
 ## v1.0.14
 * Use chef configurations from berks config if unset by knife
 * Fix exception namespacing

data/README.md

@@ -68,5 +68,9 @@ all the addons, just set the everything env variable:
 3. https://github.com/RiotGames/berkshelf/pull/302
 4. https://github.com/RiotGames/berkshelf/pull/291 
 
+# Contributors
+
+* [Vasily Mikhaylichenko](https://github.com/vaskas)
+
 # Info
 * Repository: https://github.com/chrisroberts/berkshelf_ext

data/lib/berkshelf_ext/nested_berksfiles.rb

@@ -13,6 +13,12 @@ module BerkshelfExt
               :desc => 'Restrict nesting to this depth. Defaults to "0" (no restriction)'
             )
           )
+          %w{upload install}.each do |cmd|
+            klass.tasks[cmd].options[:nested_berksfiles] = Thor::Option.new(
+              'nested_berksfiles', :type => :boolean, :default => false,
+              :desc => 'Use Berksfiles found within cookbooks specifed in Berksfile'
+            )
+          end
         end
       end
     end
@@ -23,10 +29,13 @@ module BerkshelfExt
           klass.class_eval do
             alias_method :non_nested_berksfiles_resolver, :resolver
             alias_method :resolver, :nested_berksfiles_resolver
+
+            alias_method :non_nested_berksfile_install, :install
+            alias_method :install, :nested_berksfile_install
           end
         end
       end
-      
+
       def nested_berksfiles_resolver(options={})
         Berkshelf::Resolver.new(
           self.downloader,
@@ -36,6 +45,19 @@ module BerkshelfExt
           nested_depth: options[:nested_depth]
         )
       end
+
+      def nested_berksfile_install(options = {})
+        resolver = nested_berksfiles_resolver(options)
+
+        @cached_cookbooks = resolver.resolve
+        write_lockfile(resolver.sources) unless lockfile_present?
+
+        if options[:path]
+          self.class.vendor(@cached_cookbooks, options[:path])
+        end
+
+        self.cached_cookbooks
+      end
     end
 
     module Resolver
@@ -48,7 +70,7 @@ module BerkshelfExt
           end
         end
       end
-      
+
       def nested_berksfiles_initialize(downloader, options={})
         @nested_depth_limit = options[:nested_depth].to_i
         skip_deps = options[:skip_dependencies]

data/lib/berkshelf_ext/version.rb

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