berkshelf 2.0.0 → 2.0.1

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p429

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.0.1
+
+* Improve performance of `berks upload`. It will now properly respect the Lockfile
+* Fix debug/verbose logging
+* You can now specify an alternate configuration with -c once again
+
 # 2.0.0
 
 * Huge improvements to the Lockfile

data/features/lockfile.feature

@@ -406,10 +406,10 @@ Feature: Creating and reading the Berkshelf lockfile
       """
       Berkshelf could not find compatible versions for cookbook 'berkshelf-cookbook-fixture':
         In Berksfile:
-          berkshelf-cookbook-fixture (1.0.0)
+          berkshelf-cookbook-fixture (~> 1.3.0)
 
         In Berksfile.lock:
-          berkshelf-cookbook-fixture (~> 1.3.0)
+          berkshelf-cookbook-fixture (1.0.0)
 
       Try running `berks update berkshelf-cookbook-fixture, which will try to find  'berkshelf-cookbook-fixture' matching '~> 1.3.0'
       """

data/lib/berkshelf.rb

@@ -28,6 +28,7 @@ module Berkshelf
     include Berkshelf::Mixin::Logging
 
     attr_accessor :ui
+    attr_accessor :logger
     attr_writer :cookbook_store
 
     # @return [Pathname]
@@ -65,11 +66,6 @@ module Berkshelf
     #   the new configuration file to use
     attr_writer :chef_config
 
-    # @return [Logger]
-    def logger
-      Celluloid.logger
-    end
-
     # @return [String]
     def tmp_dir
       File.join(berkshelf_path, 'tmp')
@@ -162,3 +158,6 @@ require_relative 'berkshelf/resolver'
 require_relative 'berkshelf/test' if ENV['RUBY_ENV'] == 'test'
 require_relative 'berkshelf/ui'
 require_relative 'berkshelf/version'
+
+Ridley.logger = Celluloid.logger = Berkshelf.logger = Logger.new(STDOUT)
+Berkshelf.logger.level = Logger::WARN

data/lib/berkshelf/berksfile.rb

@@ -498,6 +498,8 @@ module Berkshelf
       outdated
     end
 
+    # Upload the cookbooks installed by this Berksfile
+    #
     # @option options [Boolean] :force (false)
     #   Upload the Cookbook even if the version already exists and is frozen on the
     #   target Chef Server
@@ -521,29 +523,24 @@ module Berkshelf
     # @option options [String] :server_url
     #   An overriding Chef Server to upload the cookbooks to
     #
-    # @raise [UploadFailure] if you are uploading cookbooks with an invalid or not-specified client key
+    # @raise [UploadFailure]
+    #   if you are uploading cookbooks with an invalid or not-specified client key
     # @raise [Berkshelf::FrozenCookbook]
     #   if an attempt to upload a cookbook which has been frozen on the target server is made
     #   and the :halt_on_frozen option was true
     def upload(options = {})
-      options = options.reverse_merge(
-        force: false,
-        freeze: true,
-        skip_dependencies: false,
-        halt_on_frozen: false
-      )
+      options = options.reverse_merge(force: false, freeze: true, skip_dependencies: false, halt_on_frozen: false)
 
-      solution    = resolve(sources(options), options)[:solution]
-      upload_opts = options.slice(:force, :freeze)
-      conn        = ridley_connection(options)
+      cached_cookbooks = install(options)
+      upload_opts      = options.slice(:force, :freeze)
+      conn             = ridley_connection(options)
 
-      solution.each do |cb|
-        Berkshelf.formatter.upload(cb.cookbook_name, cb.version, conn.server_url)
-
-        validate_files!(cb)
+      cached_cookbooks.each do |cookbook|
+        Berkshelf.formatter.upload(cookbook.cookbook_name, cookbook.version, conn.server_url)
+        validate_files!(cookbook)
 
         begin
-          conn.cookbook.upload(cb.path, upload_opts.merge(name: cb.cookbook_name))
+          conn.cookbook.upload(cookbook.path, upload_opts.merge(name: cookbook.cookbook_name))
         rescue Ridley::Errors::FrozenCookbook => ex
           if options[:halt_on_frozen]
             raise Berkshelf::FrozenCookbook, ex

data/lib/berkshelf/cached_cookbook.rb

@@ -54,6 +54,7 @@ module Berkshelf
     end
 
     private
+
       def pretty_map(hash, padding)
         hash.map { |k,v| "#{k} (#{v})" }.join("\n" + ' '*padding)
       end

data/lib/berkshelf/cli.rb

@@ -32,7 +32,7 @@ module Berkshelf
         unless File.exist?(@options[:config])
           raise ConfigNotFound.new(:berkshelf, @options[:config])
         end
-        Berkshelf::Config.path = @options[:config]
+        Berkshelf::Config.set_path(@options[:config])
       end
 
       if @options[:debug]

data/lib/berkshelf/config.rb

@@ -28,8 +28,9 @@ module Berkshelf
       end
 
       # @param [String] new_path
-      def path=(new_path)
-        @path = File.expand_path(new_path)
+      def set_path(new_path)
+        @instance = nil
+        @path     = File.expand_path(new_path)
       end
 
       # @return [String, nil]

data/lib/berkshelf/errors.rb

@@ -253,10 +253,10 @@ module Berkshelf
       [
         "Berkshelf could not find compatible versions for cookbook '#{@source.name}':",
         "  In Berksfile:",
-        "    #{@locked_source.name} (#{@locked_source.locked_version})",
+        "    #{@source.name} (#{@source.version_constraint})",
         "",
         "  In Berksfile.lock:",
-        "    #{@source.name} (#{@source.version_constraint})",
+        "    #{@locked_source.name} (#{@locked_source.locked_version})",
         "",
         "Try running `berks update #{@source.name}, which will try to find  '#{@source.name}' matching '#{@source.version_constraint}'.",
       ].join("\n")

data/lib/berkshelf/logger.rb

@@ -1,5 +1,5 @@
 module Berkshelf
-  Logger = Celluloid::Logger
+  Logger = Celluloid::Logger.dup
 
   Logger.module_eval do
     def self.fatal(string)

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -403,18 +403,16 @@ describe Berkshelf::Berksfile do
   end
 
   describe '#upload' do
-    let(:upload) { subject.upload(options) }
     let(:options) { Hash.new }
-    let(:ssl) { double('ssl', verify: true) }
-    let(:chef) {
-      double('chef',
+    let(:chef_config) do
+      double('chef-config',
         node_name: 'fake-client',
         client_key: 'client-key',
         chef_server_url: 'http://configured-chef-server/'
       )
-    }
-    let(:berkshelf_config) { double('berks', ssl: ssl, chef: chef) }
-    let(:default_ridley_options) {
+    end
+    let(:berkshelf_config) { double('berkshelf-config', ssl: double(verify: true), chef: chef_config) }
+    let(:default_ridley_options) do
       {
         client_name: 'fake-client',
         client_key: 'client-key',
@@ -422,55 +420,36 @@ describe Berkshelf::Berksfile do
           verify: true
         }
       }
-    }
+    end
+    let(:installed_cookbooks) { Array.new }
+
+    let(:upload) { subject.upload(options) }
 
     before do
       Berkshelf::Config.stub(:instance).and_return(berkshelf_config)
-      subject.stub(:resolve).and_return(solution: [], sources: [])
+      subject.should_receive(:install).and_return(installed_cookbooks)
     end
 
-    context 'when there is no :server_url' do
-      let(:chef) do
-        double('chef',
-          node_name: 'fake-client',
-          client_key: 'client-key',
-          chef_server_url: nil
-        )
-      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' }
 
       it 'raises an error' do
-        expect {
-          upload
-        }.to raise_error(Berkshelf::ChefConnectionError, message)
+        expect { upload }.to raise_error(Berkshelf::ChefConnectionError, message)
       end
     end
 
-    context 'when there is no :client_name' do
-      let(:chef) do
-        double('chef',
-          node_name: nil,
-          client_key: 'client-key',
-          chef_server_url: 'http://configured-chef-server/'
-        )
-      end
+    context 'when there is no value for :client_name' do
+      before { chef_config.stub(node_name: nil) }
       let(:message) { 'Missing required attribute in your Berkshelf configuration: chef.node_name' }
 
       it 'raises an error' do
-        expect {
-          upload
-        }.to raise_error(Berkshelf::ChefConnectionError, message)
+        expect { upload }.to raise_error(Berkshelf::ChefConnectionError, message)
       end
     end
 
-    context 'when there is no :client_key' do
-      let(:chef) do
-        double('chef',
-          node_name: 'fake-client',
-          client_key: nil,
-          chef_server_url: 'http://configured-chef-server/'
-        )
-      end
+    context 'when there is no value for :client_key' do
+      before { chef_config.stub(client_key: nil) }
       let(:message) { 'Missing required attribute in your Berkshelf configuration: chef.client_key' }
 
       it 'raises an error' do

data/spec/unit/berkshelf/config_spec.rb

@@ -52,4 +52,13 @@ describe Berkshelf::Config do
       end
     end
   end
+
+  describe "::set_path" do
+    subject(:set_path) { described_class.set_path("/tmp/other_path.json") }
+
+    it "sets the #instance to nil" do
+      set_path
+      expect(described_class.instance_variable_get(:@instance)).to be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport