berkshelf 2.0.8 → 2.0.9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.9
+
+* Update required version of Ridley
+
 # 2.0.7
 
 * Fix crash when parsing a lockfile that contains path locations which no longer exist

data/berkshelf.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'hashie',            '>= 2.0.2'
   s.add_dependency 'minitar',           '~> 0.5.4'
   s.add_dependency 'retryable',         '~> 1.3.3'
-  s.add_dependency 'ridley',            '~> 1.2.1'
+  s.add_dependency 'ridley',            '~> 1.5.0'
   s.add_dependency 'solve',             '>= 0.5.0'
   s.add_dependency 'thor',              '~> 0.18.0'
   s.add_dependency 'rbzip2',            '~> 0.2.0'

data/lib/berkshelf/formatters/human_readable.rb

@@ -22,7 +22,7 @@ module Berkshelf
       def use(cookbook, version, location = nil)
         message = "Using #{cookbook} (#{version})"
 
-        if location && location.is_a?(PathLocation)
+        if location.is_a?(PathLocation)
           message << ' from metadata' if location.metadata?
           message << " at '#{location.relative_path}'" unless location.relative_path == '.'
         end

data/lib/berkshelf/locations/chef_api_location.rb

@@ -140,7 +140,7 @@ module Berkshelf
       # 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)
-    rescue Ridley::Errors::ClientKeyFileNotFound => ex
+    rescue Ridley::Errors::ClientKeyFileNotFoundOrInvalid => ex
       raise ClientKeyFileNotFound, ex
     end
 

data/lib/berkshelf/resolver.rb

@@ -163,7 +163,7 @@ module Berkshelf
 
         if source.downloaded?
           cached = source.cached_cookbook
-          location.validate_cached(cached)
+          location.validate_cached(cached) if location
           Berkshelf.formatter.use(name, cached.version, location)
           true
         elsif location.is_a?(GitLocation)

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -1,4 +1,3 @@
-
 require 'spec_helper'
 
 describe Berkshelf::CookbookSource do

data/spec/unit/berkshelf/resolver_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Berkshelf::Resolver, :chef_server, vcr: { record: :new_episodes, serialize_with: :yaml } do
-  let(:downloader ) { Berkshelf::Downloader.new(Berkshelf.cookbook_store) }
+describe Berkshelf::Resolver, :chef_server, vcr: {record: :new_episodes, serialize_with: :yaml} do
+  let(:downloader) { Berkshelf::Downloader.new(Berkshelf.cookbook_store) }
   let(:berksfile) { double(downloader: downloader) }
   let(:source) do
     double('source',
@@ -14,7 +14,7 @@ describe Berkshelf::Resolver, :chef_server, vcr: { record: :new_episodes, serial
         name: 'mysql-1.2.4',
         cookbook_name: 'mysql',
         version: '1.2.4',
-        dependencies: { "nginx" => ">= 0.1.0" }
+        dependencies: {"nginx" => ">= 0.1.0"}
       ),
       location: double('location', validate_cached: true)
     )
@@ -35,8 +35,17 @@ describe Berkshelf::Resolver, :chef_server, vcr: { record: :new_episodes, serial
       resolver = Berkshelf::Resolver.new(berksfile, sources: [source])
       expect(resolver).to have_source('nginx')
     end
-  end
 
+    context 'location is not set' do
+      before(:each) do
+        source.stub(:location) { nil }
+      end
+
+      it 'does not raise' do
+        expect { Berkshelf::Resolver.new(berksfile, sources: [source], skip_dependencies: true) }.to_not raise_error
+      end
+    end
+  end
 
 
   subject { Berkshelf::Resolver.new(berksfile) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement