knife-reporting 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ddd85dccb8b6601ec4f0b13f177dbb0d7d8111
-  data.tar.gz: 3b430b5e09dfe3df7a17e195b5214ebb3690e24c
+  metadata.gz: 5f8647bb414c18c46396f38ad5b1f0d90973173c
+  data.tar.gz: 7dee63aada85db02cf9db7602fb17f8b4b18368f
 SHA512:
-  metadata.gz: 6b67230bcc2ef93e2f63670694eed20c7bdc62a04662871807d60a6fae8db5061f6085cbdd5fed9e99580fe821369b1b696783ff11c68d97e5b10c17347228a2
-  data.tar.gz: 4129f3a9aff2e68b222b8c25ab0d15e5bca79e138c26a4ca67c840a1360302c817d24eb7e70b2837a110099e79242abe79de4e51bf395e10810036448a0145b5
+  metadata.gz: 9a0e1f8cc29f50462de1942de08d6187296ee03ed37ed278b71fb6f36496062745c87cbb88c35e5c06ffcdb6f61302da07f8181d17aabaabce504fac6ca0e333
+  data.tar.gz: ab466ed5f076da7d0f859ac5b6a496921067f0ad314687429847008de5685fc5f4f2ae72b5efa7ddb46bf45b954635804eb5f9fc887e54e6f80489fca63b2fd8

data/lib/chef/knife/runs_list.rb

@@ -61,8 +61,13 @@ class Chef
         :required => false,
         :description => 'Specifies the rows to be returned from the database. The default is 10.'
 
+      option :status,
+        :long => '--status STATUS',
+        :required => false,
+        :description => 'Filters by run status (success, failure, or aborted).'
+
       def run
-        @rest = Chef::REST.new(Chef::Config[:chef_server_url])
+        @rest = Chef::ServerAPI.new(Chef::Config[:chef_server_url])
 
         node_name = name_args[0]
 
@@ -70,7 +75,8 @@ class Chef
         start_time, end_time = apply_time_args()
         check_3month_window(start_time, end_time)
 
-        query_string = generate_query(start_time, end_time, node_name, config[:rows])
+        query_string = generate_query(start_time, end_time, node_name, config[:rows],
+                                      config[:status])
         runs = history(query_string)
 
         output(runs)
@@ -78,24 +84,25 @@ class Chef
 
       private
 
-      def generate_query(start_time, end_time, node_name = nil, rows = nil)
+      def generate_query(start_time, end_time, node_name = nil, rows = nil, status = nil)
+        query = '/reports'
         if node_name
-          if rows
-            "reports/nodes/#{node_name}/runs?from=#{start_time}&until=#{end_time}&rows=#{rows}"
-          else
-            "reports/nodes/#{node_name}/runs?from=#{start_time}&until=#{end_time}"
-          end
+          query += "/nodes/#{node_name}"
         else
-          if rows
-            "reports/org/runs?from=#{start_time}&until=#{end_time}&rows=#{rows}"
-          else
-            "reports/org/runs?from=#{start_time}&until=#{end_time}"
-          end
+          query += "/org"
+        end
+        query += "/runs?from=#{start_time}&until=#{end_time}"
+        if rows
+          query += "&rows=#{rows}"
         end
+        if status
+          query += "&status=#{status}"
+        end
+        query
       end
 
       def history(query_string)
-        runs = @rest.get_rest(query_string, false,  HEADERS)
+        runs = @rest.get_rest(query_string,  HEADERS)
 
         runs["run_history"].map do |run|
           { :run_id => run["run_id"],
@@ -108,4 +115,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/runs_show.rb

@@ -37,7 +37,7 @@ class Chef
       HEADERS = {'X-Ops-Reporting-Protocol-Version' => PROTOCOL_VERSION}
 
       def run
-        rest = Chef::REST.new(Chef::Config[:chef_server_url])
+        rest = Chef::ServerAPI.new(Chef::Config[:chef_server_url])
 
         run_id = name_args[0]
 
@@ -51,11 +51,11 @@ class Chef
 
         query_string = "reports/org/runs/#{run_id}"
 
-        runs = rest.get(query_string, false, HEADERS)
+        runs = rest.get(query_string, HEADERS)
 
         if runs['run_detail']['updated_res_count'] > runs['run_resources'].length
           all_query = "#{query_string}?start=0&rows=#{runs['run_detail']['updated_res_count']}"
-          runs = rest.get(all_query, false, HEADERS)
+          runs = rest.get(all_query, HEADERS)
         end
         output(runs)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-reporting
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -39,7 +39,7 @@ files:
 - lib/chef/knife/runs_list.rb
 - lib/chef/knife/runs_show.rb
 - lib/chef/reporting/knife_helpers.rb
-homepage: http://www.getchef.com/
+homepage: https://github.com/chef/knife-reporting
 licenses:
 - Apache 2
 metadata: {}
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Knife plugin for Opscode Reporting