knife-psearch 0.0.3 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 166bc4b45854a5ae83079c0ec2bd72971151b00d
+  data.tar.gz: 5e7955d0be6902d35a6b6cdadff03fb8a6328f7b
+SHA512:
+  metadata.gz: fb1878e420d492a56986b58f78bafd2189b0d03be3b78a7237bbb1b50adbf6d4861a64a2022d83df5458ada4f4e6d45bef096de91ec370346818200f1f2c931b
+  data.tar.gz: 4caa4840efd5b0e1ba4a11833432e4ab5bc6c39efa6620f078a429b7a48e4b35fa16bded6cb04dbb7dee5eff24d087095e4104ad5bc84fd623b1d00119d98b35

data/lib/chef/knife/psearch.rb

@@ -5,10 +5,16 @@
 #
 # This plugin is not yes officially supported by Opscode
 
+require 'chef/knife'
+require 'chef/knife/core/node_presenter'
+
 class Psearch < Chef::Knife
-  banner "knife psearch INDEX SEARCH NAME=DESIRED_KEY_PATH,[NAME=DESIRED_KEY_PATH]"
+  banner "knife psearch INDEX SEARCH [NAME=DESIRED_KEY_PATH,[NAME=DESIRED_KEY_PATH]]"
+
+  include ::Chef::Knife::Core::MultiAttributeReturnOption
 
   deps do
+    require 'chef/node'
     require 'chef/search/partial_search'
   end
 
@@ -25,6 +31,11 @@ class Psearch < Chef::Knife
   :default => 0,
   :proc => lambda { |i| i.to_i }
 
+  option :id_only,
+  :short => "-i",
+  :long => "--id-only",
+  :description => "Show only the ID of matching objects"
+
   option :rows,
   :short => "-R INT",
   :long => "--rows INT",
@@ -32,20 +43,67 @@ class Psearch < Chef::Knife
   :default => 1000,
   :proc => lambda { |i| i.to_i }
 
-  option :attribute,
-  :short => "-a ATTR",
-  :long => "--attribute ATTR",
-  :description => "Show only one attribute"
+  DEFAULT_NODE_HASH = {
+    "name" => ["name"],
+    "chef_environment" => ["chef_environment"],
+    "fqdn" => ["fqdn"],
+    "ipaddress" => ["ipaddress"],
+    "run_list" => ["run_list"],
+    "roles" => ["roles"],
+    "recipes" => ["recipes"],
+    "platform" => ["platform"],
+    "tags" => ["tags"]
+  }
+
+  # "id" will be used by the generic presenter automatically when
+  # config[:id_only] is true
+  ID_ONLY_HASH = {
+    "id" => ["name"]
+  }
 
   def run
     @index, @search, *@keys = @name_args
+    @inflate_nodes = false
+
     args_hash = {}
-    args_hash[:keys] = build_key_hash
+    args_hash[:keys] = if config[:id_only]
+                         ID_ONLY_HASH
+                       elsif ! @keys.empty?
+                         build_key_hash
+                       elsif ! config[:attribute].nil? && ! config[:attribute].empty?
+                         # config[:attribute] comes from the -a option,
+                         # which is provided by Knife::Core::MultiAttributeReturnOption
+                         build_key_hash_from_attrs(config[:attribute])
+                       elsif @index == "node"
+                         DEFAULT_NODE_HASH
+                       else
+                         ui.warn("Falling back to full search.  Use the -a or -i option to enable parital search")
+                         nil
+                       end
+
+    # Create output similar to knife-search
+    # in the default case by creating Chef::Node objects
+    # and using the node presenter
+    if args_hash[:keys] == DEFAULT_NODE_HASH && @index == 'node'
+      Chef::Log.debug("Using NodePresenter for output")
+      ui.use_presenter ::Chef::Knife::Core::NodePresenter
+      @inflate_nodes = true
+    end
+
     args_hash[:sort] = config[:sort]
     args_hash[:start] = config[:start]
     args_hash[:rows] = config[:rows]
     results = Chef::PartialSearch.new.search(@index, @search, args_hash)
-    ui.output ui.format_for_display(results.first)
+    print_results(results.first)
+  end
+
+  def build_key_hash_from_attrs(attrs)
+    key_hash = {}
+    attrs.each do |a|
+      key_hash[a] = a.split(".")
+    end
+    key_hash["id"] = [ "name" ] unless key_hash.has_key?("name")
+    key_hash
   end
 
   def build_key_hash
@@ -60,4 +118,19 @@ class Psearch < Chef::Knife
     key_hash["name"] = [ "name" ] unless key_hash.has_key?("name")
     key_hash
   end
+
+  def print_results(items)
+    items.each do |res|
+      res = create_node(res) if @inflate_nodes
+      ui.output ui.format_for_display(res)
+      puts "\n" if ! config[:id_only]
+    end
+  end
+
+  def create_node(node_data)
+    node_data['attributes'] = node_data.reject do |key, value|
+      ["name", "chef_environment", "run_list"].include?(key)
+    end
+    Chef::Node.json_create(node_data)
+  end
 end

data/lib/chef/search/partial_search.rb

@@ -33,7 +33,7 @@ class Chef
     attr_accessor :rest
 
     def initialize(url=nil)
-      @rest = ::Chef::REST.new(url || ::Chef::Config[:search_url])
+      @rest = ::Chef::REST.new(url || ::Chef::Config[:chef_server_url])
     end
 
     # Search Solr for objects of a given type, for a given query. If you give

data/lib/knife-psearch/version.rb

@@ -1,3 +1,3 @@
 module KnifePSearch
-  VERSION = "0.0.3"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-psearch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Steven Danna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies: []
 description: Knife Plugin for Chef 11's Partial Search
 email: steve@opscode.com
@@ -24,26 +23,26 @@ files:
 - lib/knife-psearch/version.rb
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 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: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Knife Plugin for Chef 11's Partial Search
 test_files: []
+has_rdoc: