knife-partial-search 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf495000ed0411a315071d3cf33e502c6a21683
-  data.tar.gz: 6cecc9edfae5dfa76bb5366731d780a02c8b7de3
+  metadata.gz: d0140db7060838ec89c3434595f4ac4e774966d2
+  data.tar.gz: 546c379a20b3bcd01d4050b1576f92600a723a55
 SHA512:
-  metadata.gz: 3705d9db8584020d30d0c95fc1011f8cecd75a1d36659a3623eae45c1c6943ad62be40bd1b9bc67f4c17a55062fceee145e4b986f496b4737cd5266ee0b01e8e
-  data.tar.gz: 5120a07a77c623c4f2ff0f07bdd9dc500b42f5afebb4ba7d196c6f150476c6cba6e06b725da2d0123d1e286ec3f6bc420d354873623bde48666fb002af7f9bc6
+  metadata.gz: dd85f2bb33952214317b4755a8fd8a6ca6c80df6cd47886b66e37bd2d5b1f2cc8f7eda4f64d5f4f0c038ede08063ff43f09068d1c28cd32c906774e1bbb00ddc
+  data.tar.gz: 6b3ab64123301b6426ac2a0367440f8f2cfb5372942390dbe279dac97301d7ab5a3eaf026b589b70b30f885012d9b3a61dc65f6c923485d81cb5ca150291f594

data/knife-partial-search.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Gregoire Seux"]
   spec.email         = ["g.seux@criteo.com"]
   spec.summary       = "Improve usual knife commands thanks to partial-search"
-  spec.homepage      = "https://gitlab.criteois.lan/ruby-gems/knife-partial-search"
+  spec.homepage      = "https://github.com/criteo/knife-partial-search"
   spec.license       = "Apache 2.0"
 
   spec.files         = `git ls-files`.split($/)

data/lib/chef/knife/partial_search.rb

@@ -1,3 +1,5 @@
+require_relative 'partial_search/fake_node.rb'
 require_relative 'partial_search/partial_search.rb'
 require_relative 'partial_search/fast_status.rb'
 require_relative 'partial_search/fast_ssh.rb'
+require_relative 'partial_search/fast_search.rb'

data/lib/chef/knife/partial_search/fake_node.rb

@@ -0,0 +1,29 @@
+class Chef
+  class Knife
+    class PartialSearch
+      class FakeNode < Hash
+        def name
+          self['name']
+        end
+        def chef_environment
+          self['chef_environment']
+        end
+        def run_list
+          self['run_list'].join(', ')
+        end
+
+        def [](key)
+          super(key.to_s)
+        end
+
+        def kind_of?(klass)
+          if klass.to_s == 'Chef::Node'
+            true
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/partial_search/fast_search.rb

@@ -0,0 +1,46 @@
+class Chef
+  class Knife
+    class Search
+
+      include Chef::Knife::PartialSearch
+
+      deps do
+        begin
+          require 'partial_search'
+        rescue LoadError => e
+        end
+      end
+
+      alias_method :classic_run, :run unless method_defined? :classic_run
+
+      def run
+        if defined?(Chef::PartialSearch)
+          keys = {}
+          if config[:attribute]
+            keys['name'] = ['name']
+            Array(config[:attribute]).each do |nested_value_spec|
+              keys[nested_value_spec] = nested_value_spec.split('.')
+            end
+            define_partial_search(keys)
+          else
+            define_partial_search({
+              'name'      => ['name'],
+              'chef_environment' => ['chef_environment'],
+              'fqdn'      => ['fqdn'],
+              'ipaddress' => ['ipaddress'],
+              'run_list'  => ['run_list'],
+              'roles'     => ['roles'],
+              'recipes'   => ['recipes'],
+              'platform'  => ['platform'],
+              'tags'      => ['tags'],
+              'platform_version' => ['platform_version'],
+            })
+          end
+        end
+        classic_run
+      end
+
+    end
+  end
+end
+

data/lib/chef/knife/partial_search/partial_search.rb

@@ -8,12 +8,20 @@ class Chef
 
           alias_method :old_search, :search unless method_defined? :old_search
 
-          def search(type, query, args={}, &block)
+          def search(type, query="*:*", sort='X_CHEF_id_CHEF_X asc', start=0, rows=1000, &block)
             q = Chef::PartialSearch.new
+            args = Hash.new
             args[:keys] = @@keys
+            args[:sort] = sort
+            args[:start] = start
+            args[:rows] = rows
             if block_given?
               q.search(type, query, args) do |node_hash|
-                n = FakeNode.new do |h,k| node_hash[k] end
+                n = Chef::Knife::PartialSearch::FakeNode.new do |h,k|
+                  h[k] = node_hash[k]
+                end
+                @@keys.each do |k,v| n[k] end
+
                 block.call(n)
               end
             else
@@ -26,3 +34,22 @@ class Chef
     end
   end
 end
+
+class Chef
+  class Knife
+    module Core
+      class GenericPresenter
+
+        alias_method :old_extract, :extract_nested_value unless method_defined? :old_extract
+
+        def extract_nested_value(data, nested_value_spec)
+          if data.kind_of?(Chef::Knife::PartialSearch::FakeNode)
+            data[nested_value_spec]
+          else
+            old_extract(data, nested_value_spec)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module PartialSearch
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-partial-search
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -80,11 +80,13 @@ files:
 - Rakefile
 - knife-partial-search.gemspec
 - lib/chef/knife/partial_search.rb
+- lib/chef/knife/partial_search/fake_node.rb
+- lib/chef/knife/partial_search/fast_search.rb
 - lib/chef/knife/partial_search/fast_ssh.rb
 - lib/chef/knife/partial_search/fast_status.rb
 - lib/chef/knife/partial_search/partial_search.rb
 - lib/chef/knife/version.rb
-homepage: https://gitlab.criteois.lan/ruby-gems/knife-partial-search
+homepage: https://github.com/criteo/knife-partial-search
 licenses:
 - Apache 2.0
 metadata: {}
@@ -109,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: Improve usual knife commands thanks to partial-search
 test_files: []
+has_rdoc: