knife-preflight 0.1.0 → 0.1.2

data/README.md

@@ -2,6 +2,19 @@
 
 A preflight plugin for Chef::Knife which lets you see which nodes and roles use a particular cookbook before you upload it.
 
+# Installation
+
+## SCRIPT INSTALL
+
+Copy preflight.rb script from lib/chef/knife to your ~/.chef/plugins/knife directory.
+
+## GEM INSTALL
+knife-prelight is available on rubygems.org - if you have that source in your gemrc, you can simply use:
+
+````
+gem install knife-preflight
+````
+
 ## Preface
 
 Searches the expanded run_lists of all nodes along with the run_list of all roles for the specified cookbook

data/lib/chef/knife/preflight.rb

@@ -60,17 +60,24 @@ module KnifePreflight
 
         q_nodes = Chef::Search::Query.new
 
-
         escaped_query = raw_query.sub( "::", "\\:\\:")
-        node_query = "recipes:*#{escaped_query}"
+        
+        if !raw_query.include? "::"
+          node_query = "recipes:*#{escaped_query} OR recipes:*#{escaped_query}\\:\\:default"
+          ui.msg("Searching for nodes containing #{raw_query} OR #{raw_query}::default in their expanded run_list...\n")
+        elsif raw_query.include? "::default"
+          node_query = "recipes:*#{escaped_query} OR recipes:*#{escaped_query.gsub( "\\:\\:default","")}"
+          ui.msg("Searching for nodes containing #{raw_query} OR #{raw_query.gsub( "::default","")} in their expanded run_list...\n")
+        else
+          node_query = "recipes:*#{escaped_query}"
+          ui.msg("Searching for nodes containing #{raw_query} in their expanded run_list...\n")
+        end
         query_nodes = URI.escape(node_query,
                            Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
 
         result_items_nodes = []
         result_count_nodes = 0
 
-        ui.msg("Searching for nodes containing #{raw_query} in their expanded run_list...\n")
-
         rows = config[:rows]
         start = config[:start]
         begin
@@ -103,15 +110,24 @@ module KnifePreflight
 
 
         q_roles = Chef::Search::Query.new
-        role_query = "run_list:recipe\\[#{escaped_query}\\]"
+        
+        if !raw_query.include? "::"
+          role_query = "run_list:recipe\\[#{escaped_query}\\] OR run_list:recipe\\[#{escaped_query}\\:\\:default\\]"
+          ui.msg("Searching for roles containing #{raw_query} OR #{raw_query}::default in their expanded run_list...\n")
+        elsif raw_query.include? "::default"
+          role_query = "run_list:recipe\\[#{escaped_query}\\] OR run_list:recipe\\[#{escaped_query.gsub( "\\:\\:default","")}\\]"
+          ui.msg("Searching for roles containing #{raw_query} OR #{raw_query.gsub( "::default","")} in their expanded run_list...\n")
+        else
+          role_query = "run_list:recipe\\[#{escaped_query}\\]"
+          ui.msg("Searching for roles containing #{raw_query} in their expanded run_list...\n")
+        end
+
         query_roles = URI.escape(role_query,
                            Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
 
         result_items_roles = []
         result_count_roles = 0
 
-        ui.msg("Searching for roles containing #{raw_query} in their run_list...\n")
-
         rows = config[:rows]
         start = config[:start]
         begin

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jon Cowie
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 +00:00
+date: 2012-02-02 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency