knife-preflight 0.1.3 → 0.1.5

data/lib/chef/knife/preflight.rb

@@ -58,53 +58,89 @@ module KnifePreflight
           exit 1
         end
 
-        result_count_nodes = perform_query(raw_query, 'node')
+        cookbook = raw_query.split("::").first
+        unconstrained_env_search = Chef::Search::Query.new
+        unconstrained_envs = unconstrained_env_search.search('environment', "NOT cookbook_versions:#{cookbook}").first.map{|e|e.name}
 
-        result_count_roles = perform_query(raw_query, 'role')
+        q_nodes = Chef::Search::Query.new
 
-        ui.msg("Found #{result_count_nodes} nodes and #{result_count_roles} roles using the specified search criteria")
-      end
-
-      def perform_query(raw_query, type='node')
-        q = Chef::Search::Query.new
-
-        # strip default if it exists to simplify logic
-        raw_query = raw_query.sub("::default", "")
         escaped_query = raw_query.sub( "::", "\\:\\:")
-
+        
         if !raw_query.include? "::"
-          if type == 'node'
-            search_query = "recipes:*#{escaped_query} OR recipes:*#{escaped_query}\\:\\:default"
-            search_query += " OR " + search_query.gsub("recipes", "last_seen_recipes")
-          else
-            search_query = "run_list:recipe\\[#{escaped_query}\\] OR run_list:recipe\\[#{escaped_query}\\:\\:default\\]"
+          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
+
+        rows = config[:rows]
+        start = config[:start]
+        begin
+          q_nodes.search('node', query_nodes, config[:sort], start, rows) do |node_item|
+            formatted_item_node = format_for_display(node_item)
+            if formatted_item_node.respond_to?(:has_key?) && !formatted_item_node.has_key?('id')
+                formatted_item_node['id'] = node_item.has_key?('id') ? node_item['id'] : node_item.name
+            end
+            result_items_nodes << formatted_item_node
+            result_count_nodes += 1
           end
-          ui.msg("Searching for #{type}s containing #{raw_query} OR #{raw_query}::default in their expanded run_list...\n")
+        rescue Net::HTTPServerException => e
+          msg = Chef::JSONCompat.from_json(e.response.body)["error"].first
+          ui.error("knife preflight failed: #{msg}")
+          exit 1
+        end
+
+        if ui.interchange?
+          output({:results => result_count_nodes, :rows => result_items_nodes})
         else
-          if type == 'node'
-            search_query = "recipes:*#{escaped_query}"
-            search_query += " OR " + search_query.gsub("recipes", "last_seen_recipes")
-          else
-            search_query = "run_list:recipe\\[#{escaped_query}\\]"
+          ui.msg "#{result_count_nodes} Nodes found"
+          ui.msg("\n")
+          result_items_nodes.each do |item|
+            output("#{item.name}#{unconstrained_envs.include?(item.chef_environment) ? " - in environment '#{item.chef_environment}', no version constraint for '#{cookbook}' cookbook" : nil}")
           end
-          ui.msg("Searching for #{type}s containing #{raw_query} in their expanded run_list...\n")
         end
 
-        query = URI.escape(search_query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        ui.msg("\n")
+        ui.msg("\n")
 
-        result_items = []
-        result_count = 0
+
+        q_roles = Chef::Search::Query.new
+        
+        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
 
         rows = config[:rows]
         start = config[:start]
         begin
-          q.search(type, query, config[:sort], start, rows) do |item|
-            formatted_item = format_for_display(item)
-            if formatted_item.respond_to?(:has_key?) && !formatted_item.has_key?('id')
-              formatted_item['id'] = item.has_key?('id') ? item['id'] : item.name
+          q_roles.search('role', query_roles, config[:sort], start, rows) do |role_item|
+            formatted_item_role = format_for_display(role_item)
+            if formatted_item_role.respond_to?(:has_key?) && !formatted_item_role.has_key?('id')
+              formatted_item_role['id'] = role_item.has_key?('id') ? role_item['id'] : role_item.name
             end
-            result_items << formatted_item
-            result_count += 1
+            result_items_roles << formatted_item_role
+            result_count_roles += 1
           end
         rescue Net::HTTPServerException => e
           msg = Chef::JSONCompat.from_json(e.response.body)["error"].first
@@ -113,18 +149,18 @@ module KnifePreflight
         end
 
         if ui.interchange?
-          output({:results => result_count, :rows => result_items})
+          output({:results => result_count_roles, :rows => result_items_roles})
         else
-          ui.msg "#{result_count} #{type.capitalize}s found"
+          ui.msg "#{result_count_roles} Roles found"
           ui.msg("\n")
-          result_items.each do |item|
-            output(item.name)
+          result_items_roles.each do |role_item|
+            output(role_item.name)
           end
         end
 
         ui.msg("\n")
         ui.msg("\n")
-        return result_count
+        ui.msg("Found #{result_count_nodes} nodes and #{result_count_roles} roles using the specified search criteria")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-preflight
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70103950761040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70103950761040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 description: Knife plugin for checking what your cookbook changes will affect
 email: jonlives@gmail.com
 executables: []
@@ -52,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: knife-preflight
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Knife plugin for checking what your cookbook changes will affect