berkshelf_ext 1.0.6 → 1.0.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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
+
 ## v1.0.6
 * Add custom resolve to berksfile for dependency_chains to account for reverted changeset
 

data/README.md

@@ -46,9 +46,20 @@ Addons are extensions that must be explicitly enabled via environment variable:
 
 * `BERKSHELF_EXT_ADDONS="knife_uploader"`
 
+It is important to note that these addons will generally make use of Chef internals
+to do things.
+
 ### Available addons
 
 * Knife based cookbook uploading (disables Ridley)[4]
+* Faster dependency resolution via faster cached cookbook handling (fast_resolution)
+
+## Load all the things!
+
+If you want to just load everything that is available without explicitly defining
+all the addons, just set the everything env variable:
+
+* `BERKSHELF_EXT_EVERYTHING="true"`
 
 # References
 

data/lib/berkshelf_ext/addons/fast_resolution.rb

@@ -0,0 +1,48 @@
+require 'chef'
+
+module BerkshelfExt
+  module FastResolution
+    module CookbookStore
+
+      class << self
+        def included(klass)
+          klass.class_eval do
+            alias_method :non_fast_resolution_satisfy, :satisfy
+            alias_method :satisfy, :fast_resolution_satisfy
+            alias_method :non_fast_resolution_cookbooks, :cookbooks
+            alias_method :cookbooks, :fast_resolution_cookbooks
+          end
+        end
+      end
+      
+      def fast_resolution_satisfy(name, constraint)
+        if(constraint.to_s.start_with?('='))
+          get_version = constraint.version
+        else
+          graph = Solve::Graph.new
+          cookbooks(name).each { |cookbook| graph.artifacts(name, cookbook.version) }
+          get_version = Solve.it!(graph, [[name, constraint]]).first.last
+        end
+        c = cookbooks(name).detect{|ckbk| ckbk.version.to_s == get_version.to_s }
+        ::Berkshelf::CachedCookbook.from_store_path(c.root_dir) if c
+      rescue Solve::Errors::NoSolutionError
+        nil
+      end
+
+      def fast_resolution_cookbooks(filter = nil)
+        [].tap do |cookbooks|
+          storage_path.each_child do |path|
+            loader = ::Chef::Cookbook::CookbookVersionLoader.new(path)
+            loader.load_cookbooks
+            cv = loader.cookbook_version
+            cb_name = cv.metadata.name.to_s.sub("-#{cv.version}", '')
+            next if filter && cb_name != filter
+            cookbooks << cv
+          end
+        end
+      end
+    end
+  end
+end
+
+Berkshelf::CookbookStore.send(:include, BerkshelfExt::FastResolution::CookbookStore)

data/lib/berkshelf_ext/all.rb

@@ -1,17 +1,23 @@
 require 'berkshelf'
 
-Dir.glob(File.join(File.dirname(__FILE__), '*.rb')).each do |ext_file|
-  if(ENV['BERKSHELF_EXT_EXCEPT'])
-    next if ENV['BERKSHELF_EXT_EXCEPT'].split(',').include?(File.basename(ext_file).sub('.rb', ''))
+if(ENV['BERKSHELF_EXT_EVERYTHING'].to_s.downcase == 'true')
+  Dir.glob(File.join(File.dirname(__FILE__), '**', '*.rb')).each do |ext_file|
+    require ext_file
   end
-  if(ENV['BERKSHELF_EXT_ONLY'])
-    next unless ENV['BERKSHELF_EXT_ONLY'].split(',').include?(File.basename(ext_file).sub('.rb', ''))
+else
+  Dir.glob(File.join(File.dirname(__FILE__), '*.rb')).each do |ext_file|
+    if(ENV['BERKSHELF_EXT_EXCEPT'])
+      next if ENV['BERKSHELF_EXT_EXCEPT'].split(',').include?(File.basename(ext_file).sub('.rb', ''))
+    end
+    if(ENV['BERKSHELF_EXT_ONLY'])
+      next unless ENV['BERKSHELF_EXT_ONLY'].split(',').include?(File.basename(ext_file).sub('.rb', ''))
+    end
+    require ext_file
   end
-  require ext_file
-end
 
-if(ENV['BERKSHELF_EXT_ADDONS'])
-  ENV['BERKSHELF_EXT_ADDONS'].split(',').each do |addon|
-    require "berkshelf_ext/addons/#{addon.strip}"
+  if(ENV['BERKSHELF_EXT_ADDONS'])
+    ENV['BERKSHELF_EXT_ADDONS'].split(',').each do |addon|
+      require "berkshelf_ext/addons/#{addon.strip}"
+    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.6')
+  VERSION = Version.new('1.0.8')
   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.6
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -56,6 +56,7 @@ files:
 - lib/berkshelf_ext/version.rb
 - lib/berkshelf_ext/dependency_chains.rb
 - lib/berkshelf_ext/addons/knife_uploader.rb
+- lib/berkshelf_ext/addons/fast_resolution.rb
 - lib/berkshelf_ext/non_recommends_depends.rb
 - lib/berkshelf_ext/berksfile_loader_context.rb
 - lib/berkshelf_ext.rb