shiftzilla 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cecae2d90020a501778d287e70fa660c766e91c5acb9f14fdffa6a80c86260ed
-  data.tar.gz: 5c31148722ce6bf81823b23a7188ff9e0779337059c728fa0f3fc1203c02b99a
+  metadata.gz: 589ec96b78faea1cff179d940c14be44c291d37c9b743efcac0305de6bfc1b69
+  data.tar.gz: a24c4a1a2956a7f8b78e8b68c52f78cec07881cf2aedfd64e59b48ff7cf8080b
 SHA512:
-  metadata.gz: d5f74bf58dee2608735e0724402990d207314e7e5009b66acc33caaabe06c8aa8e05dd1fa5a11ee8d0e4308d4c45371b3e54a4dbb73d71d8a65a2307d8baa113
-  data.tar.gz: 061fc2bc9251a635dd19392e13f68dd2c357fada8c54a543ec4d40320ff1bbea272d12055243a66e7314acd62fe2bde15a094f5f785d402a78064b069c7224b1
+  metadata.gz: d793b8af0e96001403bf3d93fcf4433c43efdd87d6120e6d787bc9122cc788f63daa78bad982387b89a46b7a9770fd3971d6a2cca85be34af0ba9f3725d528ed
+  data.tar.gz: '0396764eafc9142ebf5cfb793db4fd473d94d6f6c53f38d1cbd5694c2e3b7717a8409b4163970cbdcbd20a762efbf70d47baa8f29cf91683ff62a855f3992ea4'

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/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)

data/lib/shiftzilla/org_data.rb

@@ -13,6 +13,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) }
@@ -62,29 +64,42 @@ module Shiftzilla
           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
@@ -131,6 +146,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 +186,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 +210,10 @@ module Shiftzilla
       end
     end
 
-    def generate_reports
+    def generate_reports(include_groups)
       build_time  = timestamp
       all_release = @config.release('All')
+
       @ordered_teams.each do |tname|
         tinfo = @config.team(tname)
         tdata = @org_data[tname]
@@ -200,8 +229,17 @@ 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}
+        unless group_match.nil?
+          team_pinfo[:tinfo] = group_match
+          team_pinfo[:is_group] = true
+        end
+
         @releases.each do |release|
           rname    = release.name
           rdata    = tdata.has_release_data?(release) ? tdata.get_release_data(release) : nil
@@ -245,7 +283,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 +308,7 @@ module Shiftzilla
         team_page = haml_engine.render(Object.new,team_pinfo)
         File.write(File.join(@tmp_dir,tdata.file), team_page)
       end
+
       # Copy flot library to build area
       jsdir = File.join(@tmp_dir,'js')
       Dir.mkdir(jsdir)
@@ -294,18 +333,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 +403,4 @@ module Shiftzilla
       end
     end
   end
-end
+end

data/lib/shiftzilla/version.rb

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

data/template.haml

@@ -45,7 +45,8 @@
           - 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
@@ -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

metadata

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