berkshelf 0.4.0.rc4 → 0.4.0

data/lib/berkshelf/lockfile.rb

@@ -28,9 +28,9 @@ module Berkshelf
       def get_source_definition(source)
         definition = "cookbook '#{source.name}'"
 
-        if source.location.is_a?(CookbookSource::GitLocation)
+        if source.location.is_a?(GitLocation)
           definition += ", :git => '#{source.location.uri}', :ref => '#{source.location.branch || 'HEAD'}'"
-        elsif source.location.is_a?(CookbookSource::PathLocation)
+        elsif source.location.is_a?(PathLocation)
           definition += ", :path => '#{source.location.path}'"
         else
           definition += ", :locked_version => '#{source.locked_version}'"

data/lib/berkshelf/resolver.rb

@@ -6,8 +6,10 @@ module Berkshelf
     attr_reader :graph
 
     # @param [Downloader] downloader
-    # @param [Array<CookbookSource>, CookbookSource] sources
-    def initialize(downloader, sources = Array.new)
+    # @param [Hash] options
+    #
+    # @option options [Array<CookbookSource>, CookbookSource] sources
+    def initialize(downloader, options = {})
       @downloader = downloader
       @graph = Solve::Graph.new
       @sources = Hash.new
@@ -16,11 +18,11 @@ module Berkshelf
       # not, then one of the dependencies of a source that is added
       # may take precedence over an explicitly set source that appears
       # later in the iterator.
-      Array(sources).each do |source|
+      Array(options[:sources]).each do |source|
         add_source(source, false)
       end
 
-      Array(sources).each do |source|
+      Array(options[:sources]).each do |source|
         add_source_dependencies(source)
       end
     end
@@ -41,7 +43,7 @@ module Berkshelf
         raise DuplicateSourceDefined, "A source named '#{source.name}' is already present."
       end
 
-      set_source(source)
+      @sources[source.name] = source
       use_source(source) || install_source(source)
 
       graph.artifacts(source.name, source.cached_cookbook.version)
@@ -66,7 +68,7 @@ module Berkshelf
       source.cached_cookbook.dependencies.each do |name, constraint|
         next if has_source?(name)
 
-        add_source(CookbookSource.new(name, constraint))
+        add_source(CookbookSource.new(name, constraint: constraint))
       end
     end
 
@@ -116,17 +118,12 @@ module Berkshelf
 
       attr_reader :downloader
 
-      # @param [CookbookSource] source
-      def set_source(source)
-        @sources[source.name] = source
-      end
-
       # @param [Berkshelf::CookbookSource] source
       #
       # @return [Boolean]
       def install_source(source)
-        downloader.download!(source)
-        Berkshelf.formatter.install source.name, source.cached_cookbook.version, source.location
+        cached_cookbook, location = downloader.download(source)
+        Berkshelf.formatter.install source.name, cached_cookbook.version, location
       end
 
       # Use the given source to create a constraint solution if the source has been downloaded or can
@@ -148,7 +145,7 @@ module Berkshelf
           cached = source.cached_cookbook
           source.location.validate_cached(cached)
         else
-          if source.location.is_a?(CookbookSource::GitLocation)
+          if source.location.is_a?(GitLocation)
             return false
           end
 
@@ -158,7 +155,7 @@ module Berkshelf
           get_source(source).cached_cookbook = cached
         end
 
-        path = source.location.is_a?(CookbookSource::PathLocation) ? "#{source.location}" : nil
+        path = source.location.is_a?(PathLocation) ? "#{source.location}" : nil
         Berkshelf.formatter.use cached.cookbook_name, cached.version, path
 
         true

data/lib/berkshelf/uploader.rb

@@ -41,15 +41,8 @@ module Berkshelf
     #   Freeze the uploaded Cookbook on the Chef Server so that it cannot be
     #   overwritten
     #
-    # @return [TXResult]
+    # @return [Boolean]
     def upload(cookbook, options = {})
-      upload!(cookbook, options)
-    rescue BerkshelfError => e
-      TXResult.new(:error, e.message)
-    end
-
-    # @see #upload
-    def upload!(cookbook, options = {})
       cookbook.validate!
 
       checksums = cookbook.checksums.dup
@@ -58,7 +51,7 @@ module Berkshelf
       commit_sandbox(new_sandbox)
       save_cookbook(cookbook, options)
 
-      TXResult.new(:ok, "#{cookbook.cookbook_name} (#{cookbook.version}) uploaded to: '#{server_url}'")
+      true
     end
 
     private

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.4.0.rc4"
+  VERSION = "0.4.0"
 end

data/spec/support/chef_api.rb

@@ -14,7 +14,7 @@ module Berkshelf
 
       def upload_cookbook(path)
         cached = CachedCookbook.from_store_path(path)
-        uploader.upload!(cached)
+        uploader.upload(cached)
       end
 
       # Remove all versions of all cookbooks from the Chef Server defined in your
@@ -83,6 +83,12 @@ EOF
           end
         end
 
+        if options[:recommendations]
+          options[:recommendations].each do |name, constraint|
+            metadata << "recommends '#{name}', '#{constraint}'\n"
+          end
+        end
+
         File.write(cookbook_path.join("metadata.rb"), metadata)
         cookbook_path
       end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -62,20 +62,125 @@ EOF
     let(:source_one) { double('source_one', name: "nginx") }
     let(:source_two) { double('source_two', name: "mysql") }
 
-    subject do
-      cbf = Berksfile.new(tmp_path.join("Berksfile"))
-      cbf.add_source(source_one)
-      cbf.add_source(source_two)
-      cbf
+    subject { Berksfile.new(tmp_path.join("Berksfile")) }
+
+    describe "#cookbook" do
+      let(:name) { "artifact" }
+      let(:constraint) { double('constraint') }
+      let(:default_options) { { group: [] } }
+
+      it "sends the add_source message with the name, constraint, and options to the instance of the includer" do
+        subject.should_receive(:add_source).with(name, constraint, default_options)
+
+        subject.cookbook name, constraint, default_options
+      end
+
+      it "merges the default options into specified options" do
+        subject.should_receive(:add_source).with(name, constraint, path: "/Users/reset", group: [])
+
+        subject.cookbook name, constraint, path: "/Users/reset"
+      end
+
+      it "converts a single specified group option into an array of groups" do
+        subject.should_receive(:add_source).with(name, constraint, group: [:production])
+
+        subject.cookbook name, constraint, group: :production
+      end
+
+      context "when no constraint specified" do
+        it "sends the add_source message with a nil value for constraint" do
+          subject.should_receive(:add_source).with(name, nil, default_options)
+
+          subject.cookbook name, default_options
+        end
+      end
+
+      context "when no options specified" do
+        it "sends the add_source message with an empty Hash for the value of options" do
+          subject.should_receive(:add_source).with(name, constraint, default_options)
+
+          subject.cookbook name, constraint
+        end
+      end
+    end
+
+    describe '#group' do
+      let(:name) { "artifact" }
+      let(:group) { "production" }
+
+      it "sends the add_source message with an array of groups determined by the parameter passed to the group block" do
+        subject.should_receive(:add_source).with(name, nil, group: [group])
+        
+        subject.group group do
+          subject.cookbook name
+        end
+      end
+    end
+
+    describe "#metadata" do
+      let(:cb_path) { fixtures_path.join('cookbooks/example_cookbook') }
+      subject { Berksfile.new(cb_path.join("Berksfile")) }
+
+      before(:each) { Dir.chdir(cb_path) }
+
+      it "sends the add_source message with an explicit version constraint and the path to the cookbook" do
+        subject.should_receive(:add_source).with("example_cookbook", "= 0.5.0", path: cb_path.to_s)
+        
+        subject.metadata
+      end
+    end
+
+    describe "#site" do
+      let(:uri) { "http://opscode/v1" }
+
+      it "sends the add_location to the instance of the implementing class with a SiteLocation" do
+        subject.should_receive(:add_location).with(:site, uri)
+
+        subject.site(uri)
+      end
+
+      context "given the symbol :opscode" do
+        it "sends an add_location message with the default Opscode Community API as the first parameter" do
+          subject.should_receive(:add_location).with(:site, :opscode)
+
+          subject.site(:opscode)
+        end
+      end
+    end
+
+    describe "#chef_api" do
+      let(:uri) { "http://chef:8080/" }
+
+      it "sends and add_location message with the type :chef_api and the given URI" do
+        subject.should_receive(:add_location).with(:chef_api, uri, {})
+
+        subject.chef_api(uri)
+      end
+
+      it "also sends any options passed" do
+        options = { node_name: "reset", client_key: "/Users/reset/.chef/reset.pem" }
+        subject.should_receive(:add_location).with(:chef_api, uri, options)
+
+        subject.chef_api(uri, options)
+      end
+
+      context "given the symbol :knife" do
+        it "sends an add_location message with the the type :chef_api and the URI :knife" do
+          subject.should_receive(:add_location).with(:chef_api, :knife, {})
+
+          subject.chef_api(:knife)
+        end
+      end
     end
 
     describe "#sources" do
       it "returns all CookbookSources added to the instance of Berksfile" do
-        result = subject.sources
+        subject.add_source(source_one.name)
+        subject.add_source(source_two.name)
 
-        result.should have(2).items
-        result.should include(source_one)
-        result.should include(source_two)
+        subject.sources.should have(2).items
+        subject.should have_source(source_one.name)
+        subject.should have_source(source_two.name)
       end
 
       context "given the option :exclude" do
@@ -89,6 +194,7 @@ EOF
 
     describe "#groups" do
       before(:each) do
+        subject.stub(:sources) { [source_one, source_two] }
         source_one.stub(:groups) { [:nautilus, :skarner] }
         source_two.stub(:groups) { [:nautilus, :riven] }
       end
@@ -101,9 +207,8 @@ EOF
       end
 
       it "returns an Array of CookbookSources who are members of the group for value" do
-        subject.groups[:nautilus].should include(source_one)
-        subject.groups[:nautilus].should include(source_two)
-        subject.groups[:riven].should_not include(source_one)
+        subject.groups[:nautilus].should have(2).items
+        subject.groups[:riven].should have(1).item
       end
     end
 
@@ -205,5 +310,45 @@ EOF
         subject.load(content).should be_a(Berksfile)
       end
     end
+
+    describe "#add_source" do
+      let(:name) { "cookbook_one" }
+      let(:constraint) { "= 1.2.0" }
+      let(:location) { { site: "http://site" } }
+
+      before(:each) do
+        subject.add_source(name, constraint, location)
+      end
+
+      it "adds new cookbook source to the list of sources" do
+        subject.sources.should have(1).source
+      end
+
+      it "adds a cookbook source with a 'name' of the given name" do
+        subject.sources.first.name.should eql(name)
+      end
+
+      it "adds a cookbook source with a 'version_constraint' of the given constraint" do
+        subject.sources.first.version_constraint.to_s.should eql(constraint)
+      end
+
+      it "raises DuplicateSourceDefined if multiple sources of the same name are found" do
+        lambda {
+          subject.add_source(name)
+        }.should raise_error(DuplicateSourceDefined)
+      end
+    end
+
+    describe "#add_location" do
+      let(:type) { :site }
+      let(:value) { double('value') }
+      let(:options) { double('options') }
+
+      it "delegates 'add_location' to the downloader" do
+        subject.downloader.should_receive(:add_location).with(type, value, options)
+        
+        subject.add_location(type, value, options)
+      end
+    end
   end
 end

data/spec/unit/berkshelf/cached_cookbook_spec.rb

@@ -460,5 +460,24 @@ module Berkshelf
         parse_json(@json)['json_class'].should eql("Chef::CookbookVersion")
       end
     end
+
+    describe "#dependencies" do
+      let(:dependencies) { { "mysql" => "= 1.2.0", "ntp" => ">= 0.0.0" } }
+      let(:recommendations) { { "database" => ">= 0.0.0" } }
+
+      let(:cb_path) do
+        generate_cookbook(Berkshelf.cookbook_store.to_s, "sparkle", "0.1.0", dependencies: dependencies, recommendations: recommendations)
+      end
+
+      subject { CachedCookbook.from_store_path(cb_path) }
+
+      it "contains depends from the cookbook metadata" do
+        subject.dependencies.should include(dependencies)
+      end
+
+      it "contains recommendations from the cookbook metadata" do
+        subject.dependencies.should include(recommendations)
+      end
+    end
   end
 end

data/spec/unit/berkshelf/cookbook_generator_spec.rb

@@ -50,6 +50,7 @@ module Berkshelf
             contains "description      \"Installs/Configures sparkle_motion\""
           end
           file "Berksfile" do
+            contains "site :opscode"
             contains "metadata"
           end
           file "Gemfile"

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -11,8 +11,8 @@ module Berkshelf
         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 "sets a nil value for location" do
+            source.location.should be_nil
           end
         end
 
@@ -25,7 +25,7 @@ module Berkshelf
         end
 
         context "given a value for constraint" do
-          let(:source) { subject.new(cookbook_name, "~> 1.0.84") }
+          let(:source) { subject.new(cookbook_name, constraint: "~> 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")
@@ -37,7 +37,7 @@ module Berkshelf
           let(:source) { subject.new(cookbook_name, git: url) }
 
           it "initializes a GitLocation for location" do
-            source.location.should be_a(subject::GitLocation)
+            source.location.should be_a(GitLocation)
           end
 
           it "points to the given Git URL" do
@@ -50,7 +50,7 @@ module Berkshelf
             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)
+              subject.new(cookbook_name, path: path).location.should be_a(PathLocation)
             end
 
             it "points to the specified path" do
@@ -141,7 +141,7 @@ module Berkshelf
           let(:source) { subject.new(cookbook_name, site: url) }
 
           it "initializes a SiteLocation for location" do
-            source.location.should be_a(subject::SiteLocation)
+            source.location.should be_a(SiteLocation)
           end
 
           it "points to the specified URI" do
@@ -211,43 +211,33 @@ module Berkshelf
       end
     end
 
-    describe "#download" do
-      context "when download is successful" do
-        it "sets a CachedCookbook to the cached_cookbook attr" do
-          subject.download(tmp_path)
-
-          subject.cached_cookbook.should be_a(Berkshelf::CachedCookbook)
-        end
-
-        it "returns an array containing the symbol :ok and the local_path" do
-          result = subject.download(tmp_path)
+    describe "#downloaded?" do
+      it "returns true if self.cached_cookbook is not nil" do
+        subject.stub(:cached_cookbook) { double('cb') }
 
-          result.should be_a(Array)
-          result[0].should eql(:ok)
-          result[1].should eql(subject.cached_cookbook)
-        end
+        subject.downloaded?.should be_true
       end
 
-      context "when the download fails" do
-        let(:bad_cb_name) { "NOWAYTHISEXISTS" }
-        subject { CookbookSource.new(bad_cb_name) }
-
-        it "returns an array containing the symbol :error and the error message" do
-          result = subject.download(tmp_path)
+      it "returns false if self.cached_cookbook is nil" do
+        subject.stub(:cached_cookbook) { nil }
 
-          result.should be_a(Array)
-          result[0].should eql(:error)
-          result[1].should eql("Cookbook '#{bad_cb_name}' not found at site: 'http://cookbooks.opscode.com/api/v1/cookbooks'")
-        end
+        subject.downloaded?.should be_false
       end
     end
 
-    describe "#downloaded?" do
-      subject{ CookbookSource.new("nginx", ">= 1.0.1") }
+    describe "#to_s" do
+      it "contains the name, constraint, and groups" do
+        source = CookbookSource.new("artifact", constraint: "= 0.10.0")
+        
+        source.to_s.should eql("artifact (= 0.10.0) groups: [:default]")
+      end
 
-      it "delegates the message ':downloaded?' to the location" do
-        subject.location.should_receive(:downloaded?)
-        subject.downloaded?
+      context "given a CookbookSource with an explicit location" do
+        it "contains the name, constraint, groups, and location" do
+          source = CookbookSource.new("artifact", constraint: "= 0.10.0", site: "http://cookbooks.opscode.com/api/v1/cookbooks")
+
+          source.to_s.should eql("artifact (= 0.10.0) groups: [:default] location: site: 'http://cookbooks.opscode.com/api/v1/cookbooks'")
+        end
       end
     end
   end