shiftzilla 0.2.27 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 589ec96b78faea1cff179d940c14be44c291d37c9b743efcac0305de6bfc1b69
-  data.tar.gz: a24c4a1a2956a7f8b78e8b68c52f78cec07881cf2aedfd64e59b48ff7cf8080b
+  metadata.gz: 56f266589322ef96d40237c0e55372228faf4e228196aa27c75f7982041e234f
+  data.tar.gz: 3dff610f59c918d39dc3ccdca5b4f3261c66c4ff1f31dfa3595a156882a22b06
 SHA512:
-  metadata.gz: d793b8af0e96001403bf3d93fcf4433c43efdd87d6120e6d787bc9122cc788f63daa78bad982387b89a46b7a9770fd3971d6a2cca85be34af0ba9f3725d528ed
-  data.tar.gz: '0396764eafc9142ebf5cfb793db4fd473d94d6f6c53f38d1cbd5694c2e3b7717a8409b4163970cbdcbd20a762efbf70d47baa8f29cf91683ff62a855f3992ea4'
+  metadata.gz: 39951d877c9e252396229c0f9cd08ecfdc72aaf1045393a2b4b96faac9065bcf7b21db8d41d2adae36a9c945d5cb5cff5e0c8744a8f592bd6e46dad161f3a96a
+  data.tar.gz: a4241ab5f9b78cec206b8b758a57b2c33bbf1bd5f03ea70e85cc6463a656d1f628d52f1be93b4c25545ddfc601e9b3ab07980701349f4067f1a823ad0fe0fcdb

data/lib/shiftzilla/helpers.rb

@@ -331,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'
@@ -40,7 +41,7 @@ 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
 
@@ -213,6 +214,7 @@ module Shiftzilla
     def generate_reports(include_groups)
       build_time  = timestamp
       all_release = @config.release('All')
+      redirects = {}
 
       @ordered_teams.each do |tname|
         tinfo = @config.team(tname)
@@ -235,9 +237,14 @@ module Shiftzilla
 
         # Check if this is actually a group "team"
         group_match = @group_teams.detect{|g| g.name == tname}
-        unless group_match.nil?
+        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|
@@ -309,6 +316,23 @@ module Shiftzilla
         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)

data/lib/shiftzilla/version.rb

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

data/template.haml

@@ -50,7 +50,7 @@
               - 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiftzilla
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.28
 platform: ruby
 authors:
 - N. Harrison Ripps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Shiftzilla is a tool for providing historical reports based on Bugzilla data