knife-update 0.0.7 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMzZjEzNmJkOTA5MzZlZGQyNTM1NmE5NDJmYWViNWE3NmE4Y2E5Ng==
+    MjdlY2Q1MDg5MmFiYWExMmIyMTI0YjBjN2ZlYWVjYjJlNjI3MmRmNQ==
   data.tar.gz: !binary |-
-    NDFkYWFjNDRlY2NhMzI5MmI3YmUxNGVhY2VhOTg4OWQ2NzAyYjNkNg==
+    ZTU4ZGVlMzc0MWM5ZDM1NDcxYjAzZDFhZjNhMWE0YWQ5ODZhOTY2Yg==
 SHA512:
   metadata.gz: !binary |-
-    YjMyN2EyYmQ4NzExOWJjMDYxM2ZmOGFlNmYzYzc4NzVmMmJjYzgxM2EzZWVm
-    MDYyYWMxNTI5NGM2Mjc1ZTc4ZGQ3M2JlNWFkNjg0MWU0NTE5YWMyNTFlNjVl
-    NDBiYjdmZjQ5MmRhMTUyMjRjMTMwZGY4MWI1OTkyNjc5MzAwNjc=
+    M2E1OGFjMmU4ZmI4NmI2NGEyNTc2MGM5ZGIwMTNlMjk0ZjA3NDgyYzJjMzNl
+    NGEzMmVkNTI4ZDJhZDE5ZTkzZDI4MGU1ZWQyYmYzZTM1M2UyMzVhZGQzNzZj
+    N2YwZWFiN2Y5YThhNzY0YWE0NjAwMjZiNTM3NjgzMDAxZmEzMmI=
   data.tar.gz: !binary |-
-    ZWQ0MjUwNDEyMWEwNzUwNWIzM2JhMzkzNjFhNmNiYTU5ODdlM2JlY2M3ZDNm
-    YTdiODQ1NjU1MDEyY2FhOTM5NzdmYjFkMTM2NjUyYzdiMTAxNzc3OGY5ZjIy
-    YmIyNzIyNTJkM2FhMWI3ZjcwZmQ4NzA5NWI3N2RjMDc1OGJkOGE=
+    MGZiNzdlYTkyYTk3ZmNiODliMWQ3MmUxODM3YTMyYjlkMjZiM2NjNzNiMGQy
+    MWJiZjE1MmJiZmQyN2I1Njk4NDAyMGJiNzRmYTMyNGFmZTg0ZWUwZWZiZDY2
+    Y2Y4ZTEzMTFhYjZiZDc1OWQxZjMxNWQzNmRiYTViOTIxMWU5NDQ=

data/lib/chef/knife/update.rb

@@ -69,9 +69,10 @@ class Chef
 
       # List of all compatible recipes
       def recipes(nodes)
-        nodes.inject([]) do |memo, node|
+        nodes.inject({}) do |memo, node|
           node.recipes.each do |recipe|
-            memo << recipe.to_s unless memo.include?(recipe.to_s)
+            memo[recipe.to_s] ||= 0
+            memo[recipe.to_s] += 1
           end
 
           memo

data/lib/chef/knife/update_recipes.rb

@@ -28,11 +28,12 @@ class Chef
       def run
         list  = node_list
         compatible = recipes(only(list, target_version))
-        unknown = recipes(except(list, target_version)) - compatible
+        old = recipes(except(list, target_version))
+        unknown = compatible.each { |recipe, _| old.delete(recipe) }
 
         if compatible.any?
           ui.msg "recipes already used on Chef #{target_version}:"
-          compatible.sort.each do |item|
+          compatible.sort_by { |k, _| k }.each do |item, _|
             ui.msg "  #{item}"
           end
           ui.msg ''
@@ -40,8 +41,8 @@ class Chef
 
         if unknown.any?
           ui.msg "recipes not used on Chef #{target_version}:"
-          unknown.sort.each do |item|
-            ui.msg "  #{item}"
+          unknown.sort_by { |k, _| k }.each do |item, nodes|
+            ui.msg "  #{item} (used on #{nodes} nodes)"
           end
           ui.msg ''
         end

data/lib/chef/knife/update_run.rb

@@ -86,7 +86,7 @@ class Chef
         nodes = list.inject([]) do |memo, (version, nodes)|
           if version != target_version
             nodes.each do |node|
-              if config[:force] || node.recipes.all? { |recipe| compatible.include?(recipe) }
+              if config[:force] || node.recipes.all? { |recipe| compatible.keys.include?(recipe) }
                 memo << node
               end
             end
@@ -96,7 +96,7 @@ class Chef
         end
 
         if config[:force] && unknown.any?
-          ui.warn "It's unknown if the following recipes are Chef #{target_version} compatible: #{unknown.sort.join(', ')}"
+          ui.warn "It's unknown if the following recipes are Chef #{target_version} compatible: #{unknown.keys.sort.join(', ')}"
         end
 
         if nodes.size > 0

data/lib/knife-update/version.rb

@@ -18,7 +18,7 @@
 
 module Knife
   module Update
-    VERSION = '0.0.7'
+    VERSION = '0.1.0'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-update
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -83,4 +83,3 @@ signing_key:
 specification_version: 4
 summary: knife update plugin
 test_files: []
-has_rdoc: