knife-update 0.0.1 → 0.0.2

data/knife-update.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'chef', '>= 0.10.24'
+  s.add_dependency 'chef', '>= 10.24.0'
   s.add_development_dependency 'rspec'
 end

data/lib/chef/knife/update.rb

@@ -62,6 +62,7 @@ class Chef
             list[version] << node
           end
         end
+        ui.msg ''
 
         list
       end
@@ -81,6 +82,16 @@ class Chef
       def target_version
         config[:target_version] || Chef::VERSION
       end
+
+      def only(mapping, key)
+        mapping[key] || []
+      end
+
+      def except(mapping, key)
+        mapping.inject([]) do |memo, (k, values)|
+          k == key ? memo : memo += values
+        end
+      end
     end
   end
 end

data/lib/chef/knife/update_run.rb

@@ -62,16 +62,23 @@ class Chef
         :description => "Execute the update via sudo",
         :boolean => true
 
+      option :all,
+        :short => "-a",
+        :long => "--all",
+        :description => "Update all nodes found by the given search-query",
+        :boolean => true
+
       include Chef::Knife::Update
 
       def run
-        list  = node_list
-        items = run_list_items(list[target_version])
+        list = node_list
+        compatible = run_list_items(only(list, target_version))
+        unknown = run_list_items(except(list, target_version)) - compatible
 
         nodes = list.inject([]) do |memo, (version, nodes)|
           if version != target_version
             nodes.each do |node|
-              if node.run_list.all? { |item| items.include?(item.to_s) }
+              if config[:all] || node.run_list.all? { |item| items.include?(item.to_s) }
                 memo << node
               end
             end
@@ -80,7 +87,11 @@ class Chef
           memo
         end
 
-        ui.msg "\nUpdate #{nodes.size} nodes to chef #{target_version}"
+        if config[:all] && unknown.any?
+          ui.warn("It's unknown if the following run_list items are Chef #{target_version} compatible: #{unknown.sort.join(', ')}")
+        end
+
+        ui.confirm "Are you sure you want to update #{nodes.size} nodes to chef #{target_version}"
         update_ssh(nodes, target_version).run
       end
 

data/lib/chef/knife/update_run_list.rb

@@ -27,24 +27,23 @@ class Chef
 
       def run
         list  = node_list
-        old_nodes = list.inject([]) do |memo, (version, nodes)|
-          version == target_version ? memo : memo += nodes
-        end
-        compatible = run_list_items(list[target_version])
-        incompatible = run_list_items(old_nodes)
+        compatible = run_list_items(only(list, target_version))
+        unknown = run_list_items(except(list, target_version)) - compatible
 
         if compatible.any?
-          ui.msg "\nCompatbile Chef #{target_version} run_list items:"
+          ui.msg "run_list items already running on Chef #{target_version}:"
           compatible.sort.each do |item|
             ui.msg "  #{item}"
           end
+          ui.msg ''
         end
 
-        if incompatible.any?
-          ui.msg "\Incompatible / not tested run_list items:"
-          incompatible.sort.each do |item|
+        if unknown.any?
+          ui.msg "run_list items not running on Chef #{target_version}:"
+          unknown.sort.each do |item|
             ui.msg "  #{item}"
           end
+          ui.msg ''
         end
       end
 

data/lib/chef/knife/update_status.rb

@@ -28,7 +28,7 @@ class Chef
       def run
         list = node_list
 
-        ui.msg "\nCurrently installed chef-client versions:"
+        ui.msg "Currently installed chef-client versions:"
         list.sort.each do |version, nodes|
           ui.msg "  Chef #{version}: #{nodes.size} nodes"
         end

data/lib/knife-update/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-update
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.24
+        version: 10.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.24
+        version: 10.24.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -334156609659399358
+      hash: -3366548039429717818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -334156609659399358
+      hash: -3366548039429717818
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25