knife_cookbook_dependencies 0.0.3 → 0.0.5

data/spec/lib/kcd/lockfile_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe KCD::Lockfile do
+  describe "without a lockfile in place already" do
+    before do
+      @old_dir = Dir.pwd
+      Dir.chdir "spec/fixtures/lockfile_spec/without_lock"
+      KCD.clear_shelf!
+    end
+
+    after do
+      FileUtils.rm_r "cookbooks"
+      Dir.chdir @old_dir
+    end
+
+    it "should be able to write a Cookbookfile.lock from a list of cookbooks" do
+      KCD.shelf.shelve_cookbook('nginx', '= 0.101.0')
+      KCD.shelf.resolve_dependencies
+      KCD.shelf.populate_cookbooks_directory
+      KCD.shelf.write_lockfile
+
+      File.read('Cookbookfile.lock').split(/\r?\n/).sort.should == [
+        "cookbook 'bluepill', :locked_version => '1.0.4'",
+        "cookbook 'build-essential', :locked_version => '1.0.0'", 
+        "cookbook 'nginx', :locked_version => '0.101.0'", 
+        "cookbook 'ohai', :locked_version => '1.0.2'", 
+        "cookbook 'runit', :locked_version => '0.15.0'"
+      ] 
+    end
+  end
+
+  describe "with a lockfile in place" do
+    before do
+      @old_dir = Dir.pwd
+      Dir.chdir "spec/fixtures/lockfile_spec/with_lock"
+      KCD::Cookbookfile.process_install
+      KCD.clear_shelf!
+    end
+
+    after do
+      FileUtils.rm_r "cookbooks"
+      FileUtils.rm "Cookbookfile.lock"
+      Dir.chdir @old_dir
+    end
+
+    it "should populate the cookbooks directory from the lockfile" do
+      lockfile = File.read('Cookbookfile.lock')
+      lockfile.gsub!(/0.101.0/, '0.101.2')
+      File.write('Cookbookfile.lock', lockfile)
+      KCD::Cookbookfile.process_install
+      File.read('cookbooks/nginx/metadata.rb').scan(/version\s*"([^"]+)"/).first.first.should == "0.101.2"
+    end
+  end
+end

data/spec/lib/kcd/shelf_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+module KnifeCookbookDependencies
+  describe Shelf do
+    describe '#get_cookbook' do
+      it "should return nil if a cookbook doesn't exist on the shelf" do
+        Shelf.new.get_cookbook('arbitrary').should be_nil
+      end
+      it "should return the cookbook if the cookbook exists on the shelf" do
+        s = Shelf.new
+        s.shelve_cookbook example_cookbook_from_path
+        s.get_cookbook(example_cookbook_from_path.name).should_not be_nil
+      end
+    end
+
+    describe "#shelve_cookbook" do
+      subject { Shelf.new }
+      it 'should store shelved cookbooks' do
+        subject.shelve_cookbook 'acookbook'
+        subject.cookbooks.collect(&:name).should include 'acookbook'
+      end
+
+      it 'should take version constraints' do
+        subject.shelve_cookbook 'acookbook', '= 1.2.3'
+        subject.cookbooks.last.version_constraints.should == [DepSelector::VersionConstraint.new('= 1.2.3')]
+      end
+
+      it "should resolve the dependency graph of the cookbooks on the shelf" do
+        subject.shelve_cookbook 'mysql', "= 1.2.4"
+        
+        subject.resolve_dependencies.should == ({"mysql" => DepSelector::Version.new("1.2.4"), "openssl" => DepSelector::Version.new("1.0.0")})
+        Cookbook.new('mysql').clean
+        Cookbook.new('openssl').clean
+      end
+    end
+
+    describe '#exclude' do
+      it "should split on :" do
+        subject.exclude("foo:bar")
+        subject.excluded_groups.should == [:foo, :bar]
+      end
+
+      it "should split on ," do
+        subject.exclude("foo,bar")
+        subject.excluded_groups.should == [:foo, :bar]
+      end
+
+      it "should take an Array" do
+        subject.exclude(["foo","bar"])
+        subject.excluded_groups.should == [:foo, :bar]
+      end
+    end
+
+    describe '#cookbook_groups' do
+      it "should return a hash of groups and associated cookbooks" do
+        subject.shelve_cookbook "foobar", :group => ["foo", "bar"]
+        subject.shelve_cookbook "baz", :group => "baz"
+        subject.shelve_cookbook "quux", :group => "quux"
+        subject.shelve_cookbook "baz2", :group => "baz"
+        groups = subject.cookbook_groups
+        groups.keys.size.should == 4
+        groups[:foo].should == ["foobar"]
+        groups[:bar].should == ["foobar"]
+        groups[:baz].should == ["baz", "baz2"]
+        groups[:quux].should == ["quux"]
+      end
+    end
+
+    describe '#requested_cookbooks'do
+      it "should properly exclude cookbooks in the excluded groups" do
+        subject.shelve_cookbook "a1", :group => "a"
+        subject.shelve_cookbook "a2", :group => "a"
+        subject.shelve_cookbook "b1", :group => "b"
+        subject.shelve_cookbook "b2", :group => "b"
+        subject.shelve_cookbook "c1", :group => ["a","b"]
+        subject.exclude "b"
+        subject.requested_cookbooks.should == ["a1", "a2", "c1"]
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler'
 require 'spork'
+require 'vcr'
 
 Spork.prefork do
   require 'rspec'
@@ -11,12 +12,31 @@ Spork.prefork do
   
   Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
+  VCR.configure do |c|
+    c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures', 'vcr_cassettes')
+    c.hook_into :webmock
+  end
+
+
   RSpec.configure do |config|    
     config.mock_with :rspec
     config.treat_symbols_as_metadata_keys_with_true_values = true
     config.filter_run :focus => true
     config.run_all_when_everything_filtered = true
 
+    config.around do |example|
+      # Dynamically create cassettes based on the name of the example
+      # being run. This creates a new cassette for every test.
+      cur = example.metadata
+      identifiers = [example.metadata[:description_args]]
+      while cur = cur[:example_group] do
+        identifiers << cur[:description_args]
+      end
+
+      VCR.use_cassette(identifiers.reverse.join(' ')) do
+        example.run
+      end
+    end
     config.after do
       KnifeCookbookDependencies.clean
     end
@@ -40,7 +60,7 @@ Spork.prefork do
   end
 
   def example_cookbook_from_path
-    @example_cookbook_from_path ||= KnifeCookbookDependencies::Cookbook.new('example_cookbook', path: File.join(File.dirname(__FILE__), 'fixtures', 'cookbooks'))
+    @example_cookbook_from_path ||= KCD::Cookbook.new('example_cookbook', path: File.join(File.dirname(__FILE__), 'fixtures', 'cookbooks'))
   end
 
   def with_cookbookfile content
@@ -55,5 +75,5 @@ Spork.prefork do
 end
 
 Spork.each_run do
-  require 'knife_cookbook_dependencies'
+  require 'kcd'
 end

data/todo.txt

@@ -1,13 +1,13 @@
-Add git support to Cookbookfile
- - Allow a cookbook to be pulled from a git repository
- - Also support 'ref' to give a commit hash to pull
- - Possibly support 'branch' to pull the HEAD from a given branch
-Add path support to Cookbookfile
- - Pull cookbook from a path on the local filesystem
 Add source support to Cookbookfile
  - Allow unofficial cookbook repositories to be used via 'source' in Cookbookfile
-Create local mock API service for specs
- - Instead of mocking out methods, spin up a local mock cookbook repo for tests to run against. This should be able to serve cookbooks as gzips. This might require some monkey patching of knife to get it to talk to the mock server instead of the opscode community site.
+Add path block support
+ - Allow this syntax in Cookbookfile:
+    path '/path/to/cookbooks' do
+      cookbook 'nginx'
+      cookbook 'ntp'
+      cookbook 'mysql'
+    end
+Supress dep_selector stdout
 Optimize cookbook retrieval
  - Possible: Pester Opscode till they release an API call to retrieve cookbook dependencies
  - Possible: Keep an index of dependencies so we don't have to download cookbook versions we've seen before

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife_cookbook_dependencies
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
-  requirement: &70112950558820 !ruby/object:Gem::Requirement
+  requirement: &70311986928620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112950558820
+  version_requirements: *70311986928620
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70112950539980 !ruby/object:Gem::Requirement
+  requirement: &70311986926700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70112950539980
+  version_requirements: *70311986926700
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70112950515020 !ruby/object:Gem::Requirement
+  requirement: &70311986925460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112950515020
+  version_requirements: *70311986925460
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70311986924440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70311986924440
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70311986923640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70311986923640
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70311986922980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70311986922980
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70112950512720 !ruby/object:Gem::Requirement
+  requirement: &70311986922020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950512720
+  version_requirements: *70311986922020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70112950508160 !ruby/object:Gem::Requirement
+  requirement: &70311986920560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +100,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70112950508160
+  version_requirements: *70311986920560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70112950439800 !ruby/object:Gem::Requirement
+  requirement: &70311986918460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +111,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70112950439800
+  version_requirements: *70311986918460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70112950437840 !ruby/object:Gem::Requirement
+  requirement: &70311986917200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950437840
+  version_requirements: *70311986917200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70112950436300 !ruby/object:Gem::Requirement
+  requirement: &70311986895060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950436300
+  version_requirements: *70311986895060
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70112950434780 !ruby/object:Gem::Requirement
+  requirement: &70311986894420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950434780
+  version_requirements: *70311986894420
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70112950423600 !ruby/object:Gem::Requirement
+  requirement: &70311986893780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950423600
+  version_requirements: *70311986893780
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70112950422760 !ruby/object:Gem::Requirement
+  requirement: &70311986892760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950422760
+  version_requirements: *70311986892760
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70112950421600 !ruby/object:Gem::Requirement
+  requirement: &70311986891760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950421600
+  version_requirements: *70311986891760
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70112950420700 !ruby/object:Gem::Requirement
+  requirement: &70311986891140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,7 +188,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112950420700
+  version_requirements: *70311986891140
 description: Resolves cookbook dependencies
 email:
 - josiah@skirmisher.net
@@ -172,30 +205,37 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- features/lib/chef/knife/error_messages.feature
+- features/lib/chef/knife/lockfile.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_install.rb
+- lib/kcd.rb
+- lib/kcd/cookbook.rb
+- lib/kcd/cookbookfile.rb
+- lib/kcd/dsl.rb
+- lib/kcd/error_messages.rb
+- lib/kcd/git.rb
+- lib/kcd/knife_utils.rb
+- lib/kcd/lockfile.rb
+- lib/kcd/metacookbook.rb
+- lib/kcd/shelf.rb
+- lib/kcd/version.rb
 - lib/knife_cookbook_dependencies.rb
-- lib/knife_cookbook_dependencies/cookbook.rb
-- lib/knife_cookbook_dependencies/cookbookfile.rb
-- lib/knife_cookbook_dependencies/dependency_reader.rb
-- lib/knife_cookbook_dependencies/dsl.rb
-- lib/knife_cookbook_dependencies/error_messages.rb
-- lib/knife_cookbook_dependencies/git.rb
-- lib/knife_cookbook_dependencies/knife_utils.rb
-- lib/knife_cookbook_dependencies/lockfile.rb
-- lib/knife_cookbook_dependencies/metacookbook.rb
-- lib/knife_cookbook_dependencies/shelf.rb
-- lib/knife_cookbook_dependencies/version.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
-- spec/lib/knife_cookbook_dependencies/cookbook_spec.rb
-- spec/lib/knife_cookbook_dependencies/cookbookfile_spec.rb
-- spec/lib/knife_cookbook_dependencies/dependency_reader_spec.rb
-- spec/lib/knife_cookbook_dependencies/dsl_spec.rb
-- spec/lib/knife_cookbook_dependencies/git_spec.rb
-- spec/lib/knife_cookbook_dependencies/shelf_spec.rb
+- spec/fixtures/lockfile_spec/with_lock/Cookbookfile
+- spec/fixtures/lockfile_spec/without_lock/Cookbookfile.lock
+- spec/lib/kcd/cookbook_spec.rb
+- spec/lib/kcd/cookbookfile_spec.rb
+- spec/lib/kcd/dsl_spec.rb
+- spec/lib/kcd/git_spec.rb
+- spec/lib/kcd/lockfile_spec.rb
+- spec/lib/kcd/shelf_spec.rb
 - spec/spec_helper.rb
 - todo.txt
 homepage: https://github.com/RiotGames/knife_cookbook_dependencies
@@ -223,14 +263,21 @@ signing_key:
 specification_version: 3
 summary: Resolves cookbook dependencies
 test_files:
+- features/lib/chef/knife/error_messages.feature
+- features/lib/chef/knife/lockfile.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
-- spec/lib/knife_cookbook_dependencies/cookbook_spec.rb
-- spec/lib/knife_cookbook_dependencies/cookbookfile_spec.rb
-- spec/lib/knife_cookbook_dependencies/dependency_reader_spec.rb
-- spec/lib/knife_cookbook_dependencies/dsl_spec.rb
-- spec/lib/knife_cookbook_dependencies/git_spec.rb
-- spec/lib/knife_cookbook_dependencies/shelf_spec.rb
+- spec/fixtures/lockfile_spec/with_lock/Cookbookfile
+- spec/fixtures/lockfile_spec/without_lock/Cookbookfile.lock
+- spec/lib/kcd/cookbook_spec.rb
+- spec/lib/kcd/cookbookfile_spec.rb
+- spec/lib/kcd/dsl_spec.rb
+- spec/lib/kcd/git_spec.rb
+- spec/lib/kcd/lockfile_spec.rb
+- spec/lib/kcd/shelf_spec.rb
 - spec/spec_helper.rb