berkshelf 0.3.7 → 0.4.0.rc1

data/spec/unit/berkshelf/cookbook_source/git_location_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Berkshelf
   describe CookbookSource::GitLocation do
-    let(:complacent_constraint) { double('comp-vconstraint', include?: true) }
+    let(:complacent_constraint) { double('comp-vconstraint', satisfies?: true) }
     
     describe "ClassMethods" do
       subject { CookbookSource::GitLocation }
@@ -72,7 +72,7 @@ module Berkshelf
       context "given the content at the Git repo does not satisfy the version constraint" do
         subject do
           CookbookSource::GitLocation.new("nginx",
-            double('constraint', include?: false),
+            double('constraint', satisfies?: false),
             git: "git://github.com/opscode-cookbooks/nginx.git"
           )
         end

data/spec/unit/berkshelf/cookbook_source/location_spec.rb

@@ -1,5 +1,133 @@
 module Berkshelf
   describe CookbookSource::Location do
+    describe "ClassMethods Module" do
+      subject do
+        Class.new do
+          include CookbookSource::Location
+        end
+      end
+
+      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 "adds the given location key with the includer's Class to CookbookSource.location_keys" do
+          subject.location_key(:reset)
+
+          CookbookSource.location_keys.should have(1).item
+          CookbookSource.location_keys.should include(:reset)
+          CookbookSource.location_keys[:reset].should eql(subject)
+        end
+      end
+
+      describe "::valid_options" do
+        before(:each) do
+          @original = CookbookSource.class_variable_get :@@valid_options
+          CookbookSource.class_variable_set :@@valid_options, []
+        end
+
+        after(:each) do
+          CookbookSource.class_variable_set :@@valid_options, @original
+        end
+
+        it "adds the given symbol to the list of valid options on CookbookSource" do
+          subject.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)
+
+          CookbookSource.valid_options.should have(2).items
+          CookbookSource.valid_options.should include(:riot)
+          CookbookSource.valid_options.should include(:arenanet)
+        end
+      end
+
+      describe "::solve_for_constraint" do
+        let(:constraint) { "~> 0.101.2" }
+        let(:versions) do
+          { 
+            "0.101.2" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_2",
+            "0.101.0" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_0",
+            "0.100.2" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_100_2",
+            "0.100.0" => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_100_0"
+          }
+        end
+
+        it "returns an array with a string containing the version of the solution at index 0" do
+          result = subject.solve_for_constraint(constraint, versions)
+
+          result[0].should eql("0.101.2")
+        end
+
+        it "returns an array containing a URI at index 0" do
+          result = subject.solve_for_constraint(constraint, versions)
+
+          result[1].should match(URI.regexp)
+        end
+
+        it "should return the best match for the constraint and versions given" do
+          subject.solve_for_constraint(constraint, versions)[0].to_s.should eql("0.101.2")
+        end
+
+        context "given a solution can not be found for constraint" do
+          it "returns nil" do
+            subject.solve_for_constraint(Solve::Constraint.new(">= 1.0"), versions).should be_nil
+          end
+        end
+      end
+    end
+
+    describe "ModuleFunctions" do
+      subject { CookbookSource::Location }
+
+      describe "::init" do
+        let(:name) { "artifact" }
+        let(:constraint) { double("constraint") }
+
+        it "returns an instance of SiteLocation given a site: option key" do
+          result = subject.init(name, constraint, site: "http://site/value")
+
+          result.should be_a(CookbookSource::SiteLocation)
+        end
+
+        it "returns an instance of PathLocation given a path: option key" do
+          result = subject.init(name, constraint, path: "/Users/reset/code")
+
+          result.should be_a(CookbookSource::PathLocation)
+        end
+
+        it "returns an instance of GitLocation given a git: option key" do
+          result = subject.init(name, constraint, git: "git://github.com/something.git")
+
+          result.should be_a(CookbookSource::GitLocation)
+        end
+
+        it "returns an instance of SiteLocation when no option key is given that matches a registered location_key" do
+          result = subject.init(name, constraint)
+
+          result.should be_a(CookbookSource::SiteLocation)
+        end
+
+        context "given two location_keys" do
+          it "raises an InternalError" do
+            lambda {
+              subject.init(name, constraint, git: :value, path: :value)
+            }.should raise_error(InternalError)
+          end
+        end
+      end
+    end 
+
     let(:name) { "nginx" }
     let(:constraint) { double('constraint') }
 
@@ -25,7 +153,7 @@ module Berkshelf
       let(:cached) { double('cached-cb', version: "0.1.0") }
 
       it "raises a ConstraintNotSatisfied error if the version constraint does not satisfy the cached version" do
-        constraint.should_receive(:include?).with(cached.version).and_return(false)
+        constraint.should_receive(:satisfies?).with(cached.version).and_return(false)
 
         lambda {
           subject.validate_cached(cached)
@@ -33,7 +161,7 @@ module Berkshelf
       end
 
       it "returns true if the version constraint satisfies the cached version" do
-        constraint.should_receive(:include?).with(cached.version).and_return(true)
+        constraint.should_receive(:satisfies?).with(cached.version).and_return(true)
         
         subject.validate_cached(cached).should be_true
       end

data/spec/unit/berkshelf/cookbook_source/path_location_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Berkshelf
   describe CookbookSource::PathLocation do
-    let(:complacent_constraint) { double('comp-vconstraint', include?: true) }
+    let(:complacent_constraint) { double('comp-vconstraint', satisfies?: true) }
     let(:path) { fixtures_path.join("cookbooks", "example_cookbook").to_s }
     subject { CookbookSource::PathLocation.new("nginx", complacent_constraint, path: path) }
 
@@ -38,7 +38,7 @@ module Berkshelf
       end
 
       context "given the content at path does not satisfy the version constraint" do
-        subject { CookbookSource::PathLocation.new("nginx", double('constraint', include?: false), path: path) }
+        subject { CookbookSource::PathLocation.new("nginx", double('constraint', satisfies?: false), path: path) }
 
         it "raises a ConstraintNotSatisfied error" do
           lambda {

data/spec/unit/berkshelf/cookbook_source/site_location_spec.rb

@@ -2,47 +2,14 @@ require 'spec_helper'
 
 module Berkshelf
   describe CookbookSource::SiteLocation do
-    describe "ClassMethods" do
-      let(:constraint) { DepSelector::VersionConstraint.new("~> 0.101.2") }
-      subject { CookbookSource::SiteLocation }
-      let(:versions) do
-        { 
-          DepSelector::Version.new("0.101.2") => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_2",
-          DepSelector::Version.new("0.101.0") => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_0",
-          DepSelector::Version.new("0.100.2") => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_100_2",
-          DepSelector::Version.new("0.100.0") => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_100_0"
-        }
-      end
-
-      describe "#solve_for_constraint" do
-        it "returns an array containing a DepSelector::Version at index 0" do
-          result = subject.solve_for_constraint(constraint, versions)
-
-          result[0].should be_a(DepSelector::Version)
-        end
-
-        it "returns an array containing a URI at index 0" do
-          result = subject.solve_for_constraint(constraint, versions)
-
-          result[1].should match(URI.regexp)
-        end
-
-        it "should return the best match for the constraint and versions given" do
-          subject.solve_for_constraint(constraint, versions)[0].to_s.should eql("0.101.2")
-        end
-
-        context "given a solution can not be found for constraint" do
-          it "returns nil" do
-            subject.solve_for_constraint(DepSelector::VersionConstraint.new(">= 1.0"), versions).should be_nil
-          end
-        end
-      end
-    end
-
-    let(:complacent_constraint) { double('comp-vconstraint', include?: true) }
+    let(:complacent_constraint) { double('comp-vconstraint', satisfies?: true) }
     subject { CookbookSource::SiteLocation.new("nginx", complacent_constraint) }
 
     describe "#download" do
+      before(:each) do
+        subject.stub(:target_version).and_return(["0.101.2", "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_2"])
+      end
+
       it "returns a CachedCookbook" do
         result = subject.download(tmp_path)
         name = subject.name
@@ -58,7 +25,9 @@ module Berkshelf
       end
 
       context "given a wildcard '>= 0.0.0' version constraint is specified" do
-        subject { CookbookSource::SiteLocation.new("nginx", DepSelector::VersionConstraint.new(">= 0.0.0")) }
+        before(:each) do
+          subject.stub(:latest_version).and_return(["0.101.2", "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_2"])
+        end
 
         it "downloads the latest version of the cookbook to the given destination" do
           subject.download(tmp_path)
@@ -73,36 +42,6 @@ module Berkshelf
         end
       end
 
-      context "given an exact match version constraint" do
-        subject { CookbookSource::SiteLocation.new("nginx", DepSelector::VersionConstraint.new("= 0.101.2")) }
-
-        it "downloads the cookbook with the version matching the version_constraint to the given destination" do
-          subject.download(tmp_path)
-          name = subject.name
-
-          tmp_path.should have_structure {
-            directory "#{name}-0.101.2" do
-              file "metadata.rb"
-            end
-          }
-        end
-      end
-
-      context "given a more broad version constraint" do
-        subject { CookbookSource::SiteLocation.new("nginx", DepSelector::VersionConstraint.new("~> 0.99.0")) }
-
-        it "downloads the best matching cookbook version for the constraint to the given destination" do
-          subject.download(tmp_path)
-          name = subject.name
-
-          tmp_path.should have_structure {
-            directory "#{name}-0.99.2" do
-              file "metadata.rb"
-            end
-          }
-        end
-      end
-
       context "given an explicit :site location key" do
         subject do
           CookbookSource::SiteLocation.new("nginx",
@@ -111,6 +50,10 @@ module Berkshelf
           )
         end
 
+        before(:each) do
+          subject.stub(:latest_version).and_return(["0.101.2", "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_2"])
+        end
+
         it "downloads the cookbook to the given destination" do
           subject.download(tmp_path)
           name = subject.name
@@ -125,11 +68,9 @@ module Berkshelf
       end
 
       context "given a cookbook that does not exist on the specified site" do
-        subject do
-          CookbookSource::SiteLocation.new("nowaythis_exists",
-            complacent_constraint,
-            site: "http://cookbooks.opscode.com/api/v1/cookbooks"
-          )
+        before(:each) do
+          subject.stub(:versions).and_raise(CookbookNotFound)
+          subject.stub(:target_version).and_raise(CookbookNotFound)
         end
 
         it "raises a CookbookNotFound error" do
@@ -141,47 +82,23 @@ module Berkshelf
     end
 
     describe "#versions" do
-      it "returns a hash containing versions for keys" do
-        subject.versions.each do |key, val|
-          key.should be_a(DepSelector::Version)
-        end
-      end
-
-      it "returns a hash containing uris for values" do
-        subject.versions.each do |key, val|
-          val.should match(URI.regexp)
-        end
-      end
-    end
-
-    describe "#version" do
-      it "returns an array containing a DepSelector::Version at index 0" do
-        result = subject.version("0.101.2")
-
-        result[0].should be_a(DepSelector::Version)
+      it "returns a hash containing a string containing the version number of each cookbook version as the keys" do
+        subject.versions.should have_key("0.101.2")
       end
 
-      it "returns an array containing a URI at index 0" do
-        result = subject.version("0.101.2")
-
-        result[1].should match(URI.regexp)
-      end
-
-      it "returns a DepSelector::Version that matches the given version" do
-        result = subject.version("0.101.2")
-
-        result[0].to_s.should eql("0.101.2")
+      it "returns a hash containing a string containing the download URL for each cookbook version as the values" do
+        subject.versions["0.101.2"].should eql("http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_101_2")
       end
     end
 
     describe "#latest_version" do
-      it "returns an array containing a DepSelector::Version at index 0" do
+      it "returns an array containing a version string at index 0" do
         result = subject.latest_version
 
-        result[0].should be_a(DepSelector::Version)
+        result[0].should match(/^(.+)\.(.+)\.(.+)$/)
       end
 
-      it "returns an array containing a URI at index 0" do
+      it "returns an array containing a URI at index 1" do
         result = subject.latest_version
 
         result[1].should match(URI.regexp)

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -4,114 +4,183 @@ module Berkshelf
   describe CookbookSource do
     let(:cookbook_name) { "nginx" }
 
-    describe "#initialize" do
+    describe "ClassMethods" do
       subject { CookbookSource }
 
-      context "given no location key (i.e. :git, :path, :site)" do
-        let(:source) { subject.new(cookbook_name) }
+      describe "::initialize" do
+        context "given no location key (i.e. :git, :path, :site)" do
+          let(:source) { subject.new(cookbook_name) }
 
-        it "uses a default SiteLocation pointing to the opscode community api" do
-          source.location.api_uri.should eql(subject::SiteLocation::OPSCODE_COMMUNITY_API)
+          it "uses a default SiteLocation pointing to the opscode community api" do
+            source.location.api_uri.should eql(subject::SiteLocation::OPSCODE_COMMUNITY_API)
+          end
         end
-      end
 
-      context "given no value for constraint" do
-        let(:source) { subject.new(cookbook_name) }
+        context "given no value for constraint" do
+          let(:source) { subject.new(cookbook_name) }
 
-        it "returns a wildcard match for any version" do
-          source.version_constraint.to_s.should eql(">= 0.0.0")
+          it "returns a wildcard match for any version" do
+            source.version_constraint.to_s.should eql(">= 0.0.0")
+          end
         end
-      end
 
-      context "given a value for constraint" do
-        let(:source) { subject.new(cookbook_name, "~> 1.0.84") }
+        context "given a value for constraint" do
+          let(:source) { subject.new(cookbook_name, "~> 1.0.84") }
 
-        it "returns a DepSelector::VersionConstraint for the given version for version_constraint" do
-          source.version_constraint.to_s.should eql("~> 1.0.84")
+          it "returns a Solve::Constraint for the given version for version_constraint" do
+            source.version_constraint.to_s.should eql("~> 1.0.84")
+          end
         end
-      end
 
-      context "given a location key :git" do
-        let(:url) { "git://url_to_git" }
-        let(:source) { subject.new(cookbook_name, :git => url) }
+        context "given a location key :git" do
+          let(:url) { "git://url_to_git" }
+          let(:source) { subject.new(cookbook_name, git: url) }
 
-        it "initializes a GitLocation for location" do
-          source.location.should be_a(subject::GitLocation)
-        end
+          it "initializes a GitLocation for location" do
+            source.location.should be_a(subject::GitLocation)
+          end
 
-        it "points to the given Git URL" do
-          source.location.uri.should eql(url)
+          it "points to the given Git URL" do
+            source.location.uri.should eql(url)
+          end
         end
-      end
 
-      context "given a location key :path" do
-        context "given a value for path that contains a cookbook" do
-          let(:path) { fixtures_path.join("cookbooks", "example_cookbook").to_s }
+        context "given a location key :path" do
+          context "given a value for path that contains a cookbook" do
+            let(:path) { fixtures_path.join("cookbooks", "example_cookbook").to_s }
+
+            it "initializes a PathLocation for location" do
+              subject.new(cookbook_name, path: path).location.should be_a(subject::PathLocation)
+            end
 
-          it "initializes a PathLocation for location" do
-            subject.new(cookbook_name, path: path).location.should be_a(subject::PathLocation)
+            it "points to the specified path" do
+              subject.new(cookbook_name, path: path).location.path.should eql(path)
+            end
           end
 
-          it "points to the specified path" do
-            subject.new(cookbook_name, path: path).location.path.should eql(path)
+          context "given a value for path that does not contain a cookbook" do
+            let(:path) { "/does/not/exist" }
+
+            it "raises Berkshelf::CookbookNotFound" do
+              lambda {
+                subject.new(cookbook_name, path: path)
+              }.should raise_error(Berkshelf::CookbookNotFound)
+            end
           end
-        end
 
-        context "given a value for path that does not contain a cookbook" do
-          let(:path) { "/does/not/exist" }
+          context "given an invalid option" do
+            it "raises BerkshelfError with a friendly message" do
+              lambda {
+                subject.new(cookbook_name, invalid_opt: "thisisnotvalid")
+              }.should raise_error(Berkshelf::BerkshelfError, "Invalid options for Cookbook Source: 'invalid_opt'.")
+            end
+
+            it "raises BerkshelfError with a messaging containing all of the invalid options" do
+              lambda {
+                subject.new(cookbook_name, invalid_one: "one", invalid_two: "two")
+              }.should raise_error(Berkshelf::BerkshelfError, "Invalid options for Cookbook Source: 'invalid_one', 'invalid_two'.")
+            end
+          end
 
-          it "rasies Berkshelf::CookbookNotFound" do
-            lambda {
-              subject.new(cookbook_name, path: path)
-            }.should raise_error(Berkshelf::CookbookNotFound)
+          describe "::add_valid_option" do
+            before(:each) do
+              @original = subject.class_variable_get :@@valid_options
+              subject.class_variable_set :@@valid_options, []
+            end
+
+            after(:each) do
+              subject.class_variable_set :@@valid_options, @original
+            end
+
+            it "adds an option to the list of valid options" do
+              subject.add_valid_option(:one)
+
+              subject.valid_options.should have(1).item
+              subject.valid_options.should include(:one)
+            end
+
+            it "does not add duplicate options to the list of valid options" do
+              subject.add_valid_option(:one)
+              subject.add_valid_option(:one)
+
+              subject.valid_options.should have(1).item
+              subject.valid_options.should include(:one)
+            end
+          end
+
+          describe "::add_location_key" do
+            before(:each) do
+              @original = subject.class_variable_get :@@location_keys
+              subject.class_variable_set :@@location_keys, {}
+            end
+
+            after(:each) do
+              subject.class_variable_set :@@location_keys, @original
+            end
+            
+            it "adds a location key and the associated class to the list of valid locations" do
+              subject.add_location_key(:git, subject.class)
+
+              subject.location_keys.should have(1).item
+              subject.location_keys.should include(:git)
+              subject.location_keys[:git].should eql(subject.class)
+            end
+
+            it "does not add duplicate location keys to the list of location keys" do
+              subject.add_location_key(:git, subject.class)
+              subject.add_location_key(:git, subject.class)
+              
+              subject.location_keys.should have(1).item
+              subject.location_keys.should include(:git)
+            end
           end
         end
-      end
 
-      context "given a location key :site" do
-        let(:url) { "http://path_to_api/v1" }
-        let(:source) { subject.new(cookbook_name, :site => url) }
+        context "given a location key :site" do
+          let(:url) { "http://path_to_api/v1" }
+          let(:source) { subject.new(cookbook_name, site: url) }
 
-        it "initializes a SiteLocation for location" do
-          source.location.should be_a(subject::SiteLocation)
-        end
+          it "initializes a SiteLocation for location" do
+            source.location.should be_a(subject::SiteLocation)
+          end
 
-        it "points to the specified URI" do
-          source.location.api_uri.should eql(url)
+          it "points to the specified URI" do
+            source.location.api_uri.should eql(url)
+          end
         end
-      end
 
-      context "given multiple location options" do
-        it "raises with an ArgumentError" do
-          lambda {
-            subject.new(cookbook_name, :site => "something", :git => "something")
-          }.should raise_error(ArgumentError)
+        context "given multiple location options" do
+          it "raises with an Berkshelf::BerkshelfError" do
+            lambda {
+              subject.new(cookbook_name, site: "something", git: "something")
+            }.should raise_error(Berkshelf::BerkshelfError)
+          end
         end
-      end
 
-      context "given a group option containing a single group" do
-        let(:group) { :production }
-        let(:source) { subject.new(cookbook_name, :group => group) }
+        context "given a group option containing a single group" do
+          let(:group) { :production }
+          let(:source) { subject.new(cookbook_name, group: group) }
 
-        it "assigns the single group to the groups attribute" do
-          source.groups.should include(group)
+          it "assigns the single group to the groups attribute" do
+            source.groups.should include(group)
+          end
         end
-      end
 
-      context "given a group option containing an array of groups" do
-        let(:groups) { [ :development, :test ] }
-        let(:source) { subject.new(cookbook_name, :group => groups) }
+        context "given a group option containing an array of groups" do
+          let(:groups) { [ :development, :test ] }
+          let(:source) { subject.new(cookbook_name, group: groups) }
 
-        it "assigns all the groups to the group attribute" do
-          source.groups.should eql(groups)
+          it "assigns all the groups to the group attribute" do
+            source.groups.should eql(groups)
+          end
         end
-      end
 
-      context "given no group option" do
-        let(:source) { subject.new(cookbook_name) }
+        context "given no group option" do
+          let(:source) { subject.new(cookbook_name) }
 
-        it "should have the default group assigned" do
-          source.groups.should include(:default)
+          it "should have the default group assigned" do
+            source.groups.should include(:default)
+          end
         end
       end
     end