[whimsy] branch master updated: Fix up incorrect Proposed Name entries

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 7a0d441  Fix up incorrect Proposed Name entries
7a0d441 is described below

commit 7a0d4410c796c51132ccb216a6f734cbfbf198af
Author: Sebb <se...@apache.org>
AuthorDate: Sat Nov 21 16:39:40 2020 +0000

    Fix up incorrect Proposed Name entries
    
    Also ignore abandoned issues
---
 lib/whimsy/asf/podling.rb | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/whimsy/asf/podling.rb b/lib/whimsy/asf/podling.rb
index 7b17cb8..57c2579 100644
--- a/lib/whimsy/asf/podling.rb
+++ b/lib/whimsy/asf/podling.rb
@@ -394,6 +394,17 @@ module ASF
       }
     end
 
+    # Override Proposed Names that are wrong
+    NAME_FIXES = {
+      'etch' => 'Etch', # PODLINGNAMESEARCH-6
+      'daffodil' => 'Daffodil', # PODLINGNAMESEARCH-147
+      'heron' => 'Heron', # PODLINGNAMESEARCH-128
+      'kylin' => 'Kylin', # PODLINGNAMESEARCH-86
+      'Data Lab' => 'DataLab', # PODLINGNAMESEARCH-184
+      'Open Climate Workench' => 'Open Climate Workbench', # PODLINGNAMESEARCH-26
+      'OZONE' => 'Ozone', # PODLINGNAMESEARCH-185
+    }
+
     # parse (and cache) names mentioned in podlingnamesearches
     # Note: customfield_12310520 = 'Podling', customfield_12310521 = 'Proposed Name'
     def self.namesearch
@@ -416,13 +427,21 @@ module ASF
 
       # parse JIRA titles for proposed name
       issues = JSON.parse(File.read(cache))['issues'].map do |issue|
+        resolution = issue['fields']['resolution']
+        resolution = resolution ? resolution['name'] : 'Unresolved'
+        # Ignore duplicates and abandoned entries etc.
+        next unless %w{Fixed Unresolved Resolved}.include? resolution
+
         title = issue['fields']['summary'].strip.gsub(/\s+/, ' ')
         name = issue['fields']['customfield_12310521']
 
         if name
           name.sub! /^Apache\s+/, ''
           name.gsub! /\s+\(.*?\)/, ''
-          name.sub!('Open Climate Workench', 'Open Climate Workbench') # fix up typo in PODLINGNAMESEARCH-26
+          # Fix up incorrect 'Proposed Name' entries
+          name = 'Kerby' if name == 'None atm' && issue['key'] == 'PODLINGNAMESEARCH-66'
+          name = 'Curator' if name == 'Onami' && issue['key'] == 'PODLINGNAMESEARCH-28'
+          name = NAME_FIXES[name] || name
           name = nil if name =~ /^\s*This/ or name !~ /[A-Za-z]{3}/ or name =~ %r{^N/A}
         end
 
@@ -433,8 +452,6 @@ module ASF
         name ||= title[/Is (?:Apache )?(.+?) a suitable (?:project )?name/, 1]
         name&.sub! 'Apache ', ''
         next unless name
-        resolution = issue['fields']['resolution']
-        resolution = resolution ? resolution['name'] : 'Unresolved'
 
         [name, {issue: issue['key'], resolution: resolution}]
       end