shiftzilla 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea980b30c6b791aaad697655423a68a7402b6aac013be2e62c51b4f774b57cfc
-  data.tar.gz: f4940596031fdbe16505795dc684a79be7fb3797eff0fcd860faf1dc3717bc46
+  metadata.gz: ecca05f2efb7dc60cd977affe6bfc7e48edb0e515787caabd1b27d911c293193
+  data.tar.gz: 59c344e58a8e310063df6655cd377bb1a690ac0bd0cd29d61fe55f47dbf8eddb
 SHA512:
-  metadata.gz: 0ffb536b556064cc141dfdb1f3c706ee83ff15fa454c41eafd2cb263edb66601afc9c24b77aa5e082d8871912168a1121fcd91145db787feabf01eff68a29874
-  data.tar.gz: 07eb7b345e3e72bc2b2c7e252d3fdf61668ef7bba2b0cf06cb19b1df799bd1c7005926f763801c5cfc385e6de6fb253595a986fa86d1707afe1bbd0c1e8a0f31
+  metadata.gz: 139a102ddff266faf520ebecc7439e4c6c2a77884d5b83514cd3269aa837146f08bf1538c23b1845f93a541111861b1ce0d38141dac7e80a827208d3e2acb984
+  data.tar.gz: 8840df886a38558543d2b76a2e179ae6c2cb26d1bdcecc0efaf4e46dba1b1adb5d7d9e11b38037d2157fc897bbe012e51e714b52dd62e9845f5c0bd7b5efcf7f

data/bin/shiftzilla

@@ -45,6 +45,7 @@ Description:
 
 Options:
 EOF
+    opt :purge, "After querying for bug data - if we already have data ffor today, clear it out before loading new data", :default => false
   end
 when 'build'
   Trollop::options do
@@ -98,7 +99,7 @@ check_config
 
 case cmd
 when 'load'
-  load_records
+  load_records(cmd_opts)
 when 'build'
   build_reports(cmd_opts)
 when 'purge'

data/lib/shiftzilla/bug.rb

@@ -1,33 +1,35 @@
 module Shiftzilla
   class Bug
-    attr_reader :id, :first_seen, :last_seen, :test_blocker, :ops_blocker, :owner, :component, :pm_score, :cust_cases, :tgt_release, :summary, :status
+    attr_reader :id, :first_seen, :last_seen, :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]
-      @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]
+      @id             = bzid
+      @first_seen     = binfo[:snapdate]
+      @last_seen      = binfo[:snapdate]
+      @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]
     end
 
     def update(binfo)
-      @last_seen    = binfo[:snapdate]
-      @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]
+      @last_seen      = binfo[:snapdate]
+      @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]
     end
 
     def age

data/lib/shiftzilla/engine.rb

@@ -64,14 +64,15 @@ module Shiftzilla
       end
     end
 
-    def load_records
+    def load_records(options)
       sources.each do |s|
-        if s.has_records_for_today?
+        proceed = true
+        if s.has_records_for_today? and not options[:purge]
           puts "Skipping query for #{s.id}; it already has records for today."
         else
           backup_db
           puts "Querying bugzilla for #{s.id}"
-          added_count = s.load_records
+          added_count = s.load_records(options)
           puts "Added #{added_count} records to #{s.table}"
         end
       end

data/lib/shiftzilla/org_data.rb

@@ -43,16 +43,17 @@ module Shiftzilla
 
           # Package up bug data
           binfo = {
-            :snapdate     => snapdate,
-            :test_blocker => keyw.include?('TestBlocker'),
-            :ops_blocker  => keyw.include?('OpsBlocker'),
-            :owner        => owns,
-            :summary      => summ,
-            :status       => stat,
-            :component    => comp,
-            :pm_score     => pmsc,
-            :cust_cases   => (cust == 1),
-            :tgt_release  => tgtr,
+            :snapdate       => snapdate,
+            :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,
           }
 
           tgt_release = @config.release_by_target(tgtr)
@@ -85,7 +86,7 @@ module Shiftzilla
 
             # Add info to the snapshot
             snapdata.bug_ids << bzid
-            if bug.test_blocker or bug.ops_blocker
+            if bug.test_blocker or bug.ops_blocker or bug.online_blocker
               snapdata.tb_ids << bzid
             end
             if bug.cust_cases

data/lib/shiftzilla/source.rb

@@ -21,13 +21,14 @@ module Shiftzilla
       return count > 0
     end
 
-    def load_records
+    def load_records(options)
       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}'"
       bz_csv        = `#{bz_command}`
       row_count     = 0
+      retrieved     = []
       bz_csv.split("\n").each do |row|
         values = row.split("\x1F")
         if not @external_bugs_idx.nil?
@@ -36,10 +37,20 @@ module Shiftzilla
           else
             values[@external_bugs_idx] = 0
           end
-        end  
-        dbh.execute("INSERT INTO #{@table} (#{table_fields}) VALUES (#{insert_frame})", values)
+        end
+        retrieved << values
         row_count += 1
       end
+      puts "Retrieved #{retrieved.length} rows"
+      if options[:purge] and retrieved.length > 0
+        # We know we have new data, so it is okay to nuke the old data
+        puts "Purging old records"
+        purge_records
+      end
+      puts "Loading new records"
+      retrieved.each do |values|
+        dbh.execute("INSERT INTO #{@table} (#{table_fields}) VALUES (#{insert_frame})", values)
+      end
       dbh.execute("UPDATE #{@table} SET Snapshot = date('now') WHERE Snapshot ISNULL")
       return row_count
     end

data/lib/shiftzilla/version.rb

@@ -1,3 +1,3 @@
 module Shiftzilla
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/template.haml

@@ -126,7 +126,7 @@
               %thead
                 %tr
                   %th
-                    %abbr{ :title => 'Test Blocker or Ops Blocker?' } Blocker
+                    %abbr{ :title => 'Test Blocker, Ops Blocker, or Online Blocker?' } Blocker
                   %th
                     %abbr{ :title => 'See https://mojo.redhat.com/docs/DOC-1159309' } PM
                   %th
@@ -142,8 +142,9 @@
                 - all_bugs.each do |b|
                   %tr
                     %td
-                      = b.test_blocker ? "<span class='badge badge-danger'>TB</span>" : ''
-                      = b.ops_blocker ? "<span class='badge badge-dark'>OB</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>" : ''
                     %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,14 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - N. Harrison Ripps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler