berkshelf 1.1.2 → 1.1.3

data/berkshelf.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'yajl-ruby'
   s.add_dependency 'activesupport'
   s.add_dependency 'chef', '>= 10.16.2'
-  s.add_dependency 'ridley', '>= 0.6.3'
+  s.add_dependency 'ridley', '~> 0.6.3'
   s.add_dependency 'chozo', '>= 0.2.3'
   s.add_dependency 'hashie'
   s.add_dependency 'minitar'

data/lib/berkshelf.rb

@@ -1,8 +1,8 @@
 require 'yajl'
+require 'chef/platform'
 require 'chef/cookbook/metadata'
 require 'chef/cookbook_version'
 require 'chef/knife'
-require 'chef/platform'
 
 require 'chozo/core_ext'
 
@@ -73,6 +73,20 @@ module Berkshelf
       ENV["BERKSHELF_PATH"] || DEFAULT_STORE_PATH
     end
 
+    # Check if we're running a version of Chef that is in the 11.x line
+    #
+    # @return [Boolean]
+    def chef_11?
+      chef_version >= Solve::Version.new("11.0.0") && chef_version <= Solve::Version.new("12.0.0")
+    end
+
+    # Return the loaded version of Chef
+    #
+    # @return [Solve::Version]
+    def chef_version
+      @chef_version ||= Solve::Version.new(::Chef::VERSION)
+    end
+
     # @return [String]
     def tmp_dir
       File.join(berkshelf_path, "tmp")

data/lib/berkshelf/cached_cookbook.rb

@@ -1,4 +1,9 @@
-require 'chef/checksum_cache'
+if Berkshelf.chef_11?
+  require 'chef/digester'
+else
+  require 'chef/checksum_cache'
+end
+
 require 'chef/cookbook/syntax_check'
 
 module Berkshelf
@@ -49,6 +54,8 @@ module Berkshelf
           raise CookbookNotFound, "No 'metadata.rb' file found at: '#{path}'"
         end
 
+        metadata.name cached_name if metadata.name.empty?
+
         new(cached_name, path, metadata)
       end
 
@@ -59,7 +66,11 @@ module Berkshelf
       #   a checksum that can be used to uniquely identify the file understood
       #   by a Chef Server.
       def checksum(filepath)
-        Chef::ChecksumCache.generate_md5_checksum_for_file(filepath)
+        if Berkshelf.chef_11?
+          Chef::Digester.generate_md5_checksum_for_file(filepath)
+        else
+          Chef::ChecksumCache.generate_md5_checksum_for_file(filepath)
+        end
       end
     end
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -67,7 +67,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
@@ -75,7 +75,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2336116110289571338
+      hash: -1528608678614597540
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24