shiftzilla 0.2.26 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cecae2d90020a501778d287e70fa660c766e91c5acb9f14fdffa6a80c86260ed
-  data.tar.gz: 5c31148722ce6bf81823b23a7188ff9e0779337059c728fa0f3fc1203c02b99a
+  metadata.gz: 31c2e44b571b53ef99faa54d3c5e6b54e4557143fe9f40f70bc45b4124872892
+  data.tar.gz: 9354388b6fc4a651aa283db031af0c29073b2e78094982c0e08a9f2f7ce6f672
 SHA512:
-  metadata.gz: d5f74bf58dee2608735e0724402990d207314e7e5009b66acc33caaabe06c8aa8e05dd1fa5a11ee8d0e4308d4c45371b3e54a4dbb73d71d8a65a2307d8baa113
-  data.tar.gz: 061fc2bc9251a635dd19392e13f68dd2c357fada8c54a543ec4d40320ff1bbea272d12055243a66e7314acd62fe2bde15a094f5f785d402a78064b069c7224b1
+  metadata.gz: 213b09d6780afa354c2d7e020ac369432c01a20fdeab2229c87f542084df504204a7410732edd1b49325e82b997fa54852991fabff391adac5eb39eca69997b3
+  data.tar.gz: b4fdff84e4f84291a1c832777ba872a52a88479bbdc427c8c7122490f8b6d5f8bfe837e053fe5dd44ffa981e4ce3b00d5cd69082d861c8d3a91f9d1e3ae05daf

data/bin/shiftzilla

@@ -66,6 +66,7 @@ EOF
     opt :quiet, "For cron use; don't print anything to STDOUT.", :default => false
     opt :cfgpath, "Specify a config file for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla_cfg.yaml"
     opt :dbpath, "Specify a database file location for shiftzilla to use.", :default => "#{DEFAULT_DIR}/shiftzilla.sqlite"
+    opt :groups, "Enable group aggregation table on main page", :default => false
   end
 when 'purge'
   Optimist::options do

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/config.rb

@@ -22,6 +22,7 @@ module Shiftzilla
       cfg_file['Teams'].each do |team|
         @teams << Shiftzilla::Team.new(team,group_map)
       end
+      set_group_components
       cfg_file['Sources'].each do |sid,sinfo|
         @sources << Shiftzilla::Source.new(sid,sinfo)
       end
@@ -50,6 +51,10 @@ module Shiftzilla
       @teams.select{ |t| t.name == tname }[0]
     end
 
+    def group(gname)
+      @groups.select{ |g| g.id == gname[0] }[0]
+    end
+
     def add_ad_hoc_team(tinfo)
       @teams << Shiftzilla::Team.new(tinfo,{},true)
     end
@@ -95,5 +100,18 @@ module Shiftzilla
         boundaries
       end
     end
+
+    def set_group_components
+      @groups.each do |g|
+        components = []
+        @teams.each do |t|
+          if t.group and (t.group.id == g.id)
+            components += t.components
+          end
+        end
+        g.set_components(components)
+      end
+    end
+
   end
 end

data/lib/shiftzilla/engine.rb

@@ -113,7 +113,7 @@ module Shiftzilla
       org_data = Shiftzilla::OrgData.new(shiftzilla_config)
       org_data.populate_releases
       org_data.build_series
-      org_data.generate_reports
+      org_data.generate_reports(options[:groups])
       if options[:local_preview]
         org_data.show_local_reports
       else

data/lib/shiftzilla/group.rb

@@ -1,10 +1,16 @@
 module Shiftzilla
   class Group
-    attr_reader :id, :lead
+    attr_reader :name, :id, :lead, :components
 
     def initialize(ginfo)
-      @id    = ginfo['id']
-      @lead  = ginfo['lead']
+      @name        = "Group " + ginfo['id']
+      @id          = ginfo['id']
+      @lead        = ginfo['lead']
     end
+
+    def set_components(component_list)
+      @components ||= component_list
+    end
+
   end
-end
+end

data/lib/shiftzilla/helpers.rb

@@ -249,6 +249,8 @@ module Shiftzilla
           errors << "Team at index #{list_idx} is missing the 'name' key."
         elsif not valid_config_string?(team['name'])
           errors << "Team at index #{list_idx} has a nil or zero-length 'name'."
+        elsif team['name'].start_with?("Group")
+          errors << "Team at index #{list_idx} begins with the string 'Group'."
         else
           tnm = team['name']
           if seen_tnms.has_key?(tnm)
@@ -329,10 +331,14 @@ module Shiftzilla
               if not milestones.has_key?(ms)
                 errors << "Release at index #{list_idx} is missing the '#{ms}' milestone."
               else
+                if milestones[ms] == 'today' or !!(milestones[ms] =~ /today[+-]\d+[dwms]/)
+                  # Matches the variable date format
+                  next
+                end
                 ms_date = milestones[ms].split('-')
                 if ms_date.length == 3 and ms_date[0].length == 4 and ms_date[1].length == 2 and ms_date[2].length == 2
                 else
-                  errors << "Release at index #{list_idx}: milestone '#{ms}' is not formatted correctly (YYYY-MM-DD)."
+                  errors << "Release at index #{list_idx}: milestone '#{ms}' is not formatted correctly - (YYYY-MM-DD) or (today[+-]X[dwms])."
                 end
               end
             end

data/lib/shiftzilla/milestone.rb

@@ -1,9 +1,14 @@
+require 'date'
+
 module Shiftzilla
   class Milestone
     def initialize(mtxt)
       @date  = nil
       @stamp = ''
-      unless (mtxt.nil? or mtxt == '')
+      if mtxt.start_with?('today')
+        @date = variable_date(mtxt)
+        @stamp = @date.strftime('%Y-%m-%d')
+      elsif not (mtxt.nil? or mtxt == '')
         @date  = Date.parse(mtxt)
         @stamp = mtxt
       end
@@ -16,5 +21,42 @@ module Shiftzilla
     def stamp
       @stamp
     end
+
+    private
+
+    def variable_date(d)
+      # Takes a variable date string and returns the appropriate date object
+      # Variable dates of the form today[+,-]#[d,w,m,s]
+      today = Date.today
+
+      if d.length < 8
+        return today
+      end
+
+      operation = d[5]
+      val = d[6..-2].to_i
+      unit = d[-1]
+      days = 0
+
+      # Convert to days for simple addition
+      case unit
+      when 'd'
+        days = val
+      when 'w'
+        days = 7*val
+      when 'm'
+        days = 30*val
+      when 's'      # Sprints
+        days = 21*val
+      else
+        days = val
+      end
+
+      if operation == '-'
+        days = days * -1
+      end
+
+      return today+days
+    end
   end
 end

data/lib/shiftzilla/org_data.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'json'
+require 'uri'
 require 'shiftzilla/bug'
 require 'shiftzilla/helpers'
 require 'shiftzilla/team_data'
@@ -13,6 +14,8 @@ module Shiftzilla
     def initialize(config)
       @config          = config
       @teams           = config.teams
+      @groups          = config.groups
+      @group_teams     = []
       @releases        = config.releases
       @tmp_dir         = Shiftzilla::Helpers.tmp_dir
       @org_data        = { '_overall' => Shiftzilla::TeamData.new('_overall',config) }
@@ -38,57 +41,71 @@ module Shiftzilla
 
           # TODO: REMOVE BUSINESS LOGIC EMBEDDED IN CODE
           if comp == 'Security' and keyw.include?('Unconfirmed')
-            puts "NB: This report has a hardcoded exclusion of 'Security' component bugs with the 'Unconfirmed' keyword."
+            # This report has a hardcoded exclusion of 'Security' component bugs with the 'Unconfirmed' keyword."
             next
           end
 
           # 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)
           all_release = @config.release('All')
 
           # If this component isn't mapped to a team, stub out a fake team.
-          tname = comp_map.has_key?(comp) ? comp_map[comp] : "(?) #{comp}"
+          tname = team_comp_map.has_key?(comp) ? team_comp_map[comp] : "(?) #{comp}"
           unless @org_data.has_key?(tname)
             @config.add_ad_hoc_team({ 'name' => tname, 'components' => [comp] })
             @org_data[tname] = Shiftzilla::TeamData.new(tname)
           end
 
+          # Generate TeamData objects for each group
+          gname = group_comp_map.has_key?(comp) ? group_comp_map[comp] : nil
+          if not gname.nil? and not @org_data.has_key?(gname)
+            @org_data[gname] = Shiftzilla::TeamData.new(gname)
+          end
+
           team_rdata = tgt_release.nil? ? nil : @org_data[tname].get_release_data(tgt_release)
           team_adata = @org_data[tname].get_release_data(all_release)
           over_rdata = tgt_release.nil? ? nil : @org_data['_overall'].get_release_data(tgt_release)
           over_adata = @org_data['_overall'].get_release_data(all_release)
+          unless gname.nil?
+            group_rdata = tgt_release.nil? ? nil : @org_data[gname].get_release_data(tgt_release)
+            group_adata = @org_data[gname].get_release_data(all_release)
+          else
+            group_rdata = nil
+            group_adata = nil
+          end
 
           # Do some bean counting
-          [over_rdata,team_rdata,over_adata,team_adata].each do |group|
-            next if group.nil?
-            snapdata = group.get_snapdata(snapshot)
-            if group.first_snap.nil?
-              group.first_snap     = snapshot
-              group.first_snapdate = snapdate
+          [over_rdata,team_rdata,over_adata,team_adata,group_rdata,group_adata].each do |grouping|
+            next if grouping.nil?
+            snapdata = grouping.get_snapdata(snapshot)
+            if grouping.first_snap.nil?
+              grouping.first_snap     = snapshot
+              grouping.first_snapdate = snapdate
             end
-            group.latest_snap     = snapshot
-            group.latest_snapdate = snapdate
+            grouping.latest_snap     = snapshot
+            grouping.latest_snapdate = snapdate
 
-            bug = group.add_or_update_bug(bzid,binfo)
+            bug = grouping.add_or_update_bug(bzid,binfo)
 
             # 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
@@ -131,6 +148,18 @@ module Shiftzilla
           end
         end
       end
+
+      # Create a "team" for each group here
+      @groups.each do |g|
+        ginfo = {
+          'name' => g.name,
+          'lead' => g.lead,
+          'group' => g.id,
+          'components' => g.components,
+        }
+        @group_teams << Shiftzilla::Team.new(ginfo, {g.id => g})
+      end
+
       @all_teams     = @teams.map{ |t| t.name }.concat(@org_data.keys).uniq
       @ordered_teams = ['_overall'].concat(@all_teams.select{ |t| t != '_overall'}.sort)
     end
@@ -159,6 +188,7 @@ module Shiftzilla
           :tname          => tdata.title,
           :file           => tdata.file,
           :releases       => {},
+          :is_group       => (not @group_teams.detect{|g| g.name == tdata.title}.nil?),
         }
 
         @releases.each do |release|
@@ -182,9 +212,11 @@ module Shiftzilla
       end
     end
 
-    def generate_reports
+    def generate_reports(include_groups)
       build_time  = timestamp
       all_release = @config.release('All')
+      redirects = {}
+
       @ordered_teams.each do |tname|
         tinfo = @config.team(tname)
         tdata = @org_data[tname]
@@ -200,8 +232,22 @@ module Shiftzilla
           :releases        => [],
           :latest_snapshot => latest_snapshot,
           :all_bugs        => [],
+          :include_groups  => include_groups,
+          :is_group        => false,
         }
 
+        # Check if this is actually a group "team"
+        group_match = @group_teams.detect{|g| g.name == tname}
+        if not group_match.nil?
+          team_pinfo[:tinfo] = group_match
+          team_pinfo[:is_group] = true
+        elsif not tinfo.nil?
+          # Generate component -> team redirects
+          tinfo.components.each do |component|
+            redirects[component] = tdata.file
+          end
+        end
+
         @releases.each do |release|
           rname    = release.name
           rdata    = tdata.has_release_data?(release) ? tdata.get_release_data(release) : nil
@@ -245,7 +291,7 @@ module Shiftzilla
                     :data  => rdata.series[:closed_bugs],
                   },
               ]),
-              :blockers   => chartify('Test / Ops Blockers',rdata.series[:date],[
+              :blockers   => chartify('Blockers',rdata.series[:date],[
                   {
                     :label => 'Total',
                     :data  => rdata.series[:total_tb],
@@ -270,6 +316,24 @@ module Shiftzilla
         team_page = haml_engine.render(Object.new,team_pinfo)
         File.write(File.join(@tmp_dir,tdata.file), team_page)
       end
+
+      # Create component->team redirects
+      redirects.each do |component, team_file|
+        redirect_html = <<-HTML
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Refresh" content="0; url=#{team_file}" />
+  </head>
+  <body>
+    <p>Redirecting to <a href="#{team_file}">team page</a>...</p>
+  </body>
+</html>
+HTML
+        File.write(File.join(@tmp_dir, "component_#{component}.html"), redirect_html)
+      end
+
+
       # Copy flot library to build area
       jsdir = File.join(@tmp_dir,'js')
       Dir.mkdir(jsdir)
@@ -294,18 +358,33 @@ module Shiftzilla
 
     private
 
-    def comp_map
-      @comp_map ||= begin
-        comp_map = {}
+    def team_comp_map
+      @team_comp_map ||= begin
+        team_comp_map = {}
         @teams.each do |team|
           team.components.each do |comp|
-            comp_map[comp] = team.name
+            team_comp_map[comp] = team.name
           end
         end
-        comp_map
+        team_comp_map
       end
     end
 
+    # Creates group component mapping
+    def group_comp_map
+      @group_comp_map ||= begin
+        group_comp_map = {}
+        @groups.each do |group|
+          group.components.each do |comp|
+            group_comp_map[comp] = group.name
+          end
+        end
+        group_comp_map
+      end
+    end
+
+
+
     def chartify(title,dates,series)
       modulo = label_modulo(dates.length)
       tlist  = []
@@ -349,4 +428,4 @@ module Shiftzilla
       end
     end
   end
-end
+end

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.26"
+  VERSION = "0.2.31"
 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

@@ -45,11 +45,12 @@
           - if tname != '_overall' and not tinfo.nil? and not tinfo.ad_hoc?
             %h5 Team Info
             %ul
-              %li= "Team Lead: #{tinfo.lead}"
+              - unless is_group
+                %li= "Team Lead: #{tinfo.lead}"
               - if not tinfo.group.nil? and not tinfo.group.lead.nil?
                 %li= "Group Lead: #{tinfo.group.lead}"
               - if tinfo.components.length > 0
-                %li= "BZ Component(s): #{tinfo.components.join(', ')}"
+                %li= "BZ Component(s): " + tinfo.components.map{ |c| "<a href='component_#{c}.html'>#{c}</a>"}.join(', ')
           %h5= "#{tdisp} Summary"
           %table.table.table-hover.table-sm
             %tr
@@ -69,7 +70,7 @@
               - releases.each do |r|
                 %td.text-right= r[:bug_avg_age]
             %tr
-              %td Avg. Test Blocker Age
+              %td Avg. Blocker Age
               - releases.each do |r|
                 %td.text-right= r[:tb_avg_age]
             %tr
@@ -81,7 +82,7 @@
               - releases.each do |r|
                 %td.text-right= r[:snapdata].closed_bugs
             %tr
-              %td Test / Ops Blockers
+              %td Blockers
               - releases.each do |r|
                 %td.text-right= r[:snapdata].total_tb
             %tr
@@ -92,6 +93,26 @@
               %td Closed Blockers Yesterday
               - releases.each do |r|
                 %td.text-right= r[:snapdata].closed_tb
+
+          - if tname == '_overall' and include_groups
+            %h5 Totals By Group
+            %table.table.table-hover.table-sm
+              %tr
+                %td Group
+                - releases.each do |r|
+                  %td.text-right= r[:release].name
+              - team_files.each do |tm|
+                - unless tm[:is_group]
+                  - next
+                %tr
+                  %td
+                    - if tm[:tname] == tdisp
+                      = tdisp
+                    - else
+                      %a{ :href => tm[:file] }= tm[:tname]
+                  - releases.each do |r|
+                    %td.text-right= tm[:releases][r[:release].name]
+
           - if tname == '_overall'
             %h5 Totals By Team
             %table.table.table-hover.table-sm
@@ -100,6 +121,8 @@
                 - releases.each do |r|
                   %td.text-right= r[:release].name
               - team_files.each do |tm|
+                - if tm[:is_group]
+                  - next
                 %tr
                   %td
                     - if tm[:tname] == tdisp
@@ -130,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
@@ -146,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.26
+  version: 0.2.31
 platform: ruby
 authors:
 - N. Harrison Ripps
+- Rory Thrasher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2020-11-02 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,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
@@ -204,7 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+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