berkshelf 0.3.3 → 0.3.7

data/spec/unit/berkshelf/resolver_spec.rb

@@ -2,59 +2,83 @@ require 'spec_helper'
 
 module Berkshelf
   describe Resolver do
+    let(:source) do
+      double('source',
+        name: 'mysql',
+        version_constraint: DepSelector::VersionConstraint.new('= 1.2.4'),
+        downloaded?: true,
+        cached_cookbook: double('mysql-cookbook', 
+          name: 'mysql-1.2.4',
+          cookbook_name: 'mysql',
+          version: '1.2.4',
+          dependencies: { "nginx" => ">= 0.1.0", "artifact" => "~> 0.10.0" }
+        ),
+        location: double('location', validate_cached: true)
+      )
+    end
+
+    let(:source_two) do
+      double('source-two',
+        name: 'nginx',
+        version_constraint: DepSelector::VersionConstraint.new('= 0.101.2'),
+        downloaded?: true,
+        cached_cookbook: double('nginx-cookbook', 
+          name: 'nginx-0.101.2',
+          cookbook_name: 'nginx',
+          version: '0.101.2',
+          dependencies: Hash.new
+        ),
+        location: double('location', validate_cached: true)
+      )
+    end
+
     describe "ClassMethods" do
       subject { Resolver }
 
-      describe "#initialize" do
+      describe "::initialize" do
         let(:downloader) { Berkshelf.downloader }
 
         it "adds the specified sources to the sources hash" do
-          source = CookbookSource.new("mysql", "= 1.2.4")
           resolver = subject.new(downloader, source)
 
-          resolver.should have_source(source)
+          resolver.should have_source(source.name)
         end
 
-        it "adds the dependencies of the source as packages of the graph" do
-          source = CookbookSource.new("mysql", "= 1.2.4")
+        it "adds the dependencies of the source as sources" do
           resolver = subject.new(downloader, source)
 
-          source.dependencies.each do |name, constraint|
+          source.cached_cookbook.dependencies.each do |name, constraint|
             resolver.package(name).should_not be_nil
           end
         end
 
         it "adds the version_constraints of the dependencies to the graph" do
-          source = CookbookSource.new("mysql", "= 1.2.4")
           resolver = subject.new(downloader, source)
 
-          source.dependencies.each do |name, constraint|
+          source.cached_cookbook.dependencies.each do |name, constraint|
             resolver.package(name).versions.should_not be_empty
           end
         end
 
         context "given an array of sources" do
-          it "adds the sources to the sources hash" do
-            sources = [CookbookSource.new("mysql", "= 1.2.4")]
+          it "adds each source to the sources hash" do
+            sources = [source]
             resolver = subject.new(downloader, sources)
 
-            resolver.should have_source(sources[0])
+            resolver.should have_source(sources[0].name)
           end
         end
       end
     end
 
-    let(:source) { CookbookSource.new("mysql", "= 1.2.4") }
-
-    subject do
-      downloader = Berkshelf.downloader
-      Resolver.new(downloader)
-    end
+    subject { Resolver.new(Berkshelf.downloader) }
 
     describe "#add_source" do
-      before(:each) { subject.add_source(source) }
+      let(:package_version) { double('package-version', dependencies: Array.new) }
 
       it "adds the source to the instance of resolver" do
+        subject.add_source(source)
+
         subject.sources.should include(source)
       end
 
@@ -63,46 +87,50 @@ module Berkshelf
       end
 
       it "adds a version constraint specified by the source to the package of the same name" do
+        subject.add_source(source)
+
         subject.package(source.name).versions.collect(&:version).should include(source.version_constraint.version)
       end
 
       it "adds the dependencies of the source as packages to the graph" do
-        source.dependencies.each do |name, constraint|
-          subject.package(name).should_not be_nil
-        end
+        subject.should_receive(:add_source_dependencies).with(source)
+        
+        subject.add_source(source)
       end
 
       it "raises a DuplicateSourceDefined exception if a source of the same name is added" do
-        dup_source = CookbookSource.new(source.name)
+        subject.should_receive(:has_source?).with(source).and_return(true)
 
         lambda {
-          subject.add_source(dup_source)
+          subject.add_source(source)
         }.should raise_error(DuplicateSourceDefined)
       end
-    end
 
-    describe "#add_dependencies" do
-      it "adds a package for each dependency to the graph" do
-        pkg_ver = subject.add_source(source)
-        subject.add_dependencies(pkg_ver, source.dependencies)
+      it "adds a package for each dependency to the packages attribute" do
+        subject.add_source(source)
 
-        subject.package(source.name).should_not be_nil
+        source.cached_cookbook.dependencies.each do |name, constraint|
+          subject.package(name).should_not be_nil
+        end
       end
 
-      it "adds a version constraint to the graph for each dependency" do
-        pkg_ver = subject.add_source(source)
-        subject.add_dependencies(pkg_ver, source.dependencies)
+      context "when include_dependencies is false" do
+        it "does not try to include_dependencies" do
+          subject.should_not_receive(:add_source_dependencies)
 
-        subject.package(source.name).versions.collect(&:version).should include(source.version_constraint.version)
+          subject.add_source(source, false)
+        end
       end
     end
 
-    describe "#[]" do
+    describe "#get_source" do
       before(:each) { subject.add_source(source) }
 
-      it "returns the source of the given name" do
-        subject[source.name].should eql(source)
-      end
+      context "given a string representation of the source to retrieve" do
+        it "returns the source of the same name" do
+          subject.get_source(source.name).should eql(source)
+        end
+      end       
     end
 
     describe "#has_source?" do
@@ -116,24 +144,20 @@ module Berkshelf
     describe "#resolve" do
       before(:each) do
         subject.add_source(source)
+        subject.add_source(source_two)
         @solution = subject.resolve
       end
       
-      it "returns an array of CachedCookbooks" do
-        @solution.each do |item|
-          item.should be_a(CachedCookbook)
-        end
+      it "returns an array of the CachedCookbooks which make up the solution" do
+        @solution.should include(source.cached_cookbook)
+        @solution.should include(source_two.cached_cookbook)
       end
-
-      it "returns a CachedCookbook for each resolved source" do
-        @solution.should have(2).items
-      end
-
+      
       it "resolves the given mysql source" do
         @solution[0].cookbook_name.should eql("mysql")
         @solution[0].version.should eql("1.2.4")
-        @solution[1].cookbook_name.should eql("openssl")
-        @solution[1].version.should eql("1.0.0")
+        @solution[1].cookbook_name.should eql("nginx")
+        @solution[1].version.should eql("0.101.2")
       end
     end
   end

data/spec/unit/berkshelf/uploader_spec.rb

@@ -2,9 +2,14 @@ require 'spec_helper'
 
 module Berkshelf
   describe Uploader do
-    let(:server_url) { "https://api.opscode.com/organizations/vialstudios" }
-    let(:client_key) { '/Users/reset/.chef/reset.pem' }
-    let(:node_name) { 'reset' }
+
+    unless config = YAML.load_file('features/config.yml')
+      raise "Could not load features/config.yml -- please generate it from features/config.sample.yml"
+    end
+
+    let(:server_url) { config["chef_server_url"] }
+    let(:client_key) { config["client_key"] }
+    let(:node_name) { config["node_name"] }
 
     subject { Uploader.new(server_url, client_key: client_key, node_name: node_name) }
 
@@ -14,7 +19,10 @@ module Berkshelf
       context "when cookbook is valid" do
         before(:each) do
           cookbook.should_receive(:validate!).and_return(true)
-          cookbook.should_receive(:checksums).and_return("da97c94bb6acb2b7900cbf951654fea3"=>"/Users/reset/code/berkshelf/spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb")
+          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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
@@ -388,6 +388,7 @@ files:
 - lib/berkshelf/cli.rb
 - lib/berkshelf/cookbook_source.rb
 - lib/berkshelf/cookbook_source/git_location.rb
+- lib/berkshelf/cookbook_source/location.rb
 - lib/berkshelf/cookbook_source/path_location.rb
 - lib/berkshelf/cookbook_source/site_location.rb
 - lib/berkshelf/cookbook_store.rb
@@ -396,6 +397,7 @@ files:
 - 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
 - lib/berkshelf/dsl.rb
 - lib/berkshelf/errors.rb
@@ -417,8 +419,9 @@ files:
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
-- spec/fixtures/cookbooks/invalid_ruby_files-1.0.0/recipes/default.rb
-- spec/fixtures/cookbooks/invalid_template_files-1.0.0/templates/default/broken.erb
+- spec/fixtures/cookbooks/example_metadata_name/metadata.rb
+- spec/fixtures/cookbooks/example_metadata_no_name/metadata.rb
+- spec/fixtures/cookbooks/example_no_metadata/recipes/default.rb
 - spec/fixtures/cookbooks/nginx-0.100.5/README.md
 - spec/fixtures/cookbooks/nginx-0.100.5/attributes/default.rb
 - spec/fixtures/cookbooks/nginx-0.100.5/definitions/nginx_site.rb
@@ -440,6 +443,7 @@ files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cookbook_source/git_location_spec.rb
+- spec/unit/berkshelf/cookbook_source/location_spec.rb
 - spec/unit/berkshelf/cookbook_source/path_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/site_location_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
@@ -474,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3981898465681112327
+      hash: -4298839394573709666
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -501,8 +505,9 @@ test_files:
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
-- spec/fixtures/cookbooks/invalid_ruby_files-1.0.0/recipes/default.rb
-- spec/fixtures/cookbooks/invalid_template_files-1.0.0/templates/default/broken.erb
+- spec/fixtures/cookbooks/example_metadata_name/metadata.rb
+- spec/fixtures/cookbooks/example_metadata_no_name/metadata.rb
+- spec/fixtures/cookbooks/example_no_metadata/recipes/default.rb
 - spec/fixtures/cookbooks/nginx-0.100.5/README.md
 - spec/fixtures/cookbooks/nginx-0.100.5/attributes/default.rb
 - spec/fixtures/cookbooks/nginx-0.100.5/definitions/nginx_site.rb
@@ -524,6 +529,7 @@ test_files:
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cookbook_source/git_location_spec.rb
+- spec/unit/berkshelf/cookbook_source/location_spec.rb
 - spec/unit/berkshelf/cookbook_source/path_location_spec.rb
 - spec/unit/berkshelf/cookbook_source/site_location_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb

data/spec/fixtures/cookbooks/invalid_ruby_files-1.0.0/recipes/default.rb

@@ -1 +0,0 @@
-(*&)*^^^@(8123_)@(jkladsf}})end))) +++ /0

data/spec/fixtures/cookbooks/invalid_template_files-1.0.0/templates/default/broken.erb

@@ -1 +0,0 @@
-<%= (*&)*^^^@(8123_)@(jkladsf}})end))) +++%>