knife-update 0.0.2 → 0.0.4

data/README.md

@@ -25,22 +25,24 @@ Currently installed chef-client versions:
   Chef 10.24.0: 1000 nodes
 ```
 
-### knife update run_list
+### knife update recipes
 
-Displays lists of run_list items both used and not yet used in the target
+Displays recipes both used and not yet used on nodes with the target
 chef-client version.
 
 ```bash
-$ knife update run_list
+$ knife update recipes
 Search nodes '*:*'
 
-Compatbile Chef 10.24.0 run_list items:
-  role[base]
-  role[web-server]
+recipes already used on Chef 10.24.0:
+  apt::internal
+  barn::barn-ctrl
+  chef::bootstrap_client
+  ...
 
-Incompatible / not tested run_list items:
-  role[loadbalancer]
-  role[database-server]
+recipes not used on Chef 10.24.0:
+  hadoop::client
+  hadoop::datanode
 ```
 
 ### knife update run

data/lib/chef/knife/update.rb

@@ -67,11 +67,11 @@ class Chef
         list
       end
 
-      # List of all compatible run_list items
-      def run_list_items(nodes)
+      # List of all compatible recipes
+      def recipes(nodes)
         nodes.inject([]) do |memo, node|
-          node.run_list.each do |item|
-            memo << item.to_s unless memo.include?(item.to_s)
+          node.recipes.each do |recipe|
+            memo << recipe.to_s unless memo.include?(recipe.to_s)
           end
 
           memo

data/lib/chef/knife/{update_run_list.rb → update_recipes.rb}

@@ -20,18 +20,18 @@ require 'chef/knife'
 
 class Chef
   class Knife
-    class UpdateRunList < Knife
-      banner 'knife update run_list (options)'
+    class UpdateRecipes < Knife
+      banner 'knife update recipes (options)'
 
       include Chef::Knife::Update
 
       def run
         list  = node_list
-        compatible = run_list_items(only(list, target_version))
-        unknown = run_list_items(except(list, target_version)) - compatible
+        compatible = recipes(only(list, target_version))
+        unknown = recipes(except(list, target_version)) - compatible
 
         if compatible.any?
-          ui.msg "run_list items already running on Chef #{target_version}:"
+          ui.msg "recipes already used on Chef #{target_version}:"
           compatible.sort.each do |item|
             ui.msg "  #{item}"
           end
@@ -39,7 +39,7 @@ class Chef
         end
 
         if unknown.any?
-          ui.msg "run_list items not running on Chef #{target_version}:"
+          ui.msg "recipes not used on Chef #{target_version}:"
           unknown.sort.each do |item|
             ui.msg "  #{item}"
           end

data/lib/chef/knife/update_run.rb

@@ -62,23 +62,29 @@ class Chef
         :description => "Execute the update via sudo",
         :boolean => true
 
-      option :all,
-        :short => "-a",
-        :long => "--all",
+      option :force,
+        :short => "-f",
+        :long => "--force",
         :description => "Update all nodes found by the given search-query",
         :boolean => true
 
+      option :dry_run,
+        :short => "-D",
+        :long => "--dry-run",
+        :description => "Only collect updateable nodes and display them",
+        :boolean => true
+
       include Chef::Knife::Update
 
       def run
         list = node_list
-        compatible = run_list_items(only(list, target_version))
-        unknown = run_list_items(except(list, target_version)) - compatible
+        compatible = recipes(only(list, target_version))
+        unknown = recipes(except(list, target_version)) - compatible
 
         nodes = list.inject([]) do |memo, (version, nodes)|
           if version != target_version
             nodes.each do |node|
-              if config[:all] || node.run_list.all? { |item| items.include?(item.to_s) }
+              if config[:force] || node.recipes.all? { |recipe| compatible.include?(recipe) }
                 memo << node
               end
             end
@@ -87,12 +93,23 @@ class Chef
           memo
         end
 
-        if config[:all] && unknown.any?
-          ui.warn("It's unknown if the following run_list items are Chef #{target_version} compatible: #{unknown.sort.join(', ')}")
+        if config[:force] && unknown.any?
+          ui.warn "It's unknown if the following recipes 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
+        if nodes.size > 0
+          if !config[:dry_run]
+            ui.confirm "Are you sure you want to update #{nodes.size} nodes to chef #{target_version}"
+            update_ssh(nodes, target_version).run
+          else
+            ui.msg "Dry run. The following #{nodes.size} nodes would get updated:"
+            nodes.each { |node| ui.msg "  #{node.fqdn}" }
+          end
+        elsif list.size > 0
+          ui.msg "None of the nodes can be updated. Try option --force"
+        else
+          ui.msg "No nodes found."
+        end
       end
 
       # Update given nodes to specified version
@@ -103,13 +120,13 @@ class Chef
         ssh.ui = ui
         ssh.name_args = [ fqdns, ssh_command(version) ]
         ssh.config[:manual] = true
+        ssh.config[:on_error] = :skip
         ssh.config[:ssh_user] = Chef::Config[:knife][:ssh_user] || config[:ssh_user]
         ssh.config[:ssh_password] = config[:ssh_password]
         ssh.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
         ssh.config[:ssh_gateway] = Chef::Config[:knife][:ssh_gateway] || config[:ssh_gateway]
         ssh.config[:identity_file] = Chef::Config[:knife][:identity_file] || config[:identity_file]
         ssh.config[:host_key_verify] = Chef::Config[:knife][:host_key_verify] || config[:host_key_verify]
-        ssh.config[:on_error] = :raise
         ssh
       end
 

data/lib/knife-update/version.rb

@@ -18,7 +18,7 @@
 
 module Knife
   module Update
-    VERSION = '0.0.2'
+    VERSION = '0.0.4'
     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.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -58,8 +58,8 @@ files:
 - Rakefile
 - knife-update.gemspec
 - lib/chef/knife/update.rb
+- lib/chef/knife/update_recipes.rb
 - lib/chef/knife/update_run.rb
-- lib/chef/knife/update_run_list.rb
 - lib/chef/knife/update_status.rb
 - lib/knife-update/version.rb
 - spec/spec_helper.rb
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3366548039429717818
+      hash: 4121929708377413220
 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: -3366548039429717818
+      hash: 4121929708377413220
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25