berkshelf 3.0.0.beta7 → 3.0.0.beta8

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

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+module Berkshelf
+  describe PathLocation do
+    let(:berksfile) { double('berksfile', filepath: __FILE__) }
+    let(:constraint) { double('constraint', satisfies?: true) }
+    let(:dependency) do
+      double('dependency',
+        name: 'nginx',
+        version_constraint: constraint,
+        berksfile: berksfile,
+      )
+    end
+    let(:path) { fixtures_path.join('cookbooks', 'example_cookbook').to_s }
+    let(:relative_path) { '../../../fixtures/cookbooks/example_cookbook' }
+
+    subject { described_class.new(dependency, path: path) }
+
+    describe '#installed?' do
+      it 'returns false' do
+        expect(subject.installed?).to be_false
+      end
+    end
+
+    describe '#install' do
+      it 'validates the cached cookbook' do
+        expect(subject).to receive(:validate_cached!).with(path)
+        subject.install
+      end
+    end
+
+    describe '#cached_cookbook' do
+      it 'loads the cached cookbook at the path' do
+        expect(CachedCookbook).to receive(:from_path).with(path)
+        subject.cached_cookbook
+      end
+    end
+
+    describe '#relative_path' do
+      it 'returns the path to the Berksfile' do
+        expect(subject.relative_path).to eq(relative_path)
+      end
+    end
+
+    describe '#expanded_path' do
+      it 'returns the expanded path, relative to the Berksfile' do
+        absolute_path = File.expand_path(relative_path, File.dirname(berksfile.filepath))
+        expect(subject.expanded_path).to eq(absolute_path)
+      end
+    end
+
+    describe '#==' do
+      it 'is false when compared with a non-PathLocation' do
+        this = PathLocation.new(dependency, path: '.')
+        that = 'A string'
+        expect(this).to_not eq(that)
+      end
+
+      it 'is false when the metadata? is not the same' do
+        this = PathLocation.new(dependency, path: '.')
+        that = PathLocation.new(dependency, path: '.', metadata: true)
+        expect(this).to_not eq(that)
+      end
+
+      it 'is false when the expanded paths are different' do
+        this = PathLocation.new(dependency, path: '.')
+        that = PathLocation.new(dependency, path: '..')
+        expect(this).to_not eq(that)
+      end
+
+      it 'is true when they are the same' do
+        this = PathLocation.new(dependency, path: '.', metadata: true)
+        that = PathLocation.new(dependency, path: '.', metadata: true)
+        expect(this).to eq(that)
+      end
+    end
+
+    describe '#to_lock' do
+      it 'includes the path relative to the Berksfile' do
+        expect(subject.to_lock).to eq <<-EOH.gsub(/^ {10}/, '')
+              path: #{relative_path}
+        EOH
+      end
+
+      it 'includes the metadata attribute' do
+        subject.stub(:metadata?).and_return(true)
+        expect(subject.to_lock).to eq <<-EOH.gsub(/^ {10}/, '')
+              path: #{relative_path}
+              metadata: true
+        EOH
+      end
+    end
+
+    describe '#to_s' do
+      it 'uses the expanded path' do
+        expect(subject.to_s).to eq("source at #{relative_path}")
+      end
+    end
+
+    describe '#inspect' do
+      it 'includes the right information' do
+        subject.stub(:metadata?).and_return(true)
+        expect(subject.inspect).to eq("#<Berkshelf::PathLocation metadata: true, path: #{relative_path}>")
+      end
+    end
+  end
+end

data/spec/unit/berkshelf/lockfile_parser_spec.rb

@@ -14,7 +14,7 @@ describe Berkshelf::Lockfile do
     end
 
     it 'warns the user' do
-      expect(Berkshelf.ui).to receive(:warn)
+      expect(Berkshelf.formatter).to receive(:warn)
       subject.parse
     end
 
@@ -49,7 +49,7 @@ describe Berkshelf::Lockfile do
     let(:fixture) { fixtures_path.join('lockfiles/blank.lock') }
 
     it 'warns the user' do
-      expect(Berkshelf.ui).to receive(:warn)
+      expect(Berkshelf.formatter).to receive(:warn)
       subject.parse
     end
 
@@ -66,7 +66,7 @@ describe Berkshelf::Lockfile do
     let(:fixture) { fixtures_path.join('lockfiles/empty.lock') }
 
     it 'does not warn the user' do
-      expect(Berkshelf.ui).to_not receive(:warn)
+      expect(Berkshelf.formatter).to_not receive(:warn)
       subject.parse
     end
 

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -55,10 +55,14 @@ describe Berkshelf::Lockfile do
 
   describe '#trusted?' do
     it 'returns true when the lockfile is trusted' do
+      cookbook = double('apt-1.0.0', dependencies: {})
       apt = double('apt',
+        name: 'apt',
         version_constraint: Solve::Constraint.new('>= 0.0.0'),
         version: '1.0.0',
         location: 'api',
+        dependencies: {},
+        cached_cookbook: cookbook,
       )
       berksfile = double('berksfile', dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
@@ -68,8 +72,46 @@ describe Berkshelf::Lockfile do
       expect(subject.trusted?).to be_true
     end
 
+    it 'returns true when the lockfile is trusted with transitive dependencies' do
+      cookbook = double('apt-1.0.0', dependencies: { 'bacon' => '1.0.0' })
+      apt = double('apt',
+        name: 'apt',
+        version_constraint: Solve::Constraint.new('>= 0.0.0'),
+        version: '1.0.0',
+        location: 'api',
+        dependencies: { 'bacon' => '1.0.0' },
+        cached_cookbook: cookbook,
+      )
+      bacon = double(name: 'bacon', version: '1.0.0', dependencies: {})
+      berksfile = double('berksfile', dependencies: [apt])
+      subject.instance_variable_set(:@berksfile, berksfile)
+      subject.stub(:find).with(apt).and_return(apt)
+      subject.graph.stub(:find).with('bacon').and_return(bacon)
+      subject.graph.stub(:find).with(apt).and_return(apt)
+
+      expect(subject.trusted?).to be_true
+    end
+
+    it 'returns false when the lockfile is not trusted because of transitive dependencies' do
+      cookbook = double('apt-1.0.0', dependencies: { 'bacon' => '1.0.0', 'flip' => '2.0.0' })
+      apt = double('apt',
+        name: 'apt',
+        version_constraint: Solve::Constraint.new('>= 0.0.0'),
+        version: '1.0.0',
+        location: 'api',
+        dependencies: { 'bacon' => '1.0.0' },
+        cached_cookbook: cookbook,
+      )
+      berksfile = double('berksfile', dependencies: [apt])
+      subject.instance_variable_set(:@berksfile, berksfile)
+      subject.stub(:find).with(apt).and_return(apt)
+      subject.graph.stub(:find).with(apt).and_return(apt)
+
+      expect(subject.trusted?).to be_false
+    end
+
     it 'returns false if the dependency is not in the lockfile' do
-      apt = double('apt', version_constraint: nil)
+      apt = double('apt', name: 'apt', version_constraint: nil)
       berksfile = double('berksfile', dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
 
@@ -77,20 +119,24 @@ describe Berkshelf::Lockfile do
     end
 
     it 'returns false if the dependency is not in the graph' do
-      apt = double('apt', version_constraint: nil)
+      apt = double('apt', name: 'apt', version_constraint: nil)
       berksfile = double('berksfile', dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       subject.stub(:find).with(apt).and_return(true)
-      subject.graph.stub(:find).with(apt).and_return(false)
+      subject.graph.stub(:find).with(apt).and_return(nil)
 
       expect(subject.trusted?).to be_false
     end
 
     it 'returns false if the constraint is not satisfied' do
+      cookbook = double('apt-1.0.0', dependencies: {})
       apt = double('apt',
+        name: 'apt',
         version_constraint: Solve::Constraint.new('< 1.0.0'),
         version: '1.0.0',
-        location: 'api'
+        location: 'api',
+        dependencies: {},
+        cached_cookbook: cookbook,
       )
       berksfile = double('berksfile', dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
@@ -101,10 +147,14 @@ describe Berkshelf::Lockfile do
     end
 
     it 'returns false if the locations are different' do
+      cookbook = double('apt-1.0.0', dependencies: {})
       apt = double('apt',
+        name: 'apt',
         version_constraint: Solve::Constraint.new('< 1.0.0'),
         version: '1.0.0',
-        location: 'api'
+        location: 'api',
+        dependencies: {},
+        cached_cookbook: cookbook,
       )
       apt_master = apt.dup
       apt_master.stub(location: 'github')
@@ -196,12 +246,6 @@ describe Berkshelf::Lockfile do
   end
 
   describe '#unlock' do
-    it 'raises an exception when the dependency does not exist' do
-      expect {
-        subject.unlock('foo')
-      }.to raise_error(Berkshelf::CookbookNotFound)
-    end
-
     it 'removes the dependency from the graph' do
       subject.add('apache2')
       subject.unlock('apache2')

data/spec/unit/berkshelf/logger_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Berkshelf::Logger do
-  %w(info warn error fatal debug deprecate).each do |meth|
+  %w(info warn error fatal debug deprecate exception).each do |meth|
     describe "##{meth}" do
       it 'responds' do
-        expect(Berkshelf::Logger).to respond_to(meth.to_sym)
+        expect(subject).to respond_to(meth.to_sym)
       end
     end
   end

data/spec/unit/berkshelf/mixin/logging_spec.rb

@@ -5,19 +5,15 @@ describe Berkshelf::Mixin::Logging do
     Class.new { include Berkshelf::Mixin::Logging }.new
   end
 
-  describe '#log' do
+  describe '#logger' do
     it 'returns the Berkshelf::Logger' do
-      expect(subject.log).to eq(Berkshelf::Logger)
+      expect(subject.logger).to be_a(Berkshelf::Logger)
     end
   end
 
-  describe '#log_exception' do
-    it 'logs the exception and backtrace as fatal' do
-      ex = Exception.new('msg')
-      ex.stub(:backtrace).and_return(['one', 'two'])
-      subject.log.should_receive(:fatal).exactly(2).times
-
-      subject.log_exception(ex)
+  describe '#log' do
+    it 'returns the Berkshelf::Logger' do
+      expect(subject.log).to be_a(Berkshelf::Logger)
     end
   end
 end

data/spec/unit/berkshelf/source_spec.rb

@@ -1,23 +1,42 @@
 require 'spec_helper'
 
-describe Berkshelf::Source do
-  describe "#universe"
-  describe "#cookbook"
-  describe "#versions"
+module Berkshelf
+  describe Source do
+    describe "#universe"
+    describe "#cookbook"
+    describe "#versions"
 
-  describe "#==" do
-    it "is the same if the uri matches" do
-      first = described_class.new("http://localhost:8080")
-      other = described_class.new("http://localhost:8080")
+    describe "#==" do
+      it "is the same if the uri matches" do
+        first = described_class.new("http://localhost:8080")
+        other = described_class.new("http://localhost:8080")
 
-      expect(first).to eq(other)
+        expect(first).to eq(other)
+      end
+
+      it "is not the same if the uri is different" do
+        first = described_class.new("http://localhost:8089")
+        other = described_class.new("http://localhost:8080")
+
+        expect(first).to_not eq(other)
+      end
     end
 
-    it "is not the same if the uri is different" do
-      first = described_class.new("http://localhost:8089")
-      other = described_class.new("http://localhost:8080")
+    describe '.default?' do
+      it 'returns true when the source is the default' do
+        instance = described_class.new(Berksfile::DEFAULT_API_URL)
+        expect(instance).to be_default
+      end
+
+      it 'returns true when the scheme is different' do
+        instance = described_class.new('http://api.berkshelf.com')
+        expect(instance).to be_default
+      end
 
-      expect(first).to_not eq(other)
+      it 'returns false when the source is not the default' do
+        instance = described_class.new('http://localhost:8080')
+        expect(instance).to_not be_default
+      end
     end
   end
 end

data/spec/unit/berkshelf_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Berkshelf do
-  describe '::formatter' do
+module Berkshelf
+  describe '.formatter' do
     context 'with default formatter' do
       before { Berkshelf.instance_variable_set(:@formatter, nil) }
 
-      it 'should be human readable' do
-        expect(Berkshelf.formatter).to be_an_instance_of(Berkshelf::Formatters::HumanReadable)
+      it 'is human readable' do
+        expect(Berkshelf.formatter).to be_an_instance_of(HumanFormatter)
       end
     end
 
@@ -15,10 +15,7 @@ describe Berkshelf do
         Berkshelf.instance_eval { @formatter = nil }
       end
 
-      class CustomFormatter
-        include Berkshelf::Formatters::AbstractFormatter
-        register_formatter :custom
-      end
+      class CustomFormatter < BaseFormatter; end
 
       before do
         Berkshelf.set_format :custom
@@ -32,7 +29,7 @@ describe Berkshelf do
 
   describe '::log' do
     it 'returns Berkshelf::Logger' do
-      expect(Berkshelf.log).to eq(Berkshelf::Logger)
+      expect(Berkshelf.log).to be_a(Berkshelf::Logger)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta7
+  version: 3.0.0.beta8
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -34,14 +34,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +321,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -331,7 +330,6 @@ files:
 - PLUGINS.md
 - README.md
 - Thorfile
-- berkshelf-complete.sh
 - berkshelf.gemspec
 - bin/berks
 - features/berksfile.feature
@@ -343,6 +341,7 @@ files:
 - features/commands/list.feature
 - features/commands/outdated.feature
 - features/commands/package.feature
+- features/commands/search.feature
 - features/commands/shelf/list.feature
 - features/commands/shelf/show.feature
 - features/commands/shelf/uninstall.feature
@@ -354,6 +353,7 @@ files:
 - features/config.feature
 - features/help.feature
 - features/json_formatter.feature
+- features/lifecycle.feature
 - features/lockfile.feature
 - features/resolver.feature
 - features/step_definitions/berksfile_steps.rb
@@ -368,6 +368,7 @@ files:
 - features/step_definitions/utility_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
+- gem_graph.png
 - generator_files/Berksfile.erb
 - generator_files/CHANGELOG.md.erb
 - generator_files/Gemfile.erb
@@ -404,22 +405,19 @@ files:
 - lib/berkshelf/dependency.rb
 - lib/berkshelf/downloader.rb
 - lib/berkshelf/errors.rb
-- lib/berkshelf/formatters.rb
-- lib/berkshelf/formatters/human_readable.rb
+- lib/berkshelf/formatters/base.rb
+- lib/berkshelf/formatters/human.rb
 - lib/berkshelf/formatters/json.rb
 - lib/berkshelf/formatters/null.rb
-- lib/berkshelf/git.rb
 - lib/berkshelf/init_generator.rb
 - lib/berkshelf/installer.rb
 - lib/berkshelf/location.rb
-- lib/berkshelf/locations/git_location.rb
-- lib/berkshelf/locations/github_location.rb
-- lib/berkshelf/locations/mercurial_location.rb
-- lib/berkshelf/locations/path_location.rb
+- lib/berkshelf/locations/base.rb
+- lib/berkshelf/locations/git.rb
+- lib/berkshelf/locations/github.rb
+- lib/berkshelf/locations/path.rb
 - lib/berkshelf/lockfile.rb
 - lib/berkshelf/logger.rb
-- lib/berkshelf/mercurial.rb
-- lib/berkshelf/mixin.rb
 - lib/berkshelf/mixin/dsl_eval.rb
 - lib/berkshelf/mixin/logging.rb
 - lib/berkshelf/packager.rb
@@ -458,8 +456,8 @@ files:
 - spec/support/kitchen.rb
 - spec/support/matchers/file_system_matchers.rb
 - spec/support/matchers/filepath_matchers.rb
-- spec/support/mercurial.rb
 - spec/support/path_helpers.rb
+- spec/support/shared_examples/formatter.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cli_spec.rb
@@ -472,19 +470,19 @@ files:
 - spec/unit/berkshelf/dependency_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
+- spec/unit/berkshelf/formatters/base_spec.rb
+- spec/unit/berkshelf/formatters/human_spec.rb
+- spec/unit/berkshelf/formatters/json_spec.rb
 - spec/unit/berkshelf/formatters/null_spec.rb
-- spec/unit/berkshelf/formatters_spec.rb
-- spec/unit/berkshelf/git_spec.rb
 - spec/unit/berkshelf/init_generator_spec.rb
 - spec/unit/berkshelf/installer_spec.rb
 - spec/unit/berkshelf/location_spec.rb
-- spec/unit/berkshelf/locations/git_location_spec.rb
-- spec/unit/berkshelf/locations/mercurial_location_spec.rb
-- spec/unit/berkshelf/locations/path_location_spec.rb
+- spec/unit/berkshelf/locations/base_spec.rb
+- spec/unit/berkshelf/locations/git_spec.rb
+- spec/unit/berkshelf/locations/path_spec.rb
 - spec/unit/berkshelf/lockfile_parser_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/logger_spec.rb
-- spec/unit/berkshelf/mercurial_spec.rb
 - spec/unit/berkshelf/mixin/dsl_eval_spec.rb
 - spec/unit/berkshelf/mixin/logging_spec.rb
 - spec/unit/berkshelf/packager_spec.rb
@@ -528,6 +526,7 @@ test_files:
 - features/commands/list.feature
 - features/commands/outdated.feature
 - features/commands/package.feature
+- features/commands/search.feature
 - features/commands/shelf/list.feature
 - features/commands/shelf/show.feature
 - features/commands/shelf/uninstall.feature
@@ -539,6 +538,7 @@ test_files:
 - features/config.feature
 - features/help.feature
 - features/json_formatter.feature
+- features/lifecycle.feature
 - features/lockfile.feature
 - features/resolver.feature
 - features/step_definitions/berksfile_steps.rb
@@ -578,8 +578,8 @@ test_files:
 - spec/support/kitchen.rb
 - spec/support/matchers/file_system_matchers.rb
 - spec/support/matchers/filepath_matchers.rb
-- spec/support/mercurial.rb
 - spec/support/path_helpers.rb
+- spec/support/shared_examples/formatter.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
 - spec/unit/berkshelf/cli_spec.rb
@@ -592,19 +592,19 @@ test_files:
 - spec/unit/berkshelf/dependency_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/errors_spec.rb
+- spec/unit/berkshelf/formatters/base_spec.rb
+- spec/unit/berkshelf/formatters/human_spec.rb
+- spec/unit/berkshelf/formatters/json_spec.rb
 - spec/unit/berkshelf/formatters/null_spec.rb
-- spec/unit/berkshelf/formatters_spec.rb
-- spec/unit/berkshelf/git_spec.rb
 - spec/unit/berkshelf/init_generator_spec.rb
 - spec/unit/berkshelf/installer_spec.rb
 - spec/unit/berkshelf/location_spec.rb
-- spec/unit/berkshelf/locations/git_location_spec.rb
-- spec/unit/berkshelf/locations/mercurial_location_spec.rb
-- spec/unit/berkshelf/locations/path_location_spec.rb
+- spec/unit/berkshelf/locations/base_spec.rb
+- spec/unit/berkshelf/locations/git_spec.rb
+- spec/unit/berkshelf/locations/path_spec.rb
 - spec/unit/berkshelf/lockfile_parser_spec.rb
 - spec/unit/berkshelf/lockfile_spec.rb
 - spec/unit/berkshelf/logger_spec.rb
-- spec/unit/berkshelf/mercurial_spec.rb
 - spec/unit/berkshelf/mixin/dsl_eval_spec.rb
 - spec/unit/berkshelf/mixin/logging_spec.rb
 - spec/unit/berkshelf/packager_spec.rb