berkshelf 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe531a8a2654076d566b236313b3eeef9c1d6d8b
-  data.tar.gz: c5560108ebd912946fdf1f7a55649f85705f71f3
+  metadata.gz: d4cf647b41dbb16847bda378125caeca33f742be
+  data.tar.gz: 09fde5aa92aa7142ed6654d67c707877e136efd0
 SHA512:
-  metadata.gz: bb3799a95ad74f30e1996c3a69c045038e9e0d64d695eff4d0f00c7ac074a1b5bdee0515c2072337a1dfbf21d7c4c884c5adcdc414d4b30c7417cb04276a873a
-  data.tar.gz: b746da2921496bee4d25b1ef2cebd088ab755e5860370e2df8c8df3ed5a3606833b261a457ebe595ffd7b49252665f284b558cef109f9276050dbb1aaf2519bc
+  metadata.gz: 6dedd78fd2dc5890ceb8cb7319e84d91a1203f00fd698c8a77712dba2bf044026649ab814909a7f684f0defaf60054f70f5577322e866d918694f6971e232cdc
+  data.tar.gz: 82e54f6a02f0c0e6d5b7f5f63c84e09864b8d9ea2e9d12f08460cb2ccfcd5c769d1807bf6f91f377d9f7ce4bee1c7baf6f314d253fe0e002901131ae0923f231

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 3.1.1
+
+* Bug Fixes
+  * Fix issue reading metadata which was compiled using an older (bugged) version of Knife
+  * Fix issue with incorrectly reporting outdated cookbooks with the outdated command
+  * Fix issue uploading some cookbooks which were generated with older metadata
+
 # 3.1.0
 
 * Enhancements

data/berkshelf.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday',              '~> 0.9.0'
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 1.3.3'
-  s.add_dependency 'ridley',               '~> 3.0'
+  s.add_dependency 'ridley',               '~> 3.1'
   s.add_dependency 'solve',                '~> 1.1'
   s.add_dependency 'thor',                 '~> 0.18'
   s.add_dependency 'octokit',              '~> 3.0'

data/features/commands/outdated.feature

@@ -48,7 +48,7 @@ Feature: berks outdated
     Then the output should contain:
       """
       The following cookbooks have newer versions:
-        * bacon (1.1.0)
+        * bacon (1.0.0 => 1.1.0)
       """
 
   Scenario: the dependency has a version constraint and there are new items that satisfy it
@@ -75,7 +75,7 @@ Feature: berks outdated
     Then the output should contain:
       """
       The following cookbooks have newer versions:
-        * bacon (1.5.8)
+        * bacon (1.0.0 => 1.5.8)
       """
 
   Scenario: When the lockfile is not present

data/features/json_formatter.feature

@@ -147,20 +147,15 @@ Feature: --format json
       {
         "cookbooks": [
           {
-            "version": "0.2.9",
-            "sources": {
-              "http://0.0.0.0:26210": {
-                "name": "seth",
-                "version": "0.2.9"
-              }
+            "local": "0.1.0",
+            "remote": {
+              "http://0.0.0.0:26210": "0.2.9"
             },
             "name": "seth"
           }
         ],
         "errors": [],
-        "messages": [
-          "The following cookbooks have newer versions:"
-        ],
+        "messages": [],
         "warnings": []
       }
       """

data/lib/berkshelf/berksfile.rb

@@ -435,12 +435,19 @@ module Berkshelf
     # that satisfies the constraints of your dependencies.
     #
     # @return [Hash]
-    #   a hash of cached cookbooks and their latest version. An empty hash is
-    #   returned if there are no newer cookbooks for any of your dependencies
+    #   a hash of cached cookbooks and their latest version grouped by their
+    #   remote API source. The hash will be empty if there are no newer
+    #   cookbooks for any of your dependencies (that still satisfy the given)
+    #   constraints in the +Berksfile+.
     #
     # @example
     #   berksfile.outdated #=> {
-    #     #<CachedCookbook name="artifact"> => "0.11.2"
+    #     "nginx" => {
+    #       "local" => #<Version 1.8.0>,
+    #       "remote" => {
+    #         #<Source uri: "https://api.berkshelf.com"> #=> #<Version 2.6.2>
+    #       }
+    #     }
     #   }
     def outdated(*names)
       validate_lockfile_present!
@@ -448,25 +455,22 @@ module Berkshelf
       validate_dependencies_installed!
       validate_cookbook_names!(names)
 
-      # Calculate the list of cookbooks to unlock
-      if names.empty?
-        list = dependencies
-      else
-        list = dependencies.select { |dependency| names.include?(dependency.name) }
-      end
-
       lockfile.graph.locks.inject({}) do |hash, (name, dependency)|
         sources.each do |source|
           cookbooks = source.versions(name)
 
           latest = cookbooks.select do |cookbook|
             dependency.version_constraint.satisfies?(cookbook.version) &&
-            cookbook.version.to_s != dependency.locked_version.to_s
+            Semverse::Version.coerce(cookbook.version) > dependency.locked_version
           end.sort_by { |cookbook| cookbook.version }.last
 
           unless latest.nil?
-            hash[name] ||= {}
-            hash[name][source.uri.to_s] = latest
+            hash[name] ||= {
+              'local' => dependency.locked_version,
+              'remote' => {
+                source => Semverse::Version.coerce(latest.version)
+              }
+            }
           end
         end
 

data/lib/berkshelf/cli.rb

@@ -248,13 +248,6 @@ module Berkshelf
     def outdated(*names)
       berksfile = Berksfile.from_options(options)
       outdated  = berksfile.outdated(*names)
-
-      if outdated.empty?
-        Berkshelf.formatter.msg "All cookbooks up to date!"
-      else
-        Berkshelf.formatter.msg "The following cookbooks have newer versions:"
-      end
-
       Berkshelf.formatter.outdated(outdated)
     end
 

data/lib/berkshelf/formatters/human.rb

@@ -59,13 +59,21 @@ module Berkshelf
     #   the list of outdated cookbooks in the format
     #   { 'cookbook' => { 'api.berkshelf.com' => #<Cookbook> } }
     def outdated(hash)
-      hash.keys.each do |name|
-        hash[name].each do |source, newest|
-          string = "  * #{newest.name} (#{newest.version})"
-          unless source == Berksfile::DEFAULT_API_URL
-            string << " [#{source}]"
+      if hash.empty?
+        Berkshelf.ui.info('All cookbooks up to date!')
+      else
+        Berkshelf.ui.info('The following cookbooks have newer versions:')
+
+        hash.each do |name, info|
+          info['remote'].each do |remote_source, remote_version|
+            out = "  * #{name} (#{info['local']} => #{remote_version})"
+
+            unless remote_source.default?
+              out << " [#{remote_source.uri}]"
+            end
+
+            Berkshelf.ui.info(out)
           end
-          Berkshelf.ui.info string
         end
       end
     end

data/lib/berkshelf/formatters/json.rb

@@ -91,12 +91,14 @@ module Berkshelf
     #   the list of outdated cookbooks in the format
     #   { 'cookbook' => { 'api.berkshelf.com' => #<Cookbook> } }
     def outdated(hash)
-      hash.keys.each do |name|
-        hash[name].each do |source, cookbook|
+      hash.each do |name, info|
+        info['remote'].each do |remote_source, remote_version|
+          source = remote_source.uri.to_s
+
           cookbooks[name] ||= {}
-          cookbooks[name][:version] = cookbook.version
-          cookbooks[name][:sources] ||= {}
-          cookbooks[name][:sources][source] = cookbook
+          cookbooks[name][:local] = info['local'].to_s
+          cookbooks[name][:remote] ||= {}
+          cookbooks[name][:remote][source] = remote_version.to_s
         end
       end
     end

data/lib/berkshelf/source.rb

@@ -83,6 +83,14 @@ module Berkshelf
       "#{uri}"
     end
 
+    def inspect
+      "#<#{self.class.name} uri: #{@uri.to_s.inspect}>"
+    end
+
+    def hash
+      @uri.host.hash
+    end
+
     def ==(other)
       return false unless other.is_a?(self.class)
       uri == other.uri

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement