berkshelf 1.2.0.rc1 → 1.2.1

data/lib/berkshelf/cookbook_source.rb

@@ -105,7 +105,11 @@ module Berkshelf
       end
 
       if @location.is_a?(PathLocation)
-        @cached_cookbook = CachedCookbook.from_path(location.path)
+        begin
+          @cached_cookbook = CachedCookbook.from_path(location.path)
+        rescue IOError
+          raise Berkshelf::CookbookNotFound
+        end
       end
 
       @locked_version = Solve::Version.new(options[:locked_version]) if options[:locked_version]

data/lib/berkshelf/errors.rb

@@ -37,6 +37,30 @@ module Berkshelf
     end
   end
   class PrivateGitRepo < GitError; end
+  class AmbiguousGitRef < GitError
+    attr_reader :ref
+
+    def initialize(ref)
+      @ref = ref
+    end
+
+    def to_s
+      out = "An error occurred during Git execution:\n"
+      out << "Ambiguous Git ref: #{ref}"
+    end
+  end
+  class InvalidGitRef < GitError
+    attr_reader :ref
+
+    def initialize(ref)
+      @ref = ref
+    end
+
+    def to_s
+      out = "An error occurred during Git execution:\n"
+      out << "Invalid Git ref: #{ref}"
+    end
+  end
 
   class DuplicateSourceDefined < BerkshelfError; status_code(105); end
   class NoSolution < BerkshelfError; status_code(106); end

data/lib/berkshelf/git.rb

@@ -54,7 +54,7 @@ module Berkshelf
       #   reference to checkout
       def checkout(repo_path, ref)
         Dir.chdir repo_path do
-          git("checkout", "-q", ref)
+          git("checkout", "-qf", revision_from_ref(repo_path, ref))
         end
       end
 
@@ -65,6 +65,54 @@ module Berkshelf
         end
       end
 
+      # Return the sha revision for the given reference in the given repository
+      #
+      # @param [String] repo_path
+      #   path to a Git repo on disk
+      # @param [String] ref
+      #   reference to show
+      #
+      # @return [String]
+      #   the sha revision for the given ref
+      #
+      # @raise [AmbiguousGitRef] if the ref could refer to more than one revision
+      def show_ref(repo_path, ref)
+        Dir.chdir repo_path do
+          lines = git('show-ref', "'#{ref}'").lines.to_a
+
+          raise AmbiguousGitRef, ref if lines.size > 1
+
+          lines.first.chomp.split(/\s/).first
+        end
+      end
+
+      # Return the sha revision for the given reference or revision in the given repository
+      #
+      # This method is useful when you have either a sha revision, tag, or branch and
+      # you'd like to end up with a sha revision.
+      #
+      # @param [String] repo_path
+      #   path to a Git repo on disk
+      # @param [String] ref
+      #   reference to show
+      #
+      # @return [String]
+      #   the sha revision for the given ref
+      #
+      # @raise [InvalidGitRef] if the ref could not be found
+      def revision_from_ref(repo_path, ref)
+        begin
+          show_ref(repo_path, ref)
+        rescue GitError
+          begin
+            git('rev-parse', ref)
+            ref
+          rescue GitError
+            raise InvalidGitRef, ref
+          end
+        end
+      end
+
       # Return an absolute path to the Git executable on your system
       #
       # @return [String]

data/lib/berkshelf/init_generator.rb

@@ -91,7 +91,7 @@ module Berkshelf
       #   name of the cookbook
       def cookbook_name
         @cookbook_name ||= begin
-          metadata = Berkshelf::Chef::Cookbook::Metadata.from_file(target.join("metadata.rb").to_s)
+          metadata = Ridley::Chef::Cookbook::Metadata.from_file(target.join("metadata.rb").to_s)
           metadata.name.empty? ? File.basename(target) : metadata.name
         rescue CookbookNotFound, IOError
           File.basename(target)

data/lib/berkshelf/locations/chef_api_location.rb

@@ -2,8 +2,9 @@ module Berkshelf
   # @author Jamie Winsor <reset@riotgames.com>
   class ChefAPILocation
     class << self
-      def finalize
-        conn.terminate if conn.alive?
+      # @return [Proc]
+      def finalizer
+        proc { conn.terminate if conn.alive? }
       end
 
       # @param [String] node_name
@@ -130,7 +131,9 @@ module Berkshelf
         }
       )
 
-      ObjectSpace.define_finalizer(self, self.class.method(:finalize).to_proc)
+      # Why do we use a class function for defining our finalizer?
+      # http://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/
+      ObjectSpace.define_finalizer(self, self.class.finalizer)
     end
 
     # @param [#to_s] destination

data/lib/berkshelf/locations/path_location.rb

@@ -48,6 +48,8 @@ module Berkshelf
 
       set_downloaded_status(true)
       cached
+    rescue IOError
+      raise Berkshelf::CookbookNotFound
     end
 
     def to_hash

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.2.0.rc1"
+  VERSION = "1.2.1"
 end

data/spec/spec_helper.rb

@@ -102,14 +102,21 @@ Spork.prefork do
           run "git commit -am '#{tag} content'"
           run "git tag '#{tag}' 2> /dev/null"
         end if options.has_key? :tags
+        options[:branches].each do |branch|
+          run! "git checkout -b #{branch} master 2> /dev/null"
+          run! "echo '#{branch}' > content_file"
+          run! "git add content_file"
+          run "git commit -am '#{branch} content'"
+          run "git checkout master 2> /dev/null"
+        end if options.has_key? :branches
       end
     end
     path
   end
 
-  def git_sha_for_tag(repo, tag)
+  def git_sha_for_ref(repo, ref)
     Dir.chdir local_git_origin_path_for(repo) do
-      run!("git show-ref '#{tag}'").chomp.split(/\s/).first
+      run!("git show-ref '#{ref}'").chomp.split(/\s/).first
     end
   end
 

data/spec/support/chef_api.rb

@@ -10,7 +10,7 @@ module Berkshelf
 
       def upload_cookbook(path)
         cached = CachedCookbook.from_store_path(path)
-        uploader.upload(cached)
+        ridley.cookbook.upload(cached.path, name: cached.cookbook_name)
       end
 
       # Remove the version of the given cookbook from the Chef Server defined
@@ -101,15 +101,6 @@ EOF
             ssl: { verify: false }
           )
         end
-
-        def uploader
-          @uploader ||= Berkshelf::Uploader.new(
-            server_url: Berkshelf::Chef::Config[:chef_server_url],
-            client_name: Berkshelf::Chef::Config[:node_name],
-            client_key: Berkshelf::Chef::Config[:client_key],
-            ssl: { verify: false }
-          )
-        end
     end
   end
 end

data/spec/unit/berkshelf/cached_cookbook_spec.rb

@@ -1,491 +1,70 @@
 require 'spec_helper'
 
-module Berkshelf
-  describe CachedCookbook do
-    describe "ClassMethods" do
-      subject { CachedCookbook }
-
-      describe "#from_path" do
-        context "given a path that contains a cookbook with a metadata file that contains a name attribute" do
-          let(:cookbook_path) { fixtures_path.join("cookbooks", "example_metadata_name") }
-
-          it "returns an instance of CachedCookbook" do
-            subject.from_path(cookbook_path).should be_a(CachedCookbook)
-          end
-
-          it "has a cookbook_name attribute set to what is found in the metadata" do
-            subject.from_path(cookbook_path).cookbook_name.should eql("has_metadata")
-          end
-        end
-
-        context "given a path that contains a cookbook with a metadata file that does not contain a name attribute" do
-          let(:cookbook_path) { fixtures_path.join("cookbooks", "example_metadata_no_name") }
-
-          it "returns an instnace of CachedCookbook" do
-            subject.from_path(cookbook_path).should be_a(CachedCookbook)
-          end
-
-          it "has a cookbook_name attribute set to the basename of the folder" do
-            subject.from_path(cookbook_path).cookbook_name.should eql("example_metadata_no_name")
-          end
-
-          it "sets value of metadata.name to the cookbook_name" do
-            subject.from_path(cookbook_path).metadata.name.should eql("example_metadata_no_name")
-          end
-        end
-
-        context "given a path that does not contain a metadata file" do
-          let(:cookbook_path) { fixtures_path.join("cookbooks", "example_no_metadata") }
-
-          it "raises a CookbookNotFound error" do
-            lambda {
-              subject.from_path(cookbook_path)
-            }.should raise_error(Berkshelf::CookbookNotFound)
-          end
-        end
-      end
-
-      describe "#from_store_path" do
-        before(:each) do
-          @cached_cb = subject.from_store_path(fixtures_path.join("cookbooks", "example_cookbook-0.5.0"))
-        end
-
-        it "returns an instance of CachedCookbook" do
-          @cached_cb.should be_a(CachedCookbook)
-        end
-
-        it "sets a version number" do
-          @cached_cb.version.should eql("0.5.0")
-        end
-
-        it "sets the metadata.name value to the cookbook_name" do
-          @cached_cb.metadata.name.should eql("example_cookbook")
-        end
-
-        context "given a path that does not contain a cookbook" do
-          it "returns nil" do
-            subject.from_store_path(tmp_path).should be_nil
-          end
-        end
-
-        context "given a path that does not match the CachedCookbook dirname format" do
-          it "returns nil" do
-            subject.from_store_path(fixtures_path.join("cookbooks", "example_cookbook")).should be_nil
-          end
-        end
-      end
-
-      describe "#checksum" do
-        it "returns a checksum of the given filepath" do
-          subject.checksum(fixtures_path.join("cookbooks", "example_cookbook-0.5.0", "README.md")).should eql("6e21094b7a920e374e7261f50e9c4eef")
-        end
-
-        context "given path does not exist" do
-          it "raises an Errno::ENOENT error" do
-            lambda {
-              subject.checksum(fixtures_path.join("notexisting.file"))
-            }.should raise_error(Errno::ENOENT)
-          end
-        end
-      end
-    end
-
-    let(:cb_path) { fixtures_path.join("cookbooks", "nginx-0.100.5") }
-    subject { CachedCookbook.from_store_path(cb_path) }
-
-    describe "#checksums" do
-      it "returns a Hash containing an entry for all matching cookbook files on disk" do
-        subject.checksums.should have(11).items
-      end
-
-      it "has a checksum for each key" do
-        subject.checksums.should have_key("fb1f925dcd5fc4ebf682c4442a21c619")
-      end
-
-      it "has a filepath for each value" do
-        subject.checksums.should have_value(cb_path.join("recipes/default.rb").to_s)
-      end
-    end
-
-    describe "#manifest" do
-      it "returns a Mash with a key for each cookbook file category" do
-        [
-          :recipes,
-          :definitions,
-          :libraries,
-          :attributes,
-          :files,
-          :templates,
-          :resources,
-          :providers,
-          :root_files
-        ].each do |category|
-          subject.manifest.should have_key(category)
-        end
-      end
-    end
-
-    describe "#validate!" do
-      let(:syntax_checker) { double('syntax_checker') }
+describe Berkshelf::CachedCookbook do
+  describe "ClassMethods" do
+    subject { described_class }
 
+    describe "#from_store_path" do
       before(:each) do
-        subject.stub(:syntax_checker) { syntax_checker }
+        @cached_cb = subject.from_store_path(fixtures_path.join("cookbooks", "example_cookbook-0.5.0"))
       end
 
-      it "asks the syntax_checker to validate the ruby and template files of the cookbook" do
-        syntax_checker.should_receive(:validate_ruby_files).and_return(true)
-        syntax_checker.should_receive(:validate_templates).and_return(true)
-
-        subject.validate!
+      it "returns an instance of CachedCookbook" do
+        @cached_cb.should be_a(described_class)
       end
 
-      it "raises CookbookSyntaxError if the cookbook contains invalid ruby files" do
-        syntax_checker.should_receive(:validate_ruby_files).and_return(false)
-
-        lambda {
-          subject.validate!
-        }.should raise_error(CookbookSyntaxError)
-      end
-
-      it "raises CookbookSyntaxError if the cookbook contains invalid template files" do
-        syntax_checker.should_receive(:validate_ruby_files).and_return(true)
-        syntax_checker.should_receive(:validate_templates).and_return(false)
-
-        lambda {
-          subject.validate!
-        }.should raise_error(CookbookSyntaxError)
-      end
-    end
-
-    describe "#file_metadata" do
-      let(:file) { subject.path.join("files", "default", "mime.types") }
-
-      before(:each) { @metadata = subject.file_metadata(:file, file) }
-
-      it "has a 'path' key whose value is a relative path from the CachedCookbook's path" do
-        @metadata.should have_key(:path)
-        @metadata[:path].should be_relative_path
-        @metadata[:path].should eql("files/default/mime.types")
+      it "sets a version number" do
+        @cached_cb.version.should eql("0.5.0")
       end
 
-      it "has a 'name' key whose value is the basename of the target file" do
-        @metadata.should have_key(:name)
-        @metadata[:name].should eql("mime.types")
+      it "sets the metadata.name value to the cookbook_name" do
+        @cached_cb.metadata.name.should eql("example_cookbook")
       end
 
-      it "has a 'checksum' key whose value is the checksum of the target file" do
-        @metadata.should have_key(:checksum)
-        @metadata[:checksum].should eql("06e7eca1d6cb608e2e74fd1f8e059f34")
-      end
-
-      it "has a 'specificity' key" do
-        @metadata.should have_key(:specificity)
-      end
-
-      context "given a 'template' or 'file' berksfile type" do
-        let(:file) { subject.path.join("files", "ubuntu", "mime.types") }
-        before(:each) { @metadata = subject.file_metadata(:files, file) }
-
-        it "has a 'specificity' key whose value represents the specificity found in filepath" do
-          @metadata[:specificity].should eql("ubuntu")
+      context "given a path that does not contain a cookbook" do
+        it "returns nil" do
+          subject.from_store_path(tmp_path).should be_nil
         end
       end
 
-      context "given any berksfile type that is not a 'template' or 'file'" do
-        let(:file) { subject.path.join("README.md") }
-        before(:each) { @metadata = subject.file_metadata(:root, file) }
-
-        it "has a 'specificity' key whose value is 'default'" do
-          @metadata[:specificity].should eql("default")
+      context "given a path that does not match the CachedCookbook dirname format" do
+        it "returns nil" do
+          subject.from_store_path(fixtures_path.join("cookbooks", "example_cookbook")).should be_nil
         end
       end
     end
 
-    describe "#to_hash" do
-      before(:each) do
-        @hash = subject.to_hash
-      end
-
-      let(:cookbook_name) { subject.cookbook_name }
-      let(:cookbook_version) { subject.version }
-
-      it "has a 'recipes' key with a value of an Array Hashes" do
-        @hash.should have_key('recipes')
-        @hash['recipes'].should be_a(Array)
-        @hash['recipes'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'recipes' Array of Hashes" do
-        @hash['recipes'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'recipes' Array of Hashes" do
-        @hash['recipes'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'recipes' Array of Hashes" do
-        @hash['recipes'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'recipes' Array of Hashes" do
-        @hash['recipes'].first.should have_key('specificity')
-      end
-
-      it "has a 'definitions' key with a value of an Array Hashes" do
-        @hash.should have_key('definitions')
-        @hash['definitions'].should be_a(Array)
-        @hash['definitions'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'definitions' Array of Hashes" do
-        @hash['definitions'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'definitions' Array of Hashes" do
-        @hash['definitions'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'definitions' Array of Hashes" do
-        @hash['definitions'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'definitions' Array of Hashes" do
-        @hash['definitions'].first.should have_key('specificity')
-      end
-
-      it "has a 'libraries' key with a value of an Array Hashes" do
-        @hash.should have_key('libraries')
-        @hash['libraries'].should be_a(Array)
-        @hash['libraries'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'libraries' Array of Hashes" do
-        @hash['libraries'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'libraries' Array of Hashes" do
-        @hash['libraries'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'libraries' Array of Hashes" do
-        @hash['libraries'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'libraries' Array of Hashes" do
-        @hash['libraries'].first.should have_key('specificity')
-      end
-
-      it "has a 'attributes' key with a value of an Array Hashes" do
-        @hash.should have_key('attributes')
-        @hash['attributes'].should be_a(Array)
-        @hash['attributes'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'attributes' Array of Hashes" do
-        @hash['attributes'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'attributes' Array of Hashes" do
-        @hash['attributes'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'attributes' Array of Hashes" do
-        @hash['attributes'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'attributes' Array of Hashes" do
-        @hash['attributes'].first.should have_key('specificity')
-      end
-
-      it "has a 'files' key with a value of an Array Hashes" do
-        @hash.should have_key('files')
-        @hash['files'].should be_a(Array)
-        @hash['files'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'files' Array of Hashes" do
-        @hash['files'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'files' Array of Hashes" do
-        @hash['files'].first.should have_key('path')
+    describe "#checksum" do
+      it "returns a checksum of the given filepath" do
+        subject.checksum(fixtures_path.join("cookbooks", "example_cookbook-0.5.0", "README.md")).should eql("6e21094b7a920e374e7261f50e9c4eef")
       end
 
-      it "has a 'checksum' key value pair in a Hash of the 'files' Array of Hashes" do
-        @hash['files'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'files' Array of Hashes" do
-        @hash['files'].first.should have_key('specificity')
-      end
-
-      it "has a 'templates' key with a value of an Array Hashes" do
-        @hash.should have_key('templates')
-        @hash['templates'].should be_a(Array)
-        @hash['templates'].each do |item|
-          item.should be_a(Hash)
+      context "given path does not exist" do
+        it "raises an Errno::ENOENT error" do
+          lambda {
+            subject.checksum(fixtures_path.join("notexisting.file"))
+          }.should raise_error(Errno::ENOENT)
         end
       end
-
-      it "has a 'name' key value pair in a Hash of the 'templates' Array of Hashes" do
-        @hash['templates'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'templates' Array of Hashes" do
-        @hash['templates'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'templates' Array of Hashes" do
-        @hash['templates'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'templates' Array of Hashes" do
-        @hash['templates'].first.should have_key('specificity')
-      end
-
-      it "has a 'resources' key with a value of an Array Hashes" do
-        @hash.should have_key('resources')
-        @hash['resources'].should be_a(Array)
-        @hash['resources'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'resources' Array of Hashes" do
-        @hash['resources'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'resources' Array of Hashes" do
-        @hash['resources'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'resources' Array of Hashes" do
-        @hash['resources'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'resources' Array of Hashes" do
-        @hash['resources'].first.should have_key('specificity')
-      end
-
-      it "has a 'providers' key with a value of an Array Hashes" do
-        @hash.should have_key('providers')
-        @hash['providers'].should be_a(Array)
-        @hash['providers'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'providers' Array of Hashes" do
-        @hash['providers'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'providers' Array of Hashes" do
-        @hash['providers'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'providers' Array of Hashes" do
-        @hash['providers'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'providers' Array of Hashes" do
-        @hash['providers'].first.should have_key('specificity')
-      end
-
-      it "has a 'root_files' key with a value of an Array Hashes" do
-        @hash.should have_key('root_files')
-        @hash['root_files'].should be_a(Array)
-        @hash['root_files'].each do |item|
-          item.should be_a(Hash)
-        end
-      end
-
-      it "has a 'name' key value pair in a Hash of the 'root_files' Array of Hashes" do
-        @hash['root_files'].first.should have_key('name')
-      end
-
-      it "has a 'path' key value pair in a Hash of the 'root_files' Array of Hashes" do
-        @hash['root_files'].first.should have_key('path')
-      end
-
-      it "has a 'checksum' key value pair in a Hash of the 'root_files' Array of Hashes" do
-        @hash['root_files'].first.should have_key('checksum')
-      end
-
-      it "has a 'specificity' key value pair in a Hash of the 'root_files' Array of Hashes" do
-        @hash['root_files'].first.should have_key('specificity')
-      end
-
-      it "has a 'cookbook_name' key with a String value" do
-        @hash.should have_key('cookbook_name')
-        @hash['cookbook_name'].should be_a(String)
-      end
-
-      it "has a 'metadata' key with a Cookbook::Metadata value" do
-        @hash.should have_key('metadata')
-        @hash['metadata'].should be_a(Berkshelf::Chef::Cookbook::Metadata)
-      end
-
-      it "has a 'version' key with a String value" do
-        @hash.should have_key('version')
-        @hash['version'].should be_a(String)
-      end
-
-      it "has a 'name' key with a String value" do
-        @hash.should have_key('name')
-        @hash['name'].should be_a(String)
-      end
-
-      it "has a value containing the cookbook name and version separated by a dash for 'name'" do
-        name, version = @hash['name'].split('-')
-
-        name.should eql(cookbook_name)
-        version.should eql(cookbook_version)
-      end
-
-      it "has a 'chef_type' key with 'cookbook_version' as the value" do
-        @hash.should have_key('chef_type')
-        @hash['chef_type'].should eql("cookbook_version")
-      end
     end
+  end
 
-    describe "#to_json" do
-      before(:each) do
-        @json = subject.to_json
-      end
+  describe "#dependencies" do
+    let(:dependencies) { { "mysql" => "= 1.2.0", "ntp" => ">= 0.0.0" } }
+    let(:recommendations) { { "database" => ">= 0.0.0" } }
 
-      it "has a 'json_class' key with 'Chef::CookbookVersion' as the value" do
-        @json.should have_json_path('json_class')
-        parse_json(@json)['json_class'].should eql("Chef::CookbookVersion")
-      end
+    let(:cb_path) do
+      generate_cookbook(Berkshelf.cookbook_store.storage_path, "sparkle", "0.1.0", dependencies: dependencies, recommendations: recommendations)
     end
 
-    describe "#dependencies" do
-      let(:dependencies) { { "mysql" => "= 1.2.0", "ntp" => ">= 0.0.0" } }
-      let(:recommendations) { { "database" => ">= 0.0.0" } }
+    subject { described_class.from_store_path(cb_path) }
 
-      let(:cb_path) do
-        generate_cookbook(Berkshelf.cookbook_store.storage_path, "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 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
+    it "contains recommendations from the cookbook metadata" do
+      subject.dependencies.should include(recommendations)
     end
   end
 end