berkshelf_ext 1.0.0 → 1.0.2

data/CHANGELOG.md

@@ -1,2 +1,7 @@
-## v0.1.0
+## v1.0.2
+* Add `non_recommends_depends` to fix dependency resolution
+* Add `knife_uploader` addon to disable ridley based uploads
+* Remove preemptive cookbook fetching. Fixes proper dependency resolution to use dependencies defined within Berksfile when explicitly defining cookbooks to upload.
+
+## v1.0.0
 * Initial release

data/README.md

@@ -1,7 +1,6 @@
 # Berkshelf Ext
 
-Berkshelf extensions to add features to berkshelf not
-accepted upstream.
+Berkshelf extensions to add features to berkshelf.
 
 ## Usage
 
@@ -26,9 +25,12 @@ it as usual.
 
 ## Current extensions
 
-* Resolution via nested berksfiles (nested_berksfiles)
-* Proper berksfile path when loading berksfiles (berksfile_loader_context)
-* Proper dependency resolution (dependency_chains)
+These extensions are auto loaded by default.
+
+* Resolution via nested berksfiles (nested_berksfiles)[1]
+* Proper berksfile path when loading berksfiles (berksfile_loader_context)[2]
+* Proper dependency resolution (dependency_chains)[3]
+* Do not include recommends entries in cookbook dependencies (non_recommends_depends)
 
 ## Prevent extension loading
 
@@ -38,5 +40,22 @@ environment variables
 * `BERKSHELF_EXT_EXCEPT="nested_berksfiles"`
 * `BERKSHELF_EXT_ONLY="nested_berksfiles,berksfile_loader_context"`
 
+## Current addons
+
+Addons are extensions that must be explicitly enabled via environment variable:
+
+* `BERKSHELF_EXT_ADDONS="knife_uploader"`
+
+### Available addons
+
+* Knife based cookbook uploading (disables Ridley)[4]
+
+# References
+
+1. https://github.com/RiotGames/berkshelf/pull/304
+2. https://github.com/RiotGames/berkshelf/pull/304
+3. https://github.com/RiotGames/berkshelf/pull/302
+4. https://github.com/RiotGames/berkshelf/pull/291 
+
 # Info
 * Repository: https://github.com/chrisroberts/berkshelf_ext

data/berkshelf_ext.gemspec

@@ -11,5 +11,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.executables = %w(berks_ext)
   s.add_dependency 'berkshelf', BerkshelfExt::BERKSHELF_CONSTRAINT
+  s.add_dependency 'chef'
   s.files = Dir['**/*']
 end

data/lib/berkshelf_ext/addons/knife_uploader.rb

@@ -0,0 +1,62 @@
+require 'chef'
+require 'chef/cookbook_uploader'
+
+module Ridley
+  class << self
+    def new(options)
+      RidleyMocker.new(options)
+    end
+  end
+end
+
+class RidleyMocker
+  def initialize(options)
+  end
+
+  def method_missing(sym, *args)
+    if(@ckbk)
+      @ckbk.send(sym, *args)
+    else
+      super
+    end
+  end
+  
+  def cookbook
+    self
+  end
+
+  def alive?
+    false
+  end
+
+  def path
+    @path
+  end
+  
+  def upload(path, upload_options)
+    chef_config!
+    @path = path
+    loader = Chef::Cookbook::CookbookVersionLoader.new(path)
+    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.freeze_version if upload_options.delete(:freeze)
+    Chef::CookbookUploader.new([cv], cookbook.path, upload_options).upload_cookbooks
+    @ckbk = cv
+  end
+
+  def chef_config!
+    cwd = Dir.pwd.split('/')
+    until(cwd.empty?)
+      knife_conf = File.join(cwd.join('/'), '.chef/knife.rb')
+      if(File.exists?(knife_conf))
+        Chef::Config.from_file(knife_conf)
+        return
+      end
+    end
+    raise 'Failed to locate knife.rb file to configure chef!'
+  end
+      
+end

data/lib/berkshelf_ext/all.rb

@@ -9,3 +9,9 @@ Dir.glob(File.join(File.dirname(__FILE__), '*.rb')).each do |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}"
+  end
+end

data/lib/berkshelf_ext/berksfile_loader_context.rb

@@ -1,4 +1,4 @@
-module Berkshelf
+module BerkshelfExt
   module BerksfileLoaderContext
     module Berksfile
       def self.included(klass)
@@ -50,4 +50,4 @@ module Berkshelf
   end
 end
 
-Berkshelf::Berksfile.send(:include, Berkshelf::BerksfileLoaderContext::Berksfile)
+Berkshelf::Berksfile.send(:include, BerkshelfExt::BerksfileLoaderContext::Berksfile)

data/lib/berkshelf_ext/dependency_chains.rb

@@ -1,5 +1,33 @@
 module BerkshelfExt
   module DependencyChains
+    module Berksfile
+      class << self
+        def included(klass)
+          klass.class_eval do
+            alias_method :non_dependency_chains_sources, :sources
+            alias_method :sources, :dependency_chains_sources
+          end
+        end
+      end
+      def dependency_chains_sources(options = {})
+        l_sources = @sources.collect { |name, source| source }.flatten
+
+        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 !except.empty?
+          l_sources.select { |source| (except & source.groups).empty? }
+        when !only.empty?
+          l_sources.select { |source| !(only & source.groups).empty? }
+        else
+          l_sources
+        end
+      end
+    end
+    
     module Resolver
 
       class << self
@@ -48,7 +76,10 @@ module BerkshelfExt
           begin
             solution = Solve.it!(graph, [demand])
           rescue Solve::Errors::NoSolutionError
-            raise Berkshelf::NoSolution.new("Failed to resolve dependencies for: #{demand.join(': ')}")
+             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")
+            )
           end
         end
         solution = Solve.it!(graph, demands)

data/lib/berkshelf_ext/non_recommends_depends.rb

@@ -0,0 +1,20 @@
+module BerkshelfExt
+  module NonRecommendsDepends
+    module CachedCookbook
+      class << self
+        def included(klass)
+          klass.class_eval do
+            alias_method :non_non_recommends_depends_dependencies, :dependencies
+            alias_method :dependencies, :non_recommends_depends_dependencies
+          end
+        end
+      end
+      
+      def non_recommends_depends_dependencies
+        metadata.dependencies
+      end
+    end
+  end
+end
+
+Berkshelf::CachedCookbook.send(:include, BerkshelfExt::NonRecommendsDepends::CachedCookbook)

data/lib/berkshelf_ext/version.rb

@@ -2,6 +2,6 @@ module BerkshelfExt
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('1.0.0')
+  VERSION = Version.new('1.0.2')
   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.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extenstions for berkshelf
 email: chrisroberts.code@gmail.com
 executables:
@@ -39,6 +55,8 @@ files:
 - lib/berkshelf_ext/nested_berksfiles.rb
 - lib/berkshelf_ext/version.rb
 - lib/berkshelf_ext/dependency_chains.rb
+- lib/berkshelf_ext/addons/knife_uploader.rb
+- lib/berkshelf_ext/non_recommends_depends.rb
 - lib/berkshelf_ext/berksfile_loader_context.rb
 - lib/berkshelf_ext.rb
 - README.md