knife-chef-inventory 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 891a467a33c1abb7858971a44f1fe4bf5a3ca027
-  data.tar.gz: 821c5da2b406afddd996d41256c46987fd87408d
+  metadata.gz: f91812999c2632572f1862649d09185a48168365
+  data.tar.gz: 049e4042535631445f08bc3f76778a269b566b71
 SHA512:
-  metadata.gz: bd37739b7bcd75d96a883690a91cfcfe555e6ef4fa2b5fd5ae9873e6491675ec44a206a44d2e7853759f0562f6b2f511a8bc9c3a7dc544973388041faa0b55f4
-  data.tar.gz: f61c912efc5a9db935c6307e8a4a52434922637569327363e8fea9d1f366e19fc3303496e7448cb8076bddde4b6a6e19906b3cf63558a77bea3a36f6598c09cb
+  metadata.gz: 53026cc6ccf258fd7bd223a548cc9c9f9022c73e4bae4baa421aabc408edd73afb3c5744b8b26005b6c6266ff6d8a1bd5b9dc5756efc5fd6f4906bc2f24c83f2
+  data.tar.gz: ea2aebfd0fe1456a9802d874a9db92cc92f26b235e998ed47e4694c1d39ca73109e18e377b29b75744f108715c2b7e04afd22fc9cc7ae5ab33b56db4dd3c39c6

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v0.2.1](https://github.com/brentm5/knife-chef-inventory/tree/v0.2.1) (2016-08-19)
+[Full Changelog](https://github.com/brentm5/knife-chef-inventory/compare/v0.2.0...v0.2.1)
+
+**Merged pull requests:**
+
+- Improve performance by switching to partial search [\#14](https://github.com/brentm5/knife-chef-inventory/pull/14) ([brentm5](https://github.com/brentm5))
+- Fix issue where only first 1000 nodes get returned [\#13](https://github.com/brentm5/knife-chef-inventory/pull/13) ([brentm5](https://github.com/brentm5))
+- Fix deprecation warnings for chef 13 when accessing nodes [\#10](https://github.com/brentm5/knife-chef-inventory/pull/10) ([brentm5](https://github.com/brentm5))
+
 ## [v0.2.0](https://github.com/brentm5/knife-chef-inventory/tree/v0.2.0) (2016-08-16)
 [Full Changelog](https://github.com/brentm5/knife-chef-inventory/compare/v0.1.0...v0.2.0)
 
@@ -12,16 +21,9 @@
 
 **Merged pull requests:**
 
-- Add changelog generator and cleanup naming [\#7](https://github.com/brentm5/knife-chef-inventory/pull/7) ([brentm5](https://github.com/brentm5))
 - Update banner for inventory\_cookbook.rb [\#6](https://github.com/brentm5/knife-chef-inventory/pull/6) ([afiune](https://github.com/afiune))
-- Add more information to readme [\#4](https://github.com/brentm5/knife-chef-inventory/pull/4) ([brentm5](https://github.com/brentm5))
-- Add more to the readme and fix travis [\#3](https://github.com/brentm5/knife-chef-inventory/pull/3) ([brentm5](https://github.com/brentm5))
 
 ## [v0.0.1](https://github.com/brentm5/knife-chef-inventory/tree/v0.0.1) (2016-05-12)
-**Merged pull requests:**
-
-- Update to be called knife-chef-inventory [\#2](https://github.com/brentm5/knife-chef-inventory/pull/2) ([brentm5](https://github.com/brentm5))
-
 
 
 \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/knife-chef-inventory.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = "~> 2.1"
 
-  s.add_dependency "chef", "<= 12.11.18"
+  s.add_dependency "chef", "~> 12.11"
 
   s.add_development_dependency "bundler", "~> 1.6"
   s.add_development_dependency "rake", "~> 11.1"

data/lib/chef/knife/inventory_chef_client.rb

@@ -1,9 +1,10 @@
-# frozen_string_literal: true
 require "chef/knife"
+require "knife-chef-inventory/shared"
 
 class Chef
   class Knife
     class InventoryChefClient < Knife
+      include KnifeChefInventory::Shared
       banner "knife inventory chef_client"
 
       deps do
@@ -35,14 +36,21 @@ class Chef
         @client_version_nodes ||= search_nodes("chef_packages_chef_version:#{@client_version}")
       end
 
-      def search_nodes(query)
-        Chef::Search::Query.new.search(:node, query).first
+      def search_args
+        {
+          rows: max_results,
+          filter_result: {
+            name: ["name"],
+            chef_version: %w(chef_packages chef version),
+            ohai_time: ["ohai_time"]
+          }
+        }
       end
 
       def client_usage_per_version
         version_map = Hash.new(0)
         all_nodes.each do |node|
-          version = node.chef_packages.chef.version
+          version = node["chef_version"]
 
           version_map[version] += 1
         end
@@ -61,14 +69,10 @@ class Chef
         ui.info "#{version} is used by #{client_usage} hosts" if client_usage > 0
       end
 
-      def time_since(timestamp)
-        (Time.now - Time.at(timestamp)).to_i / 60
-      end
-
       def output_version_analysis
         ui.info "Client Versions being used"
-        client_version_nodes.sort_by(&:ohai_time).each do |node|
-          ui.info "#{node.name} - #{time_since(node.ohai_time)} Minutes"
+        client_version_nodes.sort_by { |node| node["ohai_time"] }.each do |node|
+          ui.info "#{node['name']} - #{time_since(node['ohai_time'])} Minutes"
         end
       end
 

data/lib/chef/knife/inventory_cookbook.rb

@@ -1,9 +1,10 @@
-# frozen_string_literal: true
 require "chef/knife"
+require "knife-chef-inventory/shared"
 
 class Chef
   class Knife
     class InventoryCookbook < Knife
+      include KnifeChefInventory::Shared
       banner "knife inventory cookbook COOKBOOK [VERSION] (options)"
 
       deps do
@@ -67,8 +68,15 @@ class Chef
         @environment_versions
       end
 
-      def search_nodes(query)
-        Chef::Search::Query.new.search(:node, query).first
+      def search_args
+        {
+          rows: max_results,
+          filter_result: {
+            name: ["name"],
+            cookbook_version: ["cookbooks", @cookbook_name, "version"],
+            ohai_time: ["ohai_time"]
+          }
+        }
       end
 
       def all_cookbook_versions
@@ -78,7 +86,7 @@ class Chef
       def cookbook_usage_per_version
         version_map = Hash.new(0)
         cookbook_nodes.each do |node|
-          version = node.cookbooks[@cookbook_name].version
+          version = node["cookbook_version"]
 
           version_map[version] += 1
         end
@@ -104,14 +112,10 @@ class Chef
         end
       end
 
-      def time_since(timestamp)
-        (Time.now - Time.at(timestamp)).to_i / 60
-      end
-
       def output_version_analysis
         ui.info "Cookbook Versions being used for #{@cookbook_name}"
-        cookbook_version_nodes.sort_by(&:ohai_time).each do |node|
-          ui.info "#{node.name} - #{time_since(node.ohai_time)} Minutes"
+        cookbook_version_nodes.sort_by { |node| node["ohai_time"] }.each do |node|
+          ui.info "#{node['name']} - #{time_since(node['ohai_time'])} Minutes"
         end
       end
 

data/lib/knife-chef-inventory/shared.rb

@@ -0,0 +1,15 @@
+module KnifeChefInventory
+  module Shared
+    def time_since(timestamp)
+      (Time.now - Time.at(timestamp)).to_i / 60
+    end
+
+    def search_nodes(query)
+      Chef::Search::Query.new.search(:node, query, search_args).first
+    end
+
+    def max_results
+      Chef::Node.list.count || 1000
+    end
+  end
+end

data/lib/knife-chef-inventory/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Knife
   module ChefInventory
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-chef-inventory
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brent Montague
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.11.18
+        version: '12.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.11.18
+        version: '12.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,7 @@ files:
 - knife-chef-inventory.gemspec
 - lib/chef/knife/inventory_chef_client.rb
 - lib/chef/knife/inventory_cookbook.rb
+- lib/knife-chef-inventory/shared.rb
 - lib/knife-chef-inventory/version.rb
 - tasks/changelog.rake
 homepage: https://github.com/brentm5/knife-chef-inventory