whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: if missing and rejected, indicate missing
Date Sat, 24 Aug 2019 19:40:38 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys 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 9394483  if missing and rejected, indicate missing
9394483 is described below

commit 9394483158b079f37b48fd1a43532cc37b50075e
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Sat Aug 24 15:40:16 2019 -0400

    if missing and rejected, indicate missing
---
 lib/whimsy/asf/committee.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/whimsy/asf/committee.rb b/lib/whimsy/asf/committee.rb
index 544e385..0c080ef 100644
--- a/lib/whimsy/asf/committee.rb
+++ b/lib/whimsy/asf/committee.rb
@@ -136,37 +136,37 @@ module ASF
       # update/remove existing 'missing' entries
       existing = []
       block.gsub! /(.*?)# (missing|not accepted) in .*\n/ do |line|
-        if rejected.include? $1.strip
+        if missing.include? $1.strip
           existing << $1.strip
           if line.chomp.end_with? month
             line
+          elsif line.split(',').last.include? 'not accepted'
+            "#{line.chomp}, missing #{month}\n"
           else
-            "#{line.chomp}, not accepted #{month}\n"
+            "#{line.chomp}, #{month}\n"
           end
-        elsif missing.include? $1.strip
+        elsif rejected.include? $1.strip
           existing << $1.strip
           if line.chomp.end_with? month
             line
-          elsif line.split(',').last.include? 'not accepted'
-            "#{line.chomp}, missing #{month}\n"
           else
-            "#{line.chomp}, #{month}\n"
+            "#{line.chomp}, not accepted #{month}\n"
           end
         else
           ''
         end
       end
 
-      # add new 'rejected' entries
-      (rejected-existing).each do |pmc|
-        block += "    #{pmc.ljust(22)} # not accepted in #{month}\n"
-      end
-
       # add new 'missing' entries
-      (missing-rejected-existing).each do |pmc|
+      (missing-existing).each do |pmc|
         block += "    #{pmc.ljust(22)} # missing in #{month}\n"
       end
 
+      # add new 'rejected' entries
+      (rejected-missing--existing).each do |pmc|
+        block += "    #{pmc.ljust(22)} # not accepted in #{month}\n"
+      end
+
       # add new 'established' entries and remove 'terminated' entries
       month = (date+91).strftime('%B')
       todos.each do |resolution|


Mime
View raw message