shiftzilla 0.2.28 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56f266589322ef96d40237c0e55372228faf4e228196aa27c75f7982041e234f
-  data.tar.gz: 3dff610f59c918d39dc3ccdca5b4f3261c66c4ff1f31dfa3595a156882a22b06
+  metadata.gz: 357448b678ecf7a3ed4cc51f16b3b7d3b56a74000a02fdb8852197b736a884ed
+  data.tar.gz: 3e710abb67f1954f46876923377cf4a98a87c7c16378f34d743938fabfe5c722
 SHA512:
-  metadata.gz: 39951d877c9e252396229c0f9cd08ecfdc72aaf1045393a2b4b96faac9065bcf7b21db8d41d2adae36a9c945d5cb5cff5e0c8744a8f592bd6e46dad161f3a96a
-  data.tar.gz: a4241ab5f9b78cec206b8b758a57b2c33bbf1bd5f03ea70e85cc6463a656d1f628d52f1be93b4c25545ddfc601e9b3ab07980701349f4067f1a823ad0fe0fcdb
+  metadata.gz: 5807bea1a9c395df1eb9de16a89ef9234dc09c6aa497d9bd8f91471c6928a3472d51420532ea755c3fbe2e4b2c83343723ac3edbec7e6c785db52045bc4359a3
+  data.tar.gz: 555ede112e9652153dff9354cbbc8839c2e0f6f29350a6b04ccb32747783caeaa649cf3ccb7d5d6eb7169ca408f34e02a3c3b4b712d84f890d72ded076eb8f09

data/lib/shiftzilla/bug.rb

@@ -1,37 +1,37 @@
 module Shiftzilla
   class Bug
-    attr_reader :id, :first_seen, :last_seen, :beta_blocker, :test_blocker, :ops_blocker, :online_blocker, :owner, :component, :pm_score, :cust_cases, :tgt_release, :summary, :status
+    attr_reader :id, :first_seen, :last_seen, :blocker_plus, :blocker_unknown, :test_blocker, :ops_blocker, :owner, :component, :pm_score, :cust_cases, :tgt_release, :summary, :status
 
     def initialize(bzid,binfo)
-      @id             = bzid
-      @first_seen     = binfo[:snapdate]
-      @last_seen      = binfo[:snapdate]
-      @beta_blocker   = binfo[:beta_blocker]
-      @test_blocker   = binfo[:test_blocker]
-      @ops_blocker    = binfo[:ops_blocker]
-      @online_blocker = binfo[:online_blocker]
-      @owner          = binfo[:owner]
-      @summary        = binfo[:summary]
-      @status         = binfo[:status]
-      @component      = binfo[:component]
-      @pm_score       = binfo[:pm_score]
-      @cust_cases     = binfo[:cust_cases]
-      @tgt_release    = binfo[:tgt_release]
+      @id              = bzid
+      @first_seen      = binfo[:snapdate]
+      @last_seen       = binfo[:snapdate]
+      @blocker_plus    = binfo[:blocker_plus]
+      @blocker_unknown = binfo[:blocker_unknown]
+      @test_blocker    = binfo[:test_blocker]
+      @ops_blocker     = binfo[:ops_blocker]
+      @owner           = binfo[:owner]
+      @summary         = binfo[:summary]
+      @status          = binfo[:status]
+      @component       = binfo[:component]
+      @pm_score        = binfo[:pm_score]
+      @cust_cases      = binfo[:cust_cases]
+      @tgt_release     = binfo[:tgt_release]
     end
 
     def update(binfo)
-      @last_seen      = binfo[:snapdate]
-      @beta_blocker   = binfo[:beta_blocker]
-      @test_blocker   = binfo[:test_blocker]
-      @ops_blocker    = binfo[:ops_blocker]
-      @online_blocker = binfo[:online_blocker]
-      @owner          = binfo[:owner]
-      @summary        = binfo[:summary]
-      @status         = binfo[:status]
-      @component      = binfo[:component]
-      @pm_score       = binfo[:pm_score]
-      @cust_cases     = binfo[:cust_cases]
-      @tgt_release    = binfo[:tgt_release]
+      @last_seen       = binfo[:snapdate]
+      @blocker_plus    = binfo[:blocker_plus]
+      @blocker_unknown = binfo[:blocker_unknown]
+      @test_blocker    = binfo[:test_blocker]
+      @ops_blocker     = binfo[:ops_blocker]
+      @owner           = binfo[:owner]
+      @summary         = binfo[:summary]
+      @status          = binfo[:status]
+      @component       = binfo[:component]
+      @pm_score        = binfo[:pm_score]
+      @cust_cases      = binfo[:cust_cases]
+      @tgt_release     = binfo[:tgt_release]
     end
 
     def age
@@ -66,4 +66,4 @@ module Shiftzilla
       val.to_f.to_s == val.to_s || val.to_i.to_s == val.to_s
     end
   end
-end
+end

data/lib/shiftzilla/org_data.rb

@@ -47,18 +47,18 @@ module Shiftzilla
 
           # Package up bug data
           binfo = {
-            :snapdate       => snapdate,
-            :beta_blocker   => keyw.include?('BetaBlocker'),
-            :test_blocker   => keyw.include?('TestBlocker'),
-            :ops_blocker    => keyw.include?('OpsBlocker'),
-            :online_blocker => keyw.include?('OnlineStarter'),
-            :owner          => owns,
-            :summary        => summ,
-            :status         => stat,
-            :component      => comp,
-            :pm_score       => pmsc,
-            :cust_cases     => (cust == 1),
-            :tgt_release    => tgtr,
+            :snapdate        => snapdate,
+            :blocker_plus    => keyw.include?('blocker+'),
+            :blocker_unknown => keyw.include?('blocker?'),
+            :test_blocker    => keyw.include?('TestBlocker'),
+            :ops_blocker     => keyw.include?('ServiceDeliveryBlocker'),
+            :owner           => owns,
+            :summary         => summ,
+            :status          => stat,
+            :component       => comp,
+            :pm_score        => pmsc,
+            :cust_cases      => (cust == 1),
+            :tgt_release     => tgtr,
           }
 
           tgt_release = @config.release_by_target(tgtr)
@@ -104,7 +104,8 @@ module Shiftzilla
 
             # Add info to the snapshot
             snapdata.bug_ids << bzid
-            if bug.beta_blocker or bug.test_blocker or bug.ops_blocker or bug.online_blocker
+            # Only the blocker+ flag counts as a blocker for snapshots
+            if bug.blocker_plus
               snapdata.tb_ids << bzid
             end
             if bug.cust_cases

data/lib/shiftzilla/source.rb

@@ -25,9 +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(', ')
-      bz_command    = "bugzilla query --savedsearch #{@search} --savedsearch-sharer-id=#{@sharer} --outputformat='#{output_format}||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 }
 
@@ -47,6 +69,28 @@ module Shiftzilla
             values[@external_bugs_idx] = 0
           end
         end
+
+        # Check for blocker+ flag and stub it as a keyword
+        if not values[-1].nil? and values[-1].include?("blocker+")
+          keyword_idx = @fields.index(:keywords)
+          if not values[keyword_idx]
+            values[keyword_idx] = "blocker+"
+          else
+            values[keyword_idx] = values[keyword_idx] + ",blocker+"
+          end
+        end
+        # Check for blocker? flag and stub it as a keyword
+        if not values[-1].nil? and values[-1].include?("blocker?")
+          keyword_idx = @fields.index(:keywords)
+          if not values[keyword_idx]
+            values[keyword_idx] = "blocker?"
+          else
+            values[keyword_idx] = values[keyword_idx] + ",blocker?"
+          end
+        end
+
+        # Remove flags, which is always the final value
+        values = values[0...-2]
         retrieved << values
       end
       puts "Retrieved #{retrieved.length} rows"

data/lib/shiftzilla/version.rb

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

data/shiftzilla.gemspec

@@ -6,8 +6,8 @@ require 'shiftzilla/version'
 Gem::Specification.new do |spec|
   spec.name          = "shiftzilla"
   spec.version       = Shiftzilla::VERSION
-  spec.authors       = ["N. Harrison Ripps"]
-  spec.email         = ["nhr@redhat.com"]
+  spec.authors       = ["N. Harrison Ripps","Rory Thrasher"]
+  spec.email         = ["nhr@redhat.com","rthrashe@redhat.com"]
   spec.summary       = %q{Shiftzilla is a tool for providing historical reports based on Bugzilla data}
   spec.description   = spec.summary
   spec.homepage      = "http://github.com/nhr/shiftzilla"

data/template.haml

@@ -153,7 +153,7 @@
               %thead
                 %tr
                   %th
-                    %abbr{ :title => 'Beta Blocker, Test Blocker, Ops Blocker, or Online Blocker?' } Blocker
+                    %abbr{ :title => 'Blocker flags and keywords' } Blocker
                   %th
                     %abbr{ :title => 'See https://mojo.redhat.com/docs/DOC-1159309' } PM
                   %th
@@ -169,10 +169,10 @@
                 - all_bugs.each do |b|
                   %tr
                     %td
-                      = b.beta_blocker ? "<span class='badge badge-info'>&#946;eta</span>" : ''
-                      = b.test_blocker ? "<span class='badge badge-danger'>Test</span>" : ''
-                      = b.ops_blocker ? "<span class='badge badge-dark'>Ops</span>" : ''
-                      = b.online_blocker ? "<span class='badge badge-warning'>Online</span>" : ''
+                      = b.blocker_plus ? "<span class='badge badge-danger'>&#914;locker+</span>" : ''
+                      = b.blocker_unknown ? "<span class='badge badge-info'>blocker?</span>" : ''
+                      = b.test_blocker ? "<span class='badge badge-warning'>Test</span>" : ''
+                      = b.ops_blocker ? "<span class='badge badge-dark'>SD</span>" : ''
                     %td= b.pm_score
                     %td= b.cust_cases ? "<span class='badge badge-warning'>CC</span>" : ''
                     %td(data-order="#{b.semver}")= b.tgt_release

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.32
 platform: ruby
 authors:
 - N. Harrison Ripps
-autorequire: 
+- Rory Thrasher
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,6 +157,7 @@ description: Shiftzilla is a tool for providing historical reports based on Bugz
   data
 email:
 - nhr@redhat.com
+- rthrashe@redhat.com
 executables:
 - shiftzilla
 extensions: []
@@ -182,14 +184,14 @@ files:
 - lib/shiftzilla/version.rb
 - shiftzilla.gemspec
 - shiftzilla.sql.tmpl
-- shiftzilla_cfg.yml.tmpl
+- shiftzilla_cfg.yaml.tmpl
 - template.haml
 - vendor/flot/jquery.flot.min.js
 homepage: http://github.com/nhr/shiftzilla
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +206,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.7
+signing_key:
 specification_version: 4
 summary: Shiftzilla is a tool for providing historical reports based on Bugzilla data
 test_files: []