shiftzilla 0.2.30 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 984ab4e2d18746aec6f05682be91d9ea27351d55387225f1556b4144644ce82f
-  data.tar.gz: 2c80a8591161baa4c25ed9c5a6b7e433e9063bb89243dc6fd0513ea3e1421c08
+  metadata.gz: 31c2e44b571b53ef99faa54d3c5e6b54e4557143fe9f40f70bc45b4124872892
+  data.tar.gz: 9354388b6fc4a651aa283db031af0c29073b2e78094982c0e08a9f2f7ce6f672
 SHA512:
-  metadata.gz: 4670f0e251af5beefa9ff3407d0c011665d776cfe3e70c3d4bf29bd9ad2281345a7968a5b482bebe7b704fd1530171fbe26c9ae91d56c14806a5be774d0cefb1
-  data.tar.gz: 714aabd8a0cc15c49191323cd75a78ff70d8c9d309bd593785b9c5e067379353de2d86292581ca8925dd8f792cd506524ab09234637d01de7150b79ca5b550d6
+  metadata.gz: 213b09d6780afa354c2d7e020ac369432c01a20fdeab2229c87f542084df504204a7410732edd1b49325e82b997fa54852991fabff391adac5eb39eca69997b3
+  data.tar.gz: b4fdff84e4f84291a1c832777ba872a52a88479bbdc427c8c7122490f8b6d5f8bfe837e053fe5dd44ffa981e4ce3b00d5cd69082d861c8d3a91f9d1e3ae05daf

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,7 +25,9 @@ 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'"
+      # 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}`
       retrieved     = []
       bz_csv.split("||EOR\n").each do |row|
@@ -47,6 +49,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.30"
+  VERSION = "0.2.31"
 end

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.31
 platform: ruby
 authors:
 - N. Harrison Ripps
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,7 +184,7 @@ 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
@@ -206,7 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+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