shiftzilla 0.2.31 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c2e44b571b53ef99faa54d3c5e6b54e4557143fe9f40f70bc45b4124872892
-  data.tar.gz: 9354388b6fc4a651aa283db031af0c29073b2e78094982c0e08a9f2f7ce6f672
+  metadata.gz: 357448b678ecf7a3ed4cc51f16b3b7d3b56a74000a02fdb8852197b736a884ed
+  data.tar.gz: 3e710abb67f1954f46876923377cf4a98a87c7c16378f34d743938fabfe5c722
 SHA512:
-  metadata.gz: 213b09d6780afa354c2d7e020ac369432c01a20fdeab2229c87f542084df504204a7410732edd1b49325e82b997fa54852991fabff391adac5eb39eca69997b3
-  data.tar.gz: b4fdff84e4f84291a1c832777ba872a52a88479bbdc427c8c7122490f8b6d5f8bfe837e053fe5dd44ffa981e4ce3b00d5cd69082d861c8d3a91f9d1e3ae05daf
+  metadata.gz: 5807bea1a9c395df1eb9de16a89ef9234dc09c6aa497d9bd8f91471c6928a3472d51420532ea755c3fbe2e4b2c83343723ac3edbec7e6c785db52045bc4359a3
+  data.tar.gz: 555ede112e9652153dff9354cbbc8839c2e0f6f29350a6b04ccb32747783caeaa649cf3ccb7d5d6eb7169ca408f34e02a3c3b4b712d84f890d72ded076eb8f09

data/lib/shiftzilla/source.rb

@@ -25,11 +25,31 @@ module Shiftzilla
       output_format = @fields.map{ |fld| "%{#{fld.to_s}}" }.join("\x1F")
       table_fields  = @fields.map{ |fld| "\"#{field_map[fld]}\"" }.join(',')
       insert_frame  = @fields.map{ |fld| '?' }.join(', ')
-      # Also grabs the flags to check for the blocker flag, this is dropped before inserting into the db
-      bz_command    = "bugzilla query --savedsearch #{@search} --savedsearch-sharer-id=#{@sharer} --outputformat='#{output_format}\x1F%{flags}flags||EOR'"
-
-      bz_csv        = `#{bz_command}`
+      # Previous bz_command that used the savedsearch provided by the config
+      #bz_command    = "bugzilla query --savedsearch #{@search} --savedsearch-sharer-id=#{@sharer} --outputformat='#{output_format}\x1F%{flags}flags||EOR'"
       retrieved     = []
+      bz_page_size  = 1000
+      offset        = 0
+      # Results from the query, to be split by "||EOR\n"
+      bz_csv        = ""
+
+      # Execute the bugzilla query with pagination
+      begin
+        # Generate the query via string interpolation and execute
+        # Query needs to be hard-coded here for string interpolation
+        bz_command = "bugzilla query --from-url 'https://bugzilla.redhat.com/buglist.cgi?bug_severity=unspecified&bug_severity=urgent&bug_severity=high&bug_severity=medium&bug_status=NEW&bug_status=ASSIGNED&bug_status=POST&bug_status=ON_DEV&classification=Red%20Hat&columnlist=short_desc%2Cversion%2Cbug_severity%2Cpriority%2Ccomponent%2Creporter%2Cassigned_to%2Cqa_contact%2Cbug_status%2Cproduct%2Cchangeddate%2Ctarget_release%2Ckeywords%2Cflagtypes.name%2Cbug_file_loc%2Cext_bz_list&f1=component&f10=target_release&f11=target_release&f2=component&f3=version&f4=target_release&f5=target_release&f6=target_release&f7=short_desc&f8=target_release&f9=short_desc&limit=#{bz_page_size}&list_id=12103836&o1=notequals&o10=notsubstring&o11=notsubstring&o2=notequals&o3=notregexp&o4=notsubstring&o5=notsubstring&o6=notsubstring&o7=notsubstring&o8=notsubstring&o9=notsubstring&offset=#{offset}&order=bug_status%2Cpriority%2Cassigned_to%2Cbug_id&product=OKD&product=OpenShift%20Container%20Platform&query_format=advanced&v1=Documentation&v2=RFE&v3=%5E2%5C.' --outputformat='#{output_format}\x1F%{flags}flags||EOR'"
+        bz_csv_inner = `#{bz_command}`
+
+        # Shovel results into bz_csv to parse later
+        bz_csv << bz_csv_inner
+
+        # Increase the offset by the page limit
+        offset += bz_page_size
+
+        # Repeat if we got the same number of results as the limit
+      end while bz_csv_inner.split("||EOR\n").length == bz_page_size
+
+      # Parse the results
       bz_csv.split("||EOR\n").each do |row|
         values = row.split("\x1F").map{ |v| v.strip }
 

data/lib/shiftzilla/version.rb

@@ -1,3 +1,3 @@
 module Shiftzilla
-  VERSION = "0.2.31"
+  VERSION = "0.2.32"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.32
 platform: ruby
 authors:
 - N. Harrison Ripps
 - Rory Thrasher
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ homepage: http://github.com/nhr/shiftzilla
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,9 +206,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Shiftzilla is a tool for providing historical reports based on Bugzilla data
 test_files: []