berkshelf 3.0.0.beta7 → 3.0.0.beta8

data/lib/berkshelf/logger.rb

@@ -1,12 +1,18 @@
 module Berkshelf
-  Logger = Ridley.logger
-
-  Logger.class.class_eval do
+  class Logger < Ridley::Logging::Logger
     alias_method :fatal, :error
 
     def deprecate(message)
       trace = caller.join("\n\t")
       warn "DEPRECATION WARNING: #{message}\n\t#{trace}"
     end
+
+    # Log an exception and its backtrace to FATAL
+    #
+    # @param [Exception] ex
+    def exception(ex)
+      log.fatal("#{ex.class}: #{ex}")
+      log.fatal(ex.backtrace.join("\n")) unless ex.backtrace.nil?
+    end
   end
 end

data/lib/berkshelf/mixin/logging.rb

@@ -1,17 +1,12 @@
 module Berkshelf
   module Mixin
     module Logging
-      def log
-        Berkshelf::Logger
-      end
+      attr_writer :logger
 
-      # Log an exception and its backtrace to FATAL
-      #
-      # @param [Exception] ex
-      def log_exception(ex)
-        log.fatal("#{ex.class}: #{ex}")
-        log.fatal(ex.backtrace.join("\n")) unless ex.backtrace.nil?
+      def logger
+        @logger ||= Berkshelf::Logger.new(STDOUT)
       end
+      alias_method :log, :logger
     end
   end
 end

data/lib/berkshelf/resolver.rb

@@ -4,18 +4,18 @@ module Berkshelf
 
     extend Forwardable
 
-    # @return [Berkshelf::Berksfile]
+    # @return [Berksfile]
     attr_reader :berksfile
 
     # @return [Resolver::Graph]
     attr_reader :graph
 
-    # @return [Array<Berkshelf::Dependency>]
+    # @return [Array<Dependency>]
     #   an array of dependencies that must be satisfied
     attr_reader :demands
 
-    # @param [Berkshelf::Berksfile] berksfile
-    # @param [Array<Berkshelf::Dependency>, Berkshelf::Dependency] demands
+    # @param [Berksfile] berksfile
+    # @param [Array<Dependency>, Dependency] demands
     #   a dependency, or array of dependencies, which must be satisfied
     def initialize(berksfile, demands = [])
       @berksfile = berksfile
@@ -27,12 +27,12 @@ module Berkshelf
 
     # Add the given dependency to the collection of demands
     #
-    # @param [Berkshelf::Dependency] demand
+    # @param [Dependency] demand
     #   add a dependency that must be satisfied to the graph
     #
     # @raise [DuplicateDemand]
     #
-    # @return [Array<Berkshelf::Dependency>]
+    # @return [Array<Dependency>]
     def add_demand(demand)
       if has_demand?(demand)
         raise DuplicateDemand, "A demand named '#{demand.name}' is already present."
@@ -44,7 +44,7 @@ module Berkshelf
     # Add dependencies of a locally cached cookbook which will take precedence over anything
     # found in the universe.
     #
-    # @param [Berkshelf::CachedCookbook] cookbook
+    # @param [CachedCookbook] cookbook
     #
     # @return [Hash]
     def add_explicit_dependencies(cookbook)
@@ -63,7 +63,7 @@ module Berkshelf
     # Finds a solution for the currently added dependencies and their dependencies and
     # returns an array of CachedCookbooks.
     #
-    # @raise [Berkshelf::NoSolutionError] when a solution could not be found for the given demands
+    # @raise [NoSolutionError] when a solution could not be found for the given demands
     #
     # @return [Array<Array<String, String, Dependency>>]
     def resolve
@@ -77,15 +77,15 @@ module Berkshelf
         dependency
       end
     rescue Solve::Errors::NoSolutionError
-      raise Berkshelf::NoSolutionError.new(demands)
+      raise NoSolutionError.new(demands)
     end
 
     # Retrieve the given demand from the resolver
     #
-    # @param [Berkshelf::Dependency, #to_s] demand
+    # @param [Dependency, #to_s] demand
     #   name of the dependency to return
     #
-    # @return [Berkshelf::Dependency]
+    # @return [Dependency]
     def [](demand)
       name = demand.respond_to?(:name) ? demand.name : demand.to_s
       demands.find { |demand| demand.name == name }
@@ -94,7 +94,7 @@ module Berkshelf
 
     # Check if the given demand has been added to the resolver
     #
-    # @param [Berkshelf::Dependency, #to_s] demand
+    # @param [Dependency, #to_s] demand
     #   the demand or the name of the demand to check for
     def has_demand?(demand)
       !get_demand(demand).nil?

data/lib/berkshelf/source.rb

@@ -44,13 +44,25 @@ module Berkshelf
       universe.find { |cookbook| cookbook.name == name && cookbook.version == version }
     end
 
+    # The list of remote cookbooks that match the given query.
+    #
+    # @param [String] name
+    #
+    # @return [Array<APIClient::RemoteCookbook]
+    def search(name)
+      universe
+        .select { |cookbook| cookbook.name =~ Regexp.new(name) }
+        .group_by(&:name)
+        .collect { |name, versions| versions.max_by(&:version) }
+    end
+
     # Determine if this source is a "default" source, as defined in the
     # {Berksfile}.
     #
     # @return [true, false]
     #   true if this a default source, false otherwise
     def default?
-      uri == Berksfile::DEFAULT_API_URL
+      @default_ ||= @uri.host == URI.parse(Berksfile::DEFAULT_API_URL).host
     end
 
     # @param [String] name

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "3.0.0.beta7"
+  VERSION = '3.0.0.beta8'
 end

data/spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb

@@ -1,7 +1,3 @@
-name             "example_cookbook"
-maintainer       "Josiah Kiehl"
-maintainer_email "jkiehl@riotgames.com"
-license          "DO WHAT YOU WANT CAUSE A PIRATE IS FREE"
-description      "Installs/Configures example_cookbook"
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.5.0"
+name       'example_cookbook'
+maintainer 'Berkshelf Core'
+version    '0.5.0'

data/spec/fixtures/cookbooks/example_cookbook/metadata.rb

@@ -1,6 +1,3 @@
-maintainer       "Josiah Kiehl"
-maintainer_email "jkiehl@riotgames.com"
-license          "DO WHAT YOU WANT CAUSE A PIRATE IS FREE"
-description      "Installs/Configures example_cookbook"
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.5.0"
+name       'example_cookbook'
+maintainer 'Berkshelf Core'
+version    '0.5.0'

data/spec/spec_helper.rb

@@ -28,16 +28,15 @@ Spork.prefork do
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 
-    config.before(:suite) do
-      WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
-      Berkshelf::RSpec::ChefServer.start
-      Berkshelf::API::RSpec::Server.start unless windows?
+    config.before(:each) do
       Berkshelf.set_format(:null)
       Berkshelf.ui.mute!
     end
 
-    config.after(:suite) do
-      Berkshelf.ui.unmute!
+    config.before(:suite) do
+      WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
+      Berkshelf::RSpec::ChefServer.start
+      Berkshelf::API::RSpec::Server.start unless windows?
     end
 
     config.before(:all) do

data/spec/support/matchers/file_system_matchers.rb

@@ -115,6 +115,10 @@ module Berkshelf
           end
         end
 
+        def description
+          "have structure"
+        end
+
         def matches?(root)
           @failure = catch :failure do
             super

data/spec/support/shared_examples/formatter.rb

@@ -0,0 +1,11 @@
+module Berkshelf
+  shared_examples 'a formatter object' do
+    BaseFormatter.instance_methods(false).each do |name|
+      next if name == :cleanup_hook
+
+      it "implements ##{name}" do
+        expect(subject.method(name).owner).to eq(described_class)
+      end
+    end
+  end
+end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -320,6 +320,14 @@ describe Berkshelf::Berksfile do
   end
 
   describe '#upload' do
+    let(:graph)    { double(locks: []) }
+    let(:lockfile) { double(present?: true, trusted?: true, graph: graph) }
+
+    before do
+      Berkshelf.stub(:config).and_return(berkshelf_config)
+      subject.stub(:lockfile).and_return(lockfile)
+    end
+
     let(:options) { Hash.new }
     let(:chef_config) do
       double('chef-config',
@@ -343,15 +351,9 @@ describe Berkshelf::Berksfile do
         }
       }
     end
-    let(:installed_cookbooks) { Array.new }
 
     let(:upload) { subject.upload(options) }
 
-    before do
-      Berkshelf.stub(:config).and_return(berkshelf_config)
-      subject.should_receive(:install).and_return(installed_cookbooks)
-    end
-
     context 'when there is no value for :chef_server_url' do
       before { chef_config.stub(chef_server_url: nil) }
       let(:message) { 'Missing required attribute in your Berkshelf configuration: chef.server_url' }
@@ -443,39 +445,34 @@ describe Berkshelf::Berksfile do
     end
 
     context 'when validate is passed' do
+      let(:mysql_dependency) { double(name: 'mysql', metadata?: false, dependencies: []) }
+      let(:mysql_cookbook)   { double(cookbook_name: 'mysql', path: 'path') }
+
       let(:options) do
         {
-          force: false,
-          freeze: true,
+          force:    false,
+          freeze:   true,
           validate: false,
-          name: "cookbook"
+          name:     mysql_cookbook.cookbook_name
         }
       end
       let(:ridley_options) do
-        default_ridley_options.merge(
-            { server_url: 'http://configured-chef-server/'})
+        default_ridley_options.merge({ server_url: 'http://configured-chef-server/'})
       end
-      let(:cookbook) { double('cookbook', cookbook_name: 'cookbook', path: 'path', version: '1.0.0') }
-      let(:installed_cookbooks) { [ cookbook ] }
-      let(:cookbook_resource) { double('cookbook') }
       let(:conn) { double('conn') }
 
-      it 'uses the passed in :validate' do
-        Ridley.should_receive(:open).with(ridley_options).and_yield(conn)
-        conn.should_receive(:cookbook).and_return(cookbook_resource)
-        cookbook_resource.should_receive(:upload).with('path', options )
-        upload
+      before do
+        subject.stub(:dependencies).and_return([mysql_dependency])
+        graph.stub(:find).with(mysql_dependency).and_return(mysql_dependency)
+        lockfile.stub(:retrieve).with(mysql_dependency).and_return(mysql_cookbook)
       end
-    end
-  end
-
-  describe "#remove_dependency" do
-    let(:dependency) { "nginx" }
-    before { subject.add_dependency(dependency) }
 
-    it "removes a dependencies from the list" do
-      subject.remove_dependency(dependency)
-      expect(subject.dependencies).to have(0).items
+      it 'uses the passed in :validate' do
+        expect(Ridley).to receive(:open).and_yield(conn)
+        expect(conn).to receive(:cookbook).and_return(mysql_cookbook)
+        expect(mysql_cookbook).to receive(:upload).with('path', options)
+        subject.upload('mysql', options)
+      end
     end
   end
 

data/spec/unit/berkshelf/cli_spec.rb

@@ -1,17 +1,25 @@
 require 'spec_helper'
 
-describe Berkshelf::Cli do
-  let(:subject) { described_class.new }
-  let(:berksfile) { double('Berksfile') }
-  let(:cookbooks) { ['mysql'] }
+module Berkshelf
+  describe Cli do
+    let(:subject) { described_class.new }
+    let(:berksfile) { double('Berksfile') }
+    let(:cookbooks) { ['mysql'] }
 
-  describe '#upload' do
-    it 'calls to upload with params if passed in cli' do
-      Berkshelf::Berksfile.should_receive(:from_file).and_return(berksfile)
-      berksfile.should_receive(:upload).with(include(skip_syntax_check: true, freeze: false, cookbooks: cookbooks))
-      subject.options[:skip_syntax_check] = true
-      subject.options[:no_freeze]         = true
-      subject.upload('mysql')
+    before do
+      Berksfile.stub(:from_options).and_return(berksfile)
+    end
+
+    describe '#upload' do
+      it 'calls to upload with params if passed in cli' do
+        expect(berksfile).to receive(:upload).with(cookbooks,
+          include(skip_syntax_check: true, freeze: false)
+        )
+
+        subject.options[:skip_syntax_check] = true
+        subject.options[:no_freeze]         = true
+        subject.upload('mysql')
+      end
     end
   end
 end

data/spec/unit/berkshelf/dependency_spec.rb

@@ -57,29 +57,7 @@ describe Berkshelf::Dependency do
           end
 
           it 'points to the specified path' do
-            expect(location.path).to eq(path)
-          end
-        end
-
-        context 'given an invalid option' do
-          it 'raises BerkshelfError with a friendly message' do
-            expect {
-              described_class.new(berksfile, cookbook_name, invalid_opt: 'thisisnotvalid')
-            }.to raise_error(Berkshelf::BerkshelfError, "Invalid options for dependency: 'invalid_opt'.")
-          end
-
-          it 'raises BerkshelfError with a messaging containing all of the invalid options' do
-            expect {
-              described_class.new(berksfile, cookbook_name, invalid_one: 'one', invalid_two: 'two')
-            }.to raise_error(Berkshelf::BerkshelfError, "Invalid options for dependency: 'invalid_one', 'invalid_two'.")
-          end
-        end
-
-        context 'given multiple location options' do
-          it 'raises with an Berkshelf::BerkshelfError' do
-            expect {
-              described_class.new(berksfile, cookbook_name, path: '/something', git: 'something')
-            }.to raise_error(Berkshelf::BerkshelfError)
+            expect(location.options[:path]).to eq(path)
           end
         end
 
@@ -110,58 +88,6 @@ describe Berkshelf::Dependency do
         end
       end
     end
-
-    describe "::add_valid_option" do
-      before do
-        @original = described_class.class_variable_get :@@valid_options
-        described_class.class_variable_set :@@valid_options, []
-      end
-
-      after do
-        described_class.class_variable_set :@@valid_options, @original
-      end
-
-      it 'adds an option to the list of valid options' do
-        described_class.add_valid_option(:one)
-
-        expect(described_class.valid_options).to have(1).item
-        expect(described_class.valid_options).to include(:one)
-      end
-
-      it 'does not add duplicate options to the list of valid options' do
-        described_class.add_valid_option(:one)
-        described_class.add_valid_option(:one)
-
-        expect(described_class.valid_options).to have(1).item
-      end
-    end
-
-    describe "::add_location_key" do
-      before do
-        @original = described_class.class_variable_get :@@location_keys
-        described_class.class_variable_set :@@location_keys, {}
-      end
-
-      after do
-        described_class.class_variable_set :@@location_keys, @original
-      end
-
-      it 'adds a location key and the associated class to the list of valid locations' do
-        described_class.add_location_key(:git, described_class)
-
-        expect(described_class.location_keys).to have(1).item
-        expect(described_class.location_keys).to include(:git)
-        expect(described_class.location_keys[:git]).to eq(described_class)
-      end
-
-      it 'does not add duplicate location keys to the list of location keys' do
-        described_class.add_location_key(:git, described_class)
-        described_class.add_location_key(:git, described_class)
-
-        expect(described_class.location_keys).to have(1).item
-        expect(described_class.location_keys).to include(:git)
-      end
-    end
   end
 
   subject { described_class.new(berksfile, cookbook_name) }
@@ -193,101 +119,15 @@ describe Berkshelf::Dependency do
   describe "#cached_cookbook"
   describe "#download"
 
-  describe '#downloaded?' do
+  describe '#installed?' do
     it 'returns true if self.cached_cookbook is not nil' do
       subject.stub(:cached_cookbook) { double('cb') }
-      expect(subject.downloaded?).to be_true
+      expect(subject.installed?).to be_true
     end
 
     it 'returns false if self.cached_cookbook is nil' do
       subject.stub(:cached_cookbook) { nil }
-      expect(subject.downloaded?).to be_false
-    end
-  end
-
-  describe '#to_hash' do
-    let(:hash) { subject.to_hash }
-
-    it 'does not include default values' do
-      [:constraint, :locked_version, :site, :git, :ref, :path].each do |key|
-        expect(hash).to_not have_key(key)
-      end
-    end
-
-    it 'includes the locked version' do
-      subject.stub(locked_version: double('cached', to_s: '1.2.3'))
-
-      expect(hash).to have_key(:locked_version)
-      expect(hash[:locked_version]).to eq('1.2.3')
-    end
-
-    it 'includes the git url and ref' do
-      location = double('git', uri: 'git://github.com/foo/bar.git', ref: 'abcd1234', rel: nil, download: nil)
-      location.stub(:kind_of?).and_return(false)
-      location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(true)
-      subject.stub(:location).and_return(location)
-
-      expect(hash).to have_key(:git)
-      expect(hash[:git]).to eq('git://github.com/foo/bar.git')
-      expect(hash).to have_key(:ref)
-      expect(hash[:ref]).to eq('abcd1234')
-    end
-
-    it 'includes the git url and rel' do
-      location = double('git', uri: 'git://github.com/foo/bar.git', ref: nil, rel: 'cookbooks/foo', download: nil)
-      location.stub(:kind_of?).and_return(false)
-      location.stub(:kind_of?).with(Berkshelf::GitLocation).and_return(true)
-      subject.stub(:location).and_return(location)
-
-      expect(hash).to have_key(:git)
-      expect(hash[:git]).to eq('git://github.com/foo/bar.git')
-      expect(hash).to have_key(:rel)
-      expect(hash[:rel]).to eq('cookbooks/foo')
-    end
-
-    it 'includes a relative path' do
-      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('../dev/foo')
-    end
-  end
-
-  describe "#scm_location?" do
-    let(:options) { Hash.new }
-    subject { described_class.new(berksfile, cookbook_name, options).scm_location? }
-
-    context "when the location is a GitLocation" do
-      let(:options) { { git: "git@github.com:berkshelf/berkshelf.git" } }
-      it { should be_true }
-    end
-
-    context "when the location is a GithubLocation" do
-      let(:options) { { github: "berkshelf/berkshelf" } }
-      it { should be_true }
-    end
-
-    context "when the location is a PathLocation" do
-      let(:options) { { path: fixtures_path.join('cookbooks', 'example_cookbook') } }
-      it { should be_false }
-    end
-  end
-
-  describe "#path_location?" do
-    let(:options) { Hash.new }
-    subject { described_class.new(berksfile, cookbook_name, options).path_location? }
-
-    context "when the location is a PathLocation" do
-      let(:options) { { path: fixtures_path.join("cookbooks", "example_cookbook") } }
-      it { should be_true }
-    end
-
-    context "when the location is not a PathLocation" do
-      let(:options) { { github: "berkshelf/berkshelf" } }
-      it { should be_false }
+      expect(subject.installed?).to be_false
     end
   end
 end