knife_cookbook_dependencies 0.0.7 → 0.0.8

data/lib/chef/knife/cookbook_dependencies_install.rb

@@ -11,7 +11,6 @@ module KnifeCookbookDependencies
       :description => "Exclude cookbooks that are in these groups"
 
     def run
-      ui.info 'Reading Cookbookfile'
       ::KCD.ui = ui
       ::KCD::Cookbookfile.process_install(config[:without])
     end

data/lib/kcd/cookbook.rb

@@ -69,9 +69,14 @@ module KnifeCookbookDependencies
       target = File.join(KCD::COOKBOOKS_DIRECTORY, @name)
       FileUtils.rm_rf target
       FileUtils.cp_r full_path, target
+      KCD.ui.info "#{@name} (#{identifier})"
       FileUtils.rm_rf File.join(target, '.git') if from_git?
     end
 
+    def identifier
+      @git_repo || local_path || latest_constrained_version
+    end
+
     # TODO: Clean up download repetition functionality here, in #download and the associated test.
     def unpack(location = unpacked_cookbook_path, options={})
       return true if from_path?

data/lib/kcd/core_ext/kernel.rb

@@ -0,0 +1,33 @@
+# From ActiveSupport: https://github.com/rails/rails/blob/c2c8ef57d6f00d1c22743dc43746f95704d67a95/activesupport/lib/active_support/core_ext/kernel/reporting.rb#L39
+
+require 'rbconfig'
+
+module Kernel
+  # Silences any stream for the duration of the block.
+  #
+  #   silence_stream(STDOUT) do
+  #     puts 'This will never be seen'
+  #   end
+  #
+  #   puts 'But this will'
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+  end
+
+  # Silences both STDOUT and STDERR, even for subprocesses.
+  #
+  #   quietly { system 'bundle install' }
+  #
+  def quietly
+    silence_stream(STDOUT) do
+      silence_stream(STDERR) do
+        yield
+      end
+    end
+  end
+end

data/lib/kcd/lockfile.rb

@@ -10,7 +10,7 @@ module KnifeCookbookDependencies
       content = @cookbooks.map do |cookbook|
                   get_cookbook_definition(cookbook)
                 end.join("\n")
-      File::open(DEFAULT_FILENAME, "wb") { |f| f.write content }
+      File.open(DEFAULT_FILENAME, "wb") { |f| f.write content }
     end
 
     def get_cookbook_definition(cookbook)

data/lib/kcd/shelf.rb

@@ -22,8 +22,13 @@ module KnifeCookbookDependencies
 
       self.class.populate_graph graph, shelf
 
+      
       selector = DepSelector::Selector.new(graph)
-      solution = selector.find_solution([DepSelector::SolutionConstraint.new(graph.package(META_COOKBOOK_NAME))])
+
+      solution = quietly do
+        selector.find_solution([DepSelector::SolutionConstraint.new(graph.package(META_COOKBOOK_NAME))])
+      end
+
       solution.delete META_COOKBOOK_NAME
       solution
     end
@@ -38,7 +43,7 @@ module KnifeCookbookDependencies
 
     def populate_cookbooks_directory
       cookbooks_from_path = @cookbooks.select(&:from_path?) | @cookbooks.select(&:from_git?)
-      
+      KCD.ui.info "Fetching cookbooks:"
       resolve_dependencies.each_pair do |cookbook_name, version|
         cookbook = cookbooks_from_path.select { |c| c.name == cookbook_name }.first || Cookbook.new(cookbook_name, version.to_s)
         @cookbooks << cookbook

data/lib/kcd/version.rb

@@ -1,3 +1,3 @@
 module KnifeCookbookDependencies
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/knife_cookbook_dependencies.rb

@@ -50,3 +50,4 @@ require 'kcd/cookbookfile'
 require 'kcd/lockfile'
 require 'kcd/git'
 require 'kcd/error_messages'
+require 'kcd/core_ext/kernel'

data/spec/lib/kcd/lockfile_spec.rb

@@ -46,7 +46,7 @@ describe KCD::Lockfile do
     it "should populate the cookbooks directory from the lockfile" do
       lockfile = File.read('Cookbookfile.lock')
       lockfile.gsub!(/0.101.0/, '0.101.2')
-      File::open('Cookbookfile.lock', 'wb') { |f| f.write lockfile }
+      File.open('Cookbookfile.lock', 'wb') { |f| f.write lockfile }
       KCD::Cookbookfile.process_install
       File.read('cookbooks/nginx/metadata.rb').scan(/version\s*"([^"]+)"/).first.first.should == "0.101.2"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife_cookbook_dependencies
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
-  requirement: &70254336887000 !ruby/object:Gem::Requirement
+  requirement: &70160531306040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254336887000
+  version_requirements: *70160531306040
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70254336886500 !ruby/object:Gem::Requirement
+  requirement: &70160531302420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254336886500
+  version_requirements: *70160531302420
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70254336886080 !ruby/object:Gem::Requirement
+  requirement: &70160531089600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254336886080
+  version_requirements: *70160531089600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70254336885620 !ruby/object:Gem::Requirement
+  requirement: &70160531089140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336885620
+  version_requirements: *70160531089140
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70254336885200 !ruby/object:Gem::Requirement
+  requirement: &70160531088720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336885200
+  version_requirements: *70160531088720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70254336884780 !ruby/object:Gem::Requirement
+  requirement: &70160531088300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336884780
+  version_requirements: *70160531088300
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70254336884360 !ruby/object:Gem::Requirement
+  requirement: &70160531087880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336884360
+  version_requirements: *70160531087880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70254336883860 !ruby/object:Gem::Requirement
+  requirement: &70160531087380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70254336883860
+  version_requirements: *70160531087380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70254336883360 !ruby/object:Gem::Requirement
+  requirement: &70160531086880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70254336883360
+  version_requirements: *70160531086880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70254336712200 !ruby/object:Gem::Requirement
+  requirement: &70160531086500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336712200
+  version_requirements: *70160531086500
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70254336711140 !ruby/object:Gem::Requirement
+  requirement: &70160531086040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336711140
+  version_requirements: *70160531086040
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70254336709980 !ruby/object:Gem::Requirement
+  requirement: &70160531085620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336709980
+  version_requirements: *70160531085620
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70254336709240 !ruby/object:Gem::Requirement
+  requirement: &70160531085200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336709240
+  version_requirements: *70160531085200
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70254336708580 !ruby/object:Gem::Requirement
+  requirement: &70160531084780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336708580
+  version_requirements: *70160531084780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70254336707280 !ruby/object:Gem::Requirement
+  requirement: &70160531084360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336707280
+  version_requirements: *70160531084360
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70254336705560 !ruby/object:Gem::Requirement
+  requirement: &70160531083940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,7 +188,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254336705560
+  version_requirements: *70160531083940
 description: Resolves cookbook dependencies
 email:
 - josiah@skirmisher.net
@@ -220,6 +220,7 @@ files:
 - lib/kcd.rb
 - lib/kcd/cookbook.rb
 - lib/kcd/cookbookfile.rb
+- lib/kcd/core_ext/kernel.rb
 - lib/kcd/dsl.rb
 - lib/kcd/error_messages.rb
 - lib/kcd/git.rb