knife_cookbook_dependencies 0.0.6 → 0.0.7

data/Rakefile

@@ -2,6 +2,11 @@ require "bundler/gem_tasks"
 require 'rdoc/task'
 require 'rspec/core/rake_task'
 
+desc "clean VCR cassettes"
+task "vcr:clean" do
+  sh "rm -rf spec/fixtures/vcr_cassettes/*"
+end
+
 desc "check documentation coverage"
 task "rdoc:check" do 
   sh "rdoc -C " + Dir["lib/**/*.rb"].join(" ")

data/features/lib/chef/knife/clean.feature

@@ -0,0 +1,29 @@
+Feature: Clean
+  As a user
+  I want to be able to clean all the files downloaded/created by kcd
+  So that I can be sure previous runs are not messing up my current action 
+    and so I can get rid of installations I don't want any more
+
+  Scenario: knife cookbook dependencies clean
+    Given I write to "Cookbookfile" with:
+    """
+    cookbook "mysql"
+    """
+    When I run `knife cookbook dependencies install`
+    And I run `knife cookbook dependencies clean`
+    Then the following directories should not exist:
+    | cookbooks |
+    And the file "Cookbookfile.lock" should not exist
+    And the temp directory should not exist
+
+  Scenario: knife cookbook deps clean
+    Given I write to "Cookbookfile" with:
+    """
+    cookbook "mysql"
+    """
+    When I run `knife cookbook deps install`
+    And I run `knife cookbook deps clean`
+    Then the following directories should not exist:
+    | cookbooks |
+    And the file "Cookbookfile.lock" should not exist
+    And the temp directory should not exist

data/features/lib/chef/knife/install.feature

@@ -0,0 +1,24 @@
+Feature: install cookbooks from a Cookbookfile
+  As a user with a Cookbookfile
+  I want to be able to run knife cookbook dependencies install to install my cookbooks
+  So that I don't have to download my cookbooks and their dependencies manually
+
+  Scenario: install cookbooks
+    Given I write to "Cookbookfile" with:
+    """
+    cookbook "mysql"
+    """
+    When I run `knife cookbook dependencies install`
+    Then the following directories should exist:
+    | cookbooks/mysql   |
+    | cookbooks/openssl |
+
+  Scenario: install cookbooks with the alias
+    Given I write to "Cookbookfile" with:
+    """
+    cookbook "mysql"
+    """
+    When I run `knife cookbook deps install`
+    Then the following directories should exist:
+    | cookbooks/mysql   |
+    | cookbooks/openssl |

data/features/lib/chef/knife/update.feature

@@ -0,0 +1,38 @@
+Feature: update
+  As a user
+  I want a way to update the versions without clearing out the files I've downloaded
+  So that I can update faster than a clean install
+
+  Scenario: knife cookbook dependencies update
+    Given I write to "Cookbookfile" with:
+    """
+    cookbook "mysql"
+    """
+    Given I write to "Cookbookfile.lock" with:
+    """
+    cookbook 'mysql', :locked_version => '0.0.1'
+    cookbook 'openssl', :locked_version => '0.0.1'
+    """
+    When I run `knife cookbook dependencies update`
+    Then the file "Cookbookfile.lock" should contain exactly:
+    """
+    cookbook 'mysql', :locked_version => '1.2.4'
+    cookbook 'openssl', :locked_version => '1.0.0'
+    """    
+
+  Scenario: knife cookbook deps update
+    Given I write to "Cookbookfile" with:
+    """
+    cookbook "mysql"
+    """
+    Given I write to "Cookbookfile.lock" with:
+    """
+    cookbook 'mysql', :locked_version => '0.0.1'
+    cookbook 'openssl', :locked_version => '0.0.1'
+    """
+    When I run `knife cookbook deps update`
+    Then the file "Cookbookfile.lock" should contain exactly:
+    """
+    cookbook 'mysql', :locked_version => '1.2.4'
+    cookbook 'openssl', :locked_version => '1.0.0'
+    """    

data/features/support/env.rb

@@ -20,9 +20,15 @@ Spork.prefork do
     end
   end
 
-  Before('@slow_process') do
+  Before do  
     @aruba_io_wait_seconds = 5
   end
+
+  Before('@slow_process') do
+    @aruba_io_wait_seconds = 10
+  end
+
+
 end
 
 Spork.each_run do

data/features/support/step_definitions.rb

@@ -20,3 +20,7 @@ Then /^the file "(.*?)" should contain in the current directory:$/ do |filename,
     File.read(filename).should match(Regexp.new(string))
   end
 end
+
+Then /^the temp directory should not exist$/ do
+  File.exists?(KCD::TMP_DIRECTORY).should be_false
+end

data/lib/chef/knife/cookbook_dependencies_clean.rb

@@ -0,0 +1,19 @@
+require 'chef/knife'
+require 'kcd'
+
+module KnifeCookbookDependencies
+  class CookbookDependenciesClean < Chef::Knife
+    banner "knife cookbook dependencies clean"
+
+    def run
+      ui.info 'Cleaning up...'
+      ::KCD.ui = ui
+
+      ::KCD.clean
+    end
+  end
+  
+  class CookbookDepsClean < CookbookDependenciesClean
+    banner "knife cookbook deps clean"
+  end
+end

data/lib/chef/knife/cookbook_dependencies_update.rb

@@ -0,0 +1,21 @@
+require 'chef/knife'
+require 'kcd'
+
+module KnifeCookbookDependencies
+  class CookbookDependenciesUpdate < CookbookDependenciesInstall
+    banner "knife cookbook dependencies update"
+
+    alias :install_run :run
+
+    def run
+      ::KCD.ui = ui
+
+      Lockfile.remove!
+      install_run
+    end
+  end
+  
+  class CookbookDepsUpdate < CookbookDependenciesUpdate
+    banner "knife cookbook deps update"
+  end
+end

data/lib/kcd/cookbook.rb

@@ -7,7 +7,7 @@ module KnifeCookbookDependencies
     attr_reader :name, :version_constraints, :groups
     attr_accessor :locked_version
 
-    DOWNLOAD_LOCATION = ENV["TMPDIR"] || '/tmp'
+    DOWNLOAD_LOCATION = ::KCD::TMP_DIRECTORY || '/tmp'
 
     def initialize(*args)
       @options = args.last.is_a?(Hash) ? args.pop : {}
@@ -47,7 +47,10 @@ module KnifeCookbookDependencies
         @git.checkout(@options[:ref]) if @options[:ref]
         @options[:path] ||= @git.directory
       else
+        FileUtils.mkdir_p KCD::TMP_DIRECTORY
         csd = Chef::Knife::CookbookSiteDownload.new([name, latest_constrained_version.to_s, "--file", download_filename])
+
+        output = ''
         rescue_404 do
           output = KCD::KnifeUtils.capture_knife_output(csd)
         end

data/lib/kcd/lockfile.rb

@@ -1,14 +1,16 @@
 module KnifeCookbookDependencies
   class Lockfile
+    DEFAULT_FILENAME = "#{KCD::DEFAULT_FILENAME}.lock"
+
     def initialize(cookbooks)
       @cookbooks = cookbooks
     end
 
-    def write(filename = KCD::DEFAULT_FILENAME)
+    def write(filename = DEFAULT_FILENAME)
       content = @cookbooks.map do |cookbook|
                   get_cookbook_definition(cookbook)
                 end.join("\n")
-      File::open("#{filename}.lock", "wb") { |f| f.write content }
+      File::open(DEFAULT_FILENAME, "wb") { |f| f.write content }
     end
 
     def get_cookbook_definition(cookbook)
@@ -24,5 +26,15 @@ module KnifeCookbookDependencies
 
       return definition
     end
+
+    def remove!
+      self.class.remove!
+    end
+
+    class << self
+      def remove!
+        FileUtils.rm_f DEFAULT_FILENAME
+      end
+    end
   end
 end

data/lib/kcd/version.rb

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

data/lib/knife_cookbook_dependencies.rb

@@ -1,20 +1,8 @@
-require 'dep_selector'
-require 'zlib'
-require 'archive/tar/minitar'
-
-require 'kcd/version'
-require 'kcd/shelf'
-require 'kcd/cookbook'
-require 'kcd/metacookbook'
-require 'kcd/dsl'
-require 'kcd/cookbookfile'
-require 'kcd/lockfile'
-require 'kcd/git'
-require 'kcd/error_messages'
-
 module KnifeCookbookDependencies
   DEFAULT_FILENAME = 'Cookbookfile'
   COOKBOOKS_DIRECTORY = 'cookbooks'
+  TMP_DIRECTORY = File.join(ENV['TMPDIR'], 'knife_cookbook_dependencies')
+  FileUtils.mkdir_p TMP_DIRECTORY
 
   autoload :KnifeUtils, 'kcd/knife_utils'
 
@@ -39,10 +27,26 @@ module KnifeCookbookDependencies
 
     def clean
       clear_shelf!
+      Lockfile.remove!
       FileUtils.rm_rf COOKBOOKS_DIRECTORY
+      FileUtils.rm_rf TMP_DIRECTORY
     end
   end
 end
 
 # Alias for {KnifeCookbookDependencies}
 KCD = KnifeCookbookDependencies
+
+require 'dep_selector'
+require 'zlib'
+require 'archive/tar/minitar'
+
+require 'kcd/version'
+require 'kcd/shelf'
+require 'kcd/cookbook'
+require 'kcd/metacookbook'
+require 'kcd/dsl'
+require 'kcd/cookbookfile'
+require 'kcd/lockfile'
+require 'kcd/git'
+require 'kcd/error_messages'

data/spec/lib/kcd/cookbook_spec.rb

@@ -20,7 +20,7 @@ module KnifeCookbookDependencies
 
       describe '#unpacked_cookbook_path' do
         it "should give the path to the directory where the archive should get unpacked" do
-          subject.unpacked_cookbook_path.should == File.join(ENV['TMPDIR'], 'ntp-1.1.8')
+          subject.unpacked_cookbook_path.should == File.join(KCD::TMP_DIRECTORY, 'ntp-1.1.8')
         end
       end
 

data/spec/spec_helper.rb

@@ -64,7 +64,7 @@ Spork.prefork do
   end
 
   def with_cookbookfile content
-    Dir.chdir(ENV['TMPDIR']) do
+    Dir.chdir(KCD::TMP_DIRECTORY) do
       File.open('Cookbookfile', 'w') do |f|
         f.write content
       end
@@ -76,4 +76,5 @@ end
 
 Spork.each_run do
   require 'kcd'
+  FileUtils.mkdir_p KCD::TMP_DIRECTORY
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife_cookbook_dependencies
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
-  requirement: &70354856923060 !ruby/object:Gem::Requirement
+  requirement: &70254336887000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354856923060
+  version_requirements: *70254336887000
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70354856921900 !ruby/object:Gem::Requirement
+  requirement: &70254336886500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70354856921900
+  version_requirements: *70254336886500
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70354856921300 !ruby/object:Gem::Requirement
+  requirement: &70254336886080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354856921300
+  version_requirements: *70254336886080
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70354856920560 !ruby/object:Gem::Requirement
+  requirement: &70254336885620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354856920560
+  version_requirements: *70254336885620
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70354856919900 !ruby/object:Gem::Requirement
+  requirement: &70254336885200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354856919900
+  version_requirements: *70254336885200
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70354856919200 !ruby/object:Gem::Requirement
+  requirement: &70254336884780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354856919200
+  version_requirements: *70254336884780
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70354856918540 !ruby/object:Gem::Requirement
+  requirement: &70254336884360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354856918540
+  version_requirements: *70254336884360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70354856916880 !ruby/object:Gem::Requirement
+  requirement: &70254336883860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70354856916880
+  version_requirements: *70254336883860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70354856913320 !ruby/object:Gem::Requirement
+  requirement: &70254336883360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70354856913320
+  version_requirements: *70254336883360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354856906100 !ruby/object:Gem::Requirement
+  requirement: &70254336712200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354856906100
+  version_requirements: *70254336712200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70354856902180 !ruby/object:Gem::Requirement
+  requirement: &70254336711140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354856902180
+  version_requirements: *70254336711140
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70354856895800 !ruby/object:Gem::Requirement
+  requirement: &70254336709980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354856895800
+  version_requirements: *70254336709980
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70354857701020 !ruby/object:Gem::Requirement
+  requirement: &70254336709240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354857701020
+  version_requirements: *70254336709240
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70354857700320 !ruby/object:Gem::Requirement
+  requirement: &70254336708580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354857700320
+  version_requirements: *70254336708580
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70354857699120 !ruby/object:Gem::Requirement
+  requirement: &70254336707280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354857699120
+  version_requirements: *70254336707280
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70354857698200 !ruby/object:Gem::Requirement
+  requirement: &70254336705560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,7 +188,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354857698200
+  version_requirements: *70254336705560
 description: Resolves cookbook dependencies
 email:
 - josiah@skirmisher.net
@@ -205,13 +205,18 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- features/lib/chef/knife/clean.feature
 - features/lib/chef/knife/error_messages.feature
+- features/lib/chef/knife/install.feature
 - features/lib/chef/knife/lockfile.feature
+- features/lib/chef/knife/update.feature
 - features/lib/chef/knife/without.feature
 - features/support/env.rb
 - features/support/step_definitions.rb
 - knife_cookbook_dependencies.gemspec
+- lib/chef/knife/cookbook_dependencies_clean.rb
 - lib/chef/knife/cookbook_dependencies_install.rb
+- lib/chef/knife/cookbook_dependencies_update.rb
 - lib/kcd.rb
 - lib/kcd/cookbook.rb
 - lib/kcd/cookbookfile.rb
@@ -224,7 +229,6 @@ files:
 - lib/kcd/shelf.rb
 - lib/kcd/version.rb
 - lib/knife_cookbook_dependencies.rb
-- spec/acceptance/knife_cookbook_dependencies_spec.rb
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
@@ -263,12 +267,14 @@ signing_key:
 specification_version: 3
 summary: Resolves cookbook dependencies
 test_files:
+- features/lib/chef/knife/clean.feature
 - features/lib/chef/knife/error_messages.feature
+- features/lib/chef/knife/install.feature
 - features/lib/chef/knife/lockfile.feature
+- features/lib/chef/knife/update.feature
 - features/lib/chef/knife/without.feature
 - features/support/env.rb
 - features/support/step_definitions.rb
-- spec/acceptance/knife_cookbook_dependencies_spec.rb
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb

data/spec/acceptance/knife_cookbook_dependencies_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-require 'chef/knife/cookbook_dependencies_install'
-require 'aruba/api'
-
-
-describe "knife cookbook dependencies install" do
-  describe "should print a friendly error message" do
-    include Aruba::Api
-
-    it "for --without option"
-  end
-end