berkshelf 2.0.3 → 2.0.4

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -233,7 +233,8 @@ describe Berkshelf::CookbookSource do
       it 'returns a PathLocation with a path relative to the Berksfile.filepath' do
         _, location = subject.cached_and_location(options)
 
-        expect(location.path).to eq('/rspec/cookbooks/whatever')
+        expect(location.path).to eq('cookbooks/whatever')
+        expect(location.relative_path(berksfile)).to eq('../cookbooks/whatever')
       end
     end
   end
@@ -275,8 +276,8 @@ describe Berkshelf::CookbookSource do
 
     it 'does not include the site if it is the default' do
       location = double('site', api_uri: Berkshelf::CommunityREST::V1_API)
+      location.stub(:kind_of?).and_return(false)
       location.stub(:kind_of?).with(Berkshelf::SiteLocation).and_return(true)
-      location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(false)
       subject.stub(:location).and_return(location)
 
       expect(hash).to_not have_key(:site)
@@ -284,8 +285,8 @@ describe Berkshelf::CookbookSource do
 
     it 'includes the site' do
       location = double('site', api_uri: 'www.example.com')
+      location.stub(:kind_of?).and_return(false)
       location.stub(:kind_of?).with(Berkshelf::SiteLocation).and_return(true)
-      location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(false)
       subject.stub(:location).and_return(location)
 
       expect(hash).to have_key(:site)
@@ -294,7 +295,7 @@ describe Berkshelf::CookbookSource do
 
     it 'includes the git url and ref' do
       location = double('git', uri: 'git://github.com/foo/bar.git', ref: 'abcd1234', rel: nil)
-      location.stub(:kind_of?).with(Berkshelf::SiteLocation).and_return(false)
+      location.stub(:kind_of?).and_return(false)
       location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(true)
       subject.stub(:location).and_return(location)
 
@@ -306,7 +307,7 @@ describe Berkshelf::CookbookSource do
 
     it 'includes the git url and rel' do
       location = double('git', uri: 'git://github.com/foo/bar.git', ref: nil, rel: 'cookbooks/foo')
-      location.stub(:kind_of?).with(Berkshelf::SiteLocation).and_return(false)
+      location.stub(:kind_of?).and_return(false)
       location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(true)
       subject.stub(:location).and_return(location)
 
@@ -317,10 +318,13 @@ describe Berkshelf::CookbookSource do
     end
 
     it 'includes a relative path' do
-      subject.instance_variable_set(:@options, { path: '~/Development/foo' })
+      location = double('path', relative_path: '../dev/foo')
+      location.stub(:kind_of?).and_return(false)
+      location.stub(:kind_of?).with(Berkshelf::PathLocation).and_return(true)
+      subject.stub(:location).and_return(location)
 
       expect(hash).to have_key(:path)
-      expect(hash[:path]).to eq('~/Development/foo')
+      expect(hash[:path]).to eq('../dev/foo')
     end
   end
 

data/spec/unit/berkshelf/downloader_spec.rb

@@ -41,7 +41,7 @@ describe Berkshelf::Downloader do
   subject { Berkshelf::Downloader.new(cookbook_store) }
 
   describe '#download' do
-    let(:source) { double('source', name: 'artifact', version_constraint: '= 0.10.0') }
+    let(:source) { double('source', name: 'artifact', version_constraint: '= 0.10.0', locked_version: '0.10.0') }
     let(:location) { double('location') }
     let(:cached_cookbook) { double('cached') }
 

data/spec/unit/berkshelf/location_spec.rb

@@ -140,12 +140,6 @@ describe Berkshelf::Location do
     Class.new { include Berkshelf::Location }.new(name, constraint)
   end
 
-  describe 'downloaded?' do
-    it 'starts as false' do
-      expect(subject.downloaded?).to be_false
-    end
-  end
-
   describe '#download' do
     it 'raises a AbstractFunction if not defined' do
       expect {

data/spec/unit/berkshelf/locations/chef_api_location_spec.rb

@@ -31,10 +31,6 @@ describe Berkshelf::ChefAPILocation, :chef_server do
       expect(subject.client_key).to eq(client_key)
     end
 
-    it 'sets the downloaded status to false' do
-      expect(subject).to_not be_downloaded
-    end
-
     context 'when an invalid Chef API URI is given' do
       it 'raises Berkshelf::InvalidChefAPILocation' do
         expect {

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

@@ -52,11 +52,6 @@ describe Berkshelf::GitLocation do
       }
     end
 
-    it 'sets the downloaded status to true' do
-      subject.download(tmp_path)
-      expect(subject).to be_downloaded
-    end
-
     context 'given no ref/branch/tag options is given' do
       subject { Berkshelf::GitLocation.new('berkshelf-cookbook-fixture', complacent_constraint, git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git') }
 

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

@@ -15,47 +15,6 @@ describe Berkshelf::PathLocation do
 
   subject { Berkshelf::PathLocation.new('nginx', complacent_constraint, path: path) }
 
-  describe '#download' do
-    it 'returns an instance of CachedCookbook' do
-      expect(subject.download(tmp_path)).to be_a(Berkshelf::CachedCookbook)
-    end
-
-    it 'sets the downloaded status to true' do
-      subject.download(tmp_path)
-      expect(subject).to be_downloaded
-    end
-
-    context 'given a path that does not exist' do
-      subject { Berkshelf::PathLocation.new('doesnot_exist', complacent_constraint, path: tmp_path.join('doesntexist_noway')) }
-
-      it 'raises a CookbookNotFound error' do
-        expect {
-          subject.download(tmp_path)
-        }.to raise_error(Berkshelf::CookbookNotFound)
-      end
-    end
-
-    context 'given a path that does not contain a cookbook' do
-      subject { Berkshelf::PathLocation.new('doesnot_exist', complacent_constraint, path: fixtures_path) }
-
-      it 'raises a CookbookNotFound error' do
-        expect {
-          subject.download(tmp_path)
-        }.to raise_error(Berkshelf::CookbookNotFound)
-      end
-    end
-
-    context 'given the content at path does not satisfy the version constraint' do
-      subject { Berkshelf::PathLocation.new('nginx', double('constraint', satisfies?: false), path: path) }
-
-      it 'raises a CookbookValidationFailure error' do
-        expect {
-          subject.download(double('path'))
-        }.to raise_error(Berkshelf::CookbookValidationFailure)
-      end
-    end
-  end
-
   describe '#to_s' do
     context 'for a remote path' do
       subject { Berkshelf::PathLocation.new('nginx', complacent_constraint, path: path) }

data/spec/unit/berkshelf_spec.rb

@@ -1,31 +1,6 @@
 require 'spec_helper'
 
 describe Berkshelf do
-  describe '.find_metadata' do
-    let(:metadata_path) { fixtures_path.join('cookbooks', 'example_cookbook', 'metadata.rb') }
-
-    context 'given a path containing a metadata.rb file' do
-      it 'returns the path to the metadata.rb file' do
-        metadata = Berkshelf.find_metadata(fixtures_path.join('cookbooks', 'example_cookbook'))
-        expect(metadata).to eq(metadata_path)
-      end
-    end
-
-    context 'given a path where a parent path contains a metadata.rb file' do
-      it 'returns the path to the metadata.rb file' do
-        metadata = Berkshelf.find_metadata(fixtures_path.join('cookbooks', 'example_cookbook', 'recipes'))
-        expect(metadata).to eq(metadata_path)
-      end
-    end
-
-    context 'given a path that does not contain a metadata.rb file or a parent path that does' do
-      it 'returns nil' do
-        metadata = Berkshelf.find_metadata(tmp_path)
-        expect(metadata).to be_nil
-      end
-    end
-  end
-
   describe '.formatter' do
     context 'with default formatter' do
       before { Berkshelf.instance_variable_set(:@formatter, nil) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -47,6 +47,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.4
+- !ruby/object:Gem::Dependency
+  name: buff-shell_out
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +166,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -158,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +182,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,31 +190,31 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: test-kitchen
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha7
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha7
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rbzip2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -206,7 +222,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +262,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -254,7 +270,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -523,6 +539,7 @@ files:
 - berkshelf.gemspec
 - bin/berks
 - features/apply_command.feature
+- features/berksfile.feature
 - features/config.feature
 - features/configure_command.feature
 - features/contingent_command.feature
@@ -590,6 +607,7 @@ files:
 - lib/berkshelf/core_ext/file.rb
 - lib/berkshelf/core_ext/file_utils.rb
 - lib/berkshelf/core_ext/pathname.rb
+- lib/berkshelf/core_ext/rbzip2.rb
 - lib/berkshelf/core_ext/string.rb
 - lib/berkshelf/downloader.rb
 - lib/berkshelf/errors.rb
@@ -641,6 +659,7 @@ files:
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
 - spec/fixtures/cookbooks/example_cookbook/.gitignore
 - spec/fixtures/cookbooks/example_cookbook/.kitchen.yml
+- spec/fixtures/cookbooks/example_cookbook/Berksfile
 - spec/fixtures/cookbooks/example_cookbook/Berksfile.lock
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
@@ -726,6 +745,7 @@ specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
 - features/apply_command.feature
+- features/berksfile.feature
 - features/config.feature
 - features/configure_command.feature
 - features/contingent_command.feature
@@ -779,6 +799,7 @@ test_files:
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/recipes/default.rb
 - spec/fixtures/cookbooks/example_cookbook/.gitignore
 - spec/fixtures/cookbooks/example_cookbook/.kitchen.yml
+- spec/fixtures/cookbooks/example_cookbook/Berksfile
 - spec/fixtures/cookbooks/example_cookbook/Berksfile.lock
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb