berkshelf 0.4.0 → 0.5.0.rc1

data/spec/unit/berkshelf/formatters_spec.rb

@@ -1,7 +1,106 @@
 require 'spec_helper'
 
 module Berkshelf
+  describe Formatters do
+    before(:each) do
+      @original = Formatters.class_variable_get :@@formatters
+      Formatters.class_variable_set :@@formatters, Hash.new
+    end
+
+    after(:each) do
+      Formatters.class_variable_set :@@formatters, @original
+    end
+
+    describe "ClassMethods" do
+      subject { Formatters }
+      let(:format_id) { :rspec }
+      let(:format_klass) { Class.new }
+
+      describe "::register" do
+        it "adds the class of the includer to the list of registered formatters with the id" do
+          subject.register(format_id, format_klass)
+
+          subject.formatters.should have_key(format_id)
+          subject.formatters[format_id].should eql(format_klass)
+        end
+
+        context "when given a string instead of a symbol as the ID" do
+          it "converts the string to a symbol and registers it" do
+            subject.register("rspec", format_klass)
+
+            subject.formatters.should have_key(:rspec)
+            subject.formatters[:rspec].should eql(format_klass)
+          end
+        end
+
+        context "when a formatter of the given ID has already been registered" do
+          it "raises an InternalError" do
+            subject.register(format_id, format_klass)
+
+            lambda {
+              subject.register(format_id, format_klass)
+            }.should raise_error(Berkshelf::InternalError)
+          end
+        end
+      end
+
+      describe "::formatters" do
+        before(:each) do
+          subject.register(format_id, format_klass)
+        end
+
+        it "returns a hash where formatter ID's are keys and values are formatter classes" do
+          subject.formatters.should be_a(Hash)
+          subject.formatters.should have(1).item
+          subject.formatters.keys.first.should eql(format_id)
+          subject.formatters.values.first.should eql(format_klass)
+        end
+      end
+
+      describe "::get" do
+        before(:each) do
+          subject.register(format_id, format_klass)
+        end
+
+        it "returns the class constant of the given formatter ID" do
+          subject[format_id].should eql(format_klass)
+        end
+
+        context "when the ID has not been registered" do
+          it "returns nil" do
+            subject[:not_there].should be_nil
+          end
+        end
+      end
+    end
+  end
+
   describe Formatters::AbstractFormatter do
+    before(:each) do
+      @original = Formatters.class_variable_get :@@formatters
+      Formatters.class_variable_set :@@formatters, Hash.new
+    end
+
+    after(:each) do
+      Formatters.class_variable_set :@@formatters, @original
+    end
+
+    describe "ClassMethods" do
+      subject do
+        Class.new do
+          include Formatters::AbstractFormatter
+        end
+      end
+
+      describe "::register_formatter" do
+        it "delegates to Formatters" do
+          Formatters.should_receive(:register).with(:rspec, subject)
+
+          subject.register_formatter(:rspec)
+        end
+      end
+    end
+
     subject do
       Class.new do
         include Formatters::AbstractFormatter
@@ -13,7 +112,6 @@ module Berkshelf
       lambda { subject.use("my_coobook","1.2.3") }.should raise_error(AbstractFunction)
       lambda { subject.use("my_coobook","1.2.3","http://community") }.should raise_error(AbstractFunction)
       lambda { subject.upload("my_coobook","1.2.3","http://chef_server") }.should raise_error(AbstractFunction)
-      lambda { subject.shims_written("/Users/jcocktosten") }.should raise_error(AbstractFunction)
       lambda { subject.msg("something you should know") }.should raise_error(AbstractFunction)
       lambda { subject.error("whoa this is bad") }.should raise_error(AbstractFunction)
     end

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -61,12 +61,12 @@ module Berkshelf
       specify do
         target.should have_structure {
           file "Vagrantfile" do
+            contains "require 'berkshelf/vagrant'"
             contains "recipe[some_cookbook::default]"
           end
           file "Gemfile" do
             contains "gem 'vagrant'"
           end
-          directory "cookbooks"
         }
       end
     end

data/spec/unit/berkshelf/location_spec.rb

@@ -7,7 +7,7 @@ module Berkshelf
         end
       end
 
-      describe "::location_key" do
+      describe "::set_location_key" do
         before(:each) do
           @original = CookbookSource.class_variable_get :@@location_keys
           CookbookSource.class_variable_set :@@location_keys, {}
@@ -18,7 +18,7 @@ module Berkshelf
         end
 
         it "adds the given location key with the includer's Class to CookbookSource.location_keys" do
-          subject.location_key(:reset)
+          subject.set_location_key(:reset)
 
           CookbookSource.location_keys.should have(1).item
           CookbookSource.location_keys.should include(:reset)
@@ -26,7 +26,24 @@ module Berkshelf
         end
       end
 
-      describe "::valid_options" do
+      describe "::location_key" do
+        before(:each) do
+          @original = CookbookSource.class_variable_get :@@location_keys
+          CookbookSource.class_variable_set :@@location_keys, {}
+        end
+
+        after(:each) do
+          CookbookSource.class_variable_set :@@location_keys, @original
+        end
+
+        it "returns the class' registered location key" do
+          subject.set_location_key(:reset)
+
+          subject.location_key.should eql(:reset)
+        end
+      end
+
+      describe "::set_valid_options" do
         before(:each) do
           @original = CookbookSource.class_variable_get :@@valid_options
           CookbookSource.class_variable_set :@@valid_options, []
@@ -37,14 +54,14 @@ module Berkshelf
         end
 
         it "adds the given symbol to the list of valid options on CookbookSource" do
-          subject.valid_options(:mundo)
+          subject.set_valid_options(:mundo)
 
           CookbookSource.valid_options.should have(1).item
           CookbookSource.valid_options.should include(:mundo)
         end
 
         it "adds parameters to the list of valid options on the CookbookSource" do
-          subject.valid_options(:riot, :arenanet)
+          subject.set_valid_options(:riot, :arenanet)
 
           CookbookSource.valid_options.should have(2).items
           CookbookSource.valid_options.should include(:riot)
@@ -150,7 +167,7 @@ module Berkshelf
     end
 
     describe "#validate_cached" do
-      let(:cached) { double('cached-cb', version: "0.1.0") }
+      let(:cached) { double('cached-cb', cookbook_name: name, version: "0.1.0") }
 
       it "raises a ConstraintNotSatisfied error if the version constraint does not satisfy the cached version" do
         constraint.should_receive(:satisfies?).with(cached.version).and_return(false)
@@ -160,11 +177,31 @@ module Berkshelf
         }.should raise_error(ConstraintNotSatisfied)
       end
 
-      it "returns true if the version constraint satisfies the cached version" do
+      it "returns true if cached_cookbooks satisfies the version constraint" do
         constraint.should_receive(:satisfies?).with(cached.version).and_return(true)
         
         subject.validate_cached(cached).should be_true
       end
+
+      context "when the cached_cookbooks satisfies the version constraint" do
+        it "returns true if the name of the cached_cookbook matches the name of the location" do
+          constraint.should_receive(:satisfies?).with(cached.version).and_return(true)
+          cached.stub(:name) { name }
+
+          subject.validate_cached(cached).should be_true
+        end
+
+        it "raises an AmbiguousCookbookName error if the cached_cookbook's name does not match the location's" do
+          pending "Implement when Opscode makes the 'name' a required attribute in Cookbook metadata"
+
+          constraint.should_receive(:satisfies?).with(cached.version).and_return(true)
+          cached.stub(:cookbook_name) { "artifact" }
+
+          lambda {
+            subject.validate_cached(cached)
+          }.should raise_error(AmbiguousCookbookName)
+        end
+      end
     end
   end
 end

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -22,8 +22,8 @@ module Berkshelf
         Lockfile.new(resolver.sources).write
 
         File.read('Berksfile.lock').split(/\r?\n/).sort.should == [
-          "cookbook 'bluepill', :locked_version => '1.0.4'",
-          "cookbook 'build-essential', :locked_version => '1.0.2'",
+          "cookbook 'bluepill', :locked_version => '1.1.0'",
+          "cookbook 'build-essential', :locked_version => '1.1.0'",
           "cookbook 'nginx', :locked_version => '0.101.0'",
           "cookbook 'ohai', :locked_version => '1.0.2'",
           "cookbook 'runit', :locked_version => '0.15.0'"

data/spec/unit/berkshelf/uploader_spec.rb

@@ -2,30 +2,12 @@ require 'spec_helper'
 
 module Berkshelf
   describe Uploader do
-    subject { Uploader.new(Chef::Config[:chef_server_url], client_key: Chef::Config[:client_key], node_name: Chef::Config[:node_name]) }
+    subject { Uploader.new(server_url: Chef::Config[:chef_server_url], client_key: Chef::Config[:client_key], client_name: Chef::Config[:node_name]) }
 
     describe "#upload" do
       let(:cookbook) { double('nginx', name: "nginx-0.101.2", cookbook_name: "nginx", version: "0.101.2") }
 
-      context "when cookbook is valid" do
-        before(:each) do
-          cookbook.should_receive(:validate!).and_return(true)
-          cookbook.should_receive(:checksums).and_return(
-            "da97c94bb6acb2b7900cbf951654fea3" => 
-              File.expand_path("spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb")
-          )
-          subject.should_receive(:create_sandbox)
-          subject.should_receive(:upload_checksums_to_sandbox)
-          subject.should_receive(:commit_sandbox)
-          subject.should_receive(:save_cookbook)
-        end
-
-        it "returns true" do
-          subject.upload(cookbook).should be_true
-        end
-      end
-
-      context "when cookbook is not valid" do
+      context "when cookbook is invalid" do
         before(:each) { cookbook.should_receive(:validate!).and_raise(CookbookSyntaxError) }
 
         it "raises a CookbookSyntaxError error" do

data/spec/unit/berkshelf_spec.rb

@@ -60,11 +60,11 @@ describe Berkshelf do
 
         class CustomFormatter
           include Berkshelf::Formatters::AbstractFormatter
-          Berkshelf.formatters["custom"] = self
+          register_formatter :custom
         end
 
         before do
-          Berkshelf.set_format "custom"
+          Berkshelf.set_format :custom
         end
 
         it "should be the custom class" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Josiah Kiehl
@@ -12,8 +12,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ridley
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +94,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  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'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -350,6 +414,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - josiah@skirmisher.net
@@ -372,6 +452,7 @@ files:
 - bin/berks
 - features/cookbook_command.feature
 - features/default_locations.feature
+- features/groups_install.feature
 - features/init_command.feature
 - features/install.feature
 - features/json_formatter.feature
@@ -384,7 +465,7 @@ files:
 - features/support/env.rb
 - features/update.feature
 - features/upload_command.feature
-- features/without.feature
+- features/vendor_install.feature
 - generator_files/Berksfile.erb
 - generator_files/Gemfile.erb
 - generator_files/README.md.erb
@@ -409,8 +490,6 @@ files:
 - lib/berkshelf/cookbook_store.rb
 - lib/berkshelf/core_ext.rb
 - lib/berkshelf/core_ext/file.rb
-- lib/berkshelf/core_ext/fileutils.rb
-- lib/berkshelf/core_ext/kernel.rb
 - lib/berkshelf/core_ext/pathname.rb
 - lib/berkshelf/core_ext/string.rb
 - lib/berkshelf/downloader.rb
@@ -428,8 +507,19 @@ files:
 - lib/berkshelf/lockfile.rb
 - lib/berkshelf/resolver.rb
 - lib/berkshelf/thor.rb
+- lib/berkshelf/ui.rb
 - lib/berkshelf/uploader.rb
+- lib/berkshelf/vagrant.rb
+- lib/berkshelf/vagrant/action/clean.rb
+- lib/berkshelf/vagrant/action/install.rb
+- lib/berkshelf/vagrant/action/set_ui.rb
+- lib/berkshelf/vagrant/action/upload.rb
+- lib/berkshelf/vagrant/config.rb
+- lib/berkshelf/vagrant/middleware.rb
 - lib/berkshelf/version.rb
+- lib/thor/monkies.rb
+- lib/thor/monkies/hash_with_indifferent_access.rb
+- lib/vagrant_init.rb
 - spec/fixtures/Berksfile
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
@@ -467,7 +557,6 @@ files:
 - spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
-- spec/unit/berkshelf/core_ext/fileutils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb
@@ -496,12 +585,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -718551766010983641
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -511,6 +597,7 @@ summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
 - features/cookbook_command.feature
 - features/default_locations.feature
+- features/groups_install.feature
 - features/init_command.feature
 - features/install.feature
 - features/json_formatter.feature
@@ -523,7 +610,7 @@ test_files:
 - features/support/env.rb
 - features/update.feature
 - features/upload_command.feature
-- features/without.feature
+- features/vendor_install.feature
 - spec/fixtures/Berksfile
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
@@ -561,7 +648,6 @@ test_files:
 - spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
-- spec/unit/berkshelf/core_ext/fileutils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb