knife-preflight 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWFjOWVhZWY2ZmEzM2ZlNDU1M2MyMDBhYmQ0NDFiZDczZDc4M2YzOQ==
+  data.tar.gz: !binary |-
+    NzEyY2NiMDQ4ZTg0OGFhNzI2ZDdkYzJmZjBhMTU4MTRiNDdkMzAwNg==
+SHA512:
+  metadata.gz: !binary |-
+    Yjc5OWExNDMwYzE0MjcwZDIyOTYwNmNjN2JlODljZWY1MWMzZGJhOGI4ZmZh
+    MzE5NzlmOWU2NDExZWM2MTNjMmI1ZDUzYWMyOWIzNzIwYjkwMWQ3YmJhYmEz
+    NDNmOWE5YjVkOGM3YTMwZmZiNmZlZDVkNjhkOGRiNzYwNmZlYWM=
+  data.tar.gz: !binary |-
+    Yjk0MWQ5NDc0YzM2N2RkYTgwYzc0ZTY0YjFhNmZlOGYyMjI4ZmMyMWJiODFj
+    ODg5ZWEzZWU5YzZlY2ZmNTI4Yjg1MjgwZTJmOGE1OTkxYjQ3YmU3OThlNDU5
+    Yjc3OTI0ZDczM2QzMzViMTY4MTRmZWRkOTRiYWZiMWRiYTllNjU=

data/lib/chef/knife/preflight.rb

@@ -13,154 +13,128 @@ require 'chef/knife/core/node_presenter'
 module KnifePreflight
   class Preflight < Chef::Knife
 
-      deps do
-        require 'chef/node'
-        require 'chef/environment'
-        require 'chef/api_client'
-        require 'chef/search/query'
-      end
+    deps do
+      require 'chef/node'
+      require 'chef/environment'
+      require 'chef/api_client'
+      require 'chef/search/query'
+    end
 
-      include Chef::Knife::Core::NodeFormattingOptions
+    include Chef::Knife::Core::NodeFormattingOptions
 
-      banner "knife preflight QUERY (options)"
+    banner "knife preflight QUERY (options)"
 
-      option :sort,
-        :short => "-o SORT",
-        :long => "--sort SORT",
-        :description => "The order to sort the results in",
-        :default => nil
+    option :sort,
+           :short => "-o SORT",
+           :long => "--sort SORT",
+           :description => "The order to sort the results in",
+           :default => nil
 
-      option :start,
-        :short => "-b ROW",
-        :long => "--start ROW",
-        :description => "The row to start returning results at",
-        :default => 0,
-        :proc => lambda { |i| i.to_i }
+    option :start,
+           :short => "-b ROW",
+           :long => "--start ROW",
+           :description => "The row to start returning results at",
+           :default => 0,
+           :proc => lambda { |i| i.to_i }
 
-      option :rows,
-        :short => "-R INT",
-        :long => "--rows INT",
-        :description => "The number of rows to return",
-        :default => 1000,
-        :proc => lambda { |i| i.to_i }
+    option :rows,
+           :short => "-R INT",
+           :long => "--rows INT",
+           :description => "The number of rows to return",
+           :default => 1000,
+           :proc => lambda { |i| i.to_i }
 
 
-      def run
-        if config[:query] && @name_args[0]
-          ui.error "please specify query as an argument or an option via -q, not both"
-          ui.msg opt_parser
-          exit 1
-        end
-        raw_query = config[:query] || @name_args[0]
-        if !raw_query || raw_query.empty?
-          ui.error "no query specified"
-          ui.msg opt_parser
-          exit 1
-        end
+    def run
+      if config[:query] && @name_args[0]
+        ui.error "please specify query as an argument or an option via -q, not both"
+        ui.msg opt_parser
+        exit 1
+      end
+      raw_query = config[:query] || @name_args[0]
+      if !raw_query || raw_query.empty?
+        ui.error "no query specified"
+        ui.msg opt_parser
+        exit 1
+      end
+
+      result_count_nodes = perform_query(raw_query, 'node')
+
+      result_count_roles = perform_query(raw_query, 'role')
 
+      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
+
+      if type == '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}
+      end
 
-        q_nodes = Chef::Search::Query.new
+      # strip default if it exists to simplify logic
+      raw_query = raw_query.sub("::default", "")
+      escaped_query = raw_query.sub( "::", "\\:\\:")
 
-        escaped_query = raw_query.sub( "::", "\\:\\:")
-        
-        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")
+      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
-          node_query = "recipes:*#{escaped_query}"
-          ui.msg("Searching for nodes containing #{raw_query} in their expanded run_list...\n")
+          search_query = "run_list:recipe\\[#{escaped_query}\\] OR run_list:recipe\\[#{escaped_query}\\:\\:default\\]"
         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.normal['id'] = node_item.has_key?('id') ? node_item['id'] : node_item.name
-            end
-            result_items_nodes << formatted_item_node
-            result_count_nodes += 1
-          end
-        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})
+        ui.msg("Searching for #{type}s containing #{raw_query} OR #{raw_query}::default in their expanded run_list or added via include_recipe...\n")
+      else
+        if type == 'node'
+          search_query = "recipes:*#{escaped_query}"
+          search_query += " OR " + search_query.gsub("recipes", "last_seen_recipes")
         else
-          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
+          search_query = "run_list:recipe\\[#{escaped_query}\\]"
         end
+        ui.msg("Searching for #{type}s containing #{raw_query} in their expanded run_list or added via include_recipe......\n")
+      end
 
-        ui.msg("\n")
-        ui.msg("\n")
-
+      query = URI.escape(search_query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
 
-        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
+      result_items = []
+      result_count = 0
 
-        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_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_roles << formatted_item_role
-            result_count_roles += 1
+      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.normal['id'] = item.has_key?('id') ? item['id'] : item.name
           end
-        rescue Net::HTTPServerException => e
-          msg = Chef::JSONCompat.from_json(e.response.body)["error"].first
-          ui.error("knife preflight failed: #{msg}")
-          exit 1
+          result_items << formatted_item
+          result_count += 1
         end
+      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_roles, :rows => result_items_roles})
-        else
-          ui.msg "#{result_count_roles} Roles found"
-          ui.msg("\n")
-          result_items_roles.each do |role_item|
-            output(role_item.name)
+      if ui.interchange?
+        output({:results => result_count, :rows => result_items})
+      else
+        ui.msg "#{result_count} #{type.capitalize}s found"
+        ui.msg("\n")
+        result_items.each do |item|
+          if item.instance_of?(Chef::Node)
+            output("#{item.name}#{unconstrained_envs.include?(item.chef_environment) ? " - in environment #{item.chef_environment}, no version constraint for #{cookbook} cookbook" : nil}")
+          else
+            output(item.name)
           end
         end
-
-        ui.msg("\n")
-        ui.msg("\n")
-        ui.msg("Found #{result_count_nodes} nodes and #{result_count_roles} roles using the specified search criteria")
       end
+
+      ui.msg("\n")
+      ui.msg("\n")
+      return result_count
     end
   end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-preflight
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,26 +35,25 @@ files:
 - lib/chef/knife/preflight.rb
 homepage: https://github.com/jonlives/knife-preflight
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: knife-preflight
-rubygems_version: 1.8.24
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 2
 summary: Knife plugin for checking what your cookbook changes will affect