shiftzilla 0.2.23 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6120a38d461b58efc1f748b11b18d47c28500221480b8add0857edefa7f7fe21
-  data.tar.gz: 9e5f15558b012781ff0a0936b8f3e994719427d9a4c4949fb9bbb872474356ff
+  metadata.gz: cecae2d90020a501778d287e70fa660c766e91c5acb9f14fdffa6a80c86260ed
+  data.tar.gz: 5c31148722ce6bf81823b23a7188ff9e0779337059c728fa0f3fc1203c02b99a
 SHA512:
-  metadata.gz: 5c1729bd4c0493aa0c5507778b67083abf019b973f071aaddfa6046e800b12987a7103ed1ad56f513f173e01ebbf8543f204cfdd22a4dbe059592ce856e7e5aa
-  data.tar.gz: 55eab99d47d28c12137b51927c14b092fe21fbd0e0f2602f4d1d1057f6c1bf0e515f9c28c752f0543f560d6900a451f9c4dee8bd66bd3a4175916db47aec15b1
+  metadata.gz: d5f74bf58dee2608735e0724402990d207314e7e5009b66acc33caaabe06c8aa8e05dd1fa5a11ee8d0e4308d4c45371b3e54a4dbb73d71d8a65a2307d8baa113
+  data.tar.gz: 061fc2bc9251a635dd19392e13f68dd2c357fada8c54a543ec4d40320ff1bbea272d12055243a66e7314acd62fe2bde15a094f5f785d402a78064b069c7224b1

data/lib/shiftzilla/bug.rb

@@ -1,11 +1,12 @@
 module Shiftzilla
   class Bug
-    attr_reader :id, :first_seen, :last_seen, :test_blocker, :ops_blocker, :online_blocker, :owner, :component, :pm_score, :cust_cases, :tgt_release, :summary, :status
+    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
 
     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]
@@ -20,6 +21,7 @@ module Shiftzilla
 
     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]

data/lib/shiftzilla/config.rb

@@ -6,13 +6,14 @@ require 'shiftzilla/team'
 
 module Shiftzilla
   class Config
-    attr_reader :teams, :groups, :sources, :releases, :ssh
+    attr_reader :teams, :groups, :sources, :releases, :ssh, :org_title
 
     def initialize
-      @teams    = []
-      @groups   = []
-      @sources  = []
-      group_map = {}
+      @org_title = cfg_file['OrgTitle']
+      @teams     = []
+      @groups    = []
+      @sources   = []
+      group_map  = {}
       cfg_file['Groups'].each do |group|
         gobj = Shiftzilla::Group.new(group)
         @groups << gobj

data/lib/shiftzilla/helpers.rb

@@ -191,7 +191,7 @@ module Shiftzilla
         puts "#{CFG_FILE} did not get parsed as a hash."
         exit
       end
-      missing_keys = ['Groups','Teams','Sources','Releases','SSH'].select{ |k| not raw_cfg.has_key?(k) }
+      missing_keys = ['OrgTitle','Groups','Teams','Sources','Releases','SSH'].select{ |k| not raw_cfg.has_key?(k) }
       if missing_keys.length > 0
         if missing_keys.length > 1
           puts "#{CFG_FILE} is missing the following keys: #{missing_keys.join(', ')}"
@@ -212,6 +212,11 @@ module Shiftzilla
 
       errors = []
 
+      # OrgTitle check
+      if not valid_config_string?(raw_cfg['OrgTitle'])
+        errors << "OrgTitle value is nil or zero-length"
+      end
+
       # Group checks
       list_idx  = 0
       seen_gids = {}

data/lib/shiftzilla/org_data.rb

@@ -15,7 +15,7 @@ module Shiftzilla
       @teams           = config.teams
       @releases        = config.releases
       @tmp_dir         = Shiftzilla::Helpers.tmp_dir
-      @org_data        = { '_overall' => Shiftzilla::TeamData.new('_overall') }
+      @org_data        = { '_overall' => Shiftzilla::TeamData.new('_overall',config) }
     end
 
     def populate_releases
@@ -45,6 +45,7 @@ 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'),
@@ -87,7 +88,7 @@ module Shiftzilla
 
             # Add info to the snapshot
             snapdata.bug_ids << bzid
-            if bug.test_blocker or bug.ops_blocker or bug.online_blocker
+            if bug.beta_blocker or bug.test_blocker or bug.ops_blocker or bug.online_blocker
               snapdata.tb_ids << bzid
             end
             if bug.cust_cases

data/lib/shiftzilla/release.rb

@@ -5,7 +5,7 @@ module Shiftzilla
     attr_reader :name, :targets, :milestones, :default, :token
 
     def initialize(release,builtin=false)
-      @name       = release['name']
+      @name       = release['name'].to_s
       @token      = @name.tr(' .', '_')
       @targets    = release['targets']
       @default    = release.has_key?('default') ? release['default'] : false

data/lib/shiftzilla/team_data.rb

@@ -4,17 +4,18 @@ module Shiftzilla
   class TeamData
     attr_reader :name
 
-    def initialize(tname)
+    def initialize(tname,config=nil)
       @name         = tname
+      @config       = config
       @release_data = {}
     end
 
     def title
-      @title ||= (@name == '_overall' ? 'Atomic / OpenShift' : @name)
+      @title ||= (@name == '_overall' ? @config.org_title : @name)
     end
 
     def prefix
-      @prefix ||= (@name == '_overall' ? "all_aos" : "team_#{@name.tr(' ?()', '')}")
+      @prefix ||= (@name == '_overall' ? "all_org" : "team_#{@name.tr(' ?()', '')}")
     end
 
     def file

data/lib/shiftzilla/version.rb

@@ -1,3 +1,3 @@
 module Shiftzilla
-  VERSION = "0.2.23"
+  VERSION = "0.2.26"
 end

data/shiftzilla_cfg.yml.tmpl

@@ -1,4 +1,5 @@
 ---
+OrgTitle: Org Title for Reports
 Teams:
   - name: <team name>
     lead: Jane Doe <jdoe@example.com>

data/template.haml

@@ -130,7 +130,7 @@
               %thead
                 %tr
                   %th
-                    %abbr{ :title => 'Test Blocker, Ops Blocker, or Online Blocker?' } Blocker
+                    %abbr{ :title => 'Beta Blocker, Test Blocker, Ops Blocker, or Online Blocker?' } Blocker
                   %th
                     %abbr{ :title => 'See https://mojo.redhat.com/docs/DOC-1159309' } PM
                   %th
@@ -146,6 +146,7 @@
                 - 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>" : ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.26
 platform: ruby
 authors:
 - N. Harrison Ripps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler