[whimsy] branch master updated: Eliminate magic path; use File.join()

[sebb]

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 780c912  Eliminate magic path; use File.join()
780c912 is described below

commit 780c9124d11033d6cfa05827acbcd19ec0d13688
Author: Sebb <s...@apache.org>
AuthorDate: Fri Jun 12 17:59:20 2020 +0100

    Eliminate magic path; use File.join()
---
 www/board/agenda/views/actions/publish.json.rb | 32 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/www/board/agenda/views/actions/publish.json.rb 
b/www/board/agenda/views/actions/publish.json.rb
index 1508dbe..2b31e8b 100755
--- a/www/board/agenda/views/actions/publish.json.rb
+++ b/www/board/agenda/views/actions/publish.json.rb
@@ -5,9 +5,8 @@
 require 'date'
 require 'whimsy/asf/svn'
 
-CONTENT = 'asf/infrastructure/site/trunk/content'
-BOARD_SITE = ASF::SVN["#{CONTENT}/foundation/board"]
-MINUTES = ASF::SVN["#{CONTENT}/foundation/records/minutes"]
+BOARD_SITE = ASF::SVN['site-board']
+MINUTES = ASF::SVN['minutes']
 BOARD_PRIVATE = ASF::SVN['foundation_board']
 CALENDAR = File.join(BOARD_SITE, 'calendar.mdtext')
 
@@ -43,6 +42,8 @@ end
 # remove from calendar
 calendar.sub! /^(\s*[*-]\s+#{fdate}\s*?\n)/, ''
 
+minutes = "board_minutes_#{@date}.txt"
+
 #Commit the Minutes
 ASF::SVN.update MINUTES, @message, env, _ do |tmpdir|
   yeardir = File.join(tmpdir, year.to_s).untaint
@@ -53,9 +54,10 @@ ASF::SVN.update MINUTES, @message, env, _ do |tmpdir|
     _.system "svn add #{yeardir}"
   end
 
-  if not File.exist? File.join(yeardir, "board_minutes_#{@date}.txt")
-    _.system "cp #{BOARD_PRIVATE}/board_minutes_#{@date}.txt #{yeardir}"
-    _.system "svn add #{yeardir}/board_minutes_#{@date}.txt"
+  year_minutes = File.join(yeardir, minutes)
+  if not File.exist? year_minutes
+    _.system "cp #{File.join(BOARD_PRIVATE, minutes)} #{yeardir}"
+    _.system "svn add #{year_minutes}"
   end
 end
 
@@ -68,16 +70,18 @@ end
 
 # Clean up board directory
 ASF::SVN.update BOARD_PRIVATE, @message, env, _ do |tmpdir|
-  _.system "svn up #{tmpdir}/board_minutes_#{@date}.txt"
-  if File.exist? "#{tmpdir}/board_minutes_#{@date}.txt"
-    _.system "svn rm #{tmpdir}/board_minutes_#{@date}.txt"
+  minutes_path = File.join(tmpdir, minutes)
+  _.system "svn up #{minutes_path}"
+  if File.exist? minutes_path
+    _.system "svn rm #{minutes_path}"
   end
   
-  _.system "svn up #{tmpdir}/board_agenda_#{@date}.txt"
-  if File.exist? "#{tmpdir}/board_agenda_#{@date}.txt"
-    _.system "svn up --depth empty #{tmpdir}/archived_agendas"
-    _.system "svn mv #{tmpdir}/board_agenda_#{@date}.txt " +
-      "#{tmpdir}/archived_agendas"
+  agenda_path = File.join(tmpdir, "board_agenda_#{@date}.txt")
+  _.system "svn up #{agenda_path}"
+  if File.exist? agenda_path
+    agenda_archive = File.join(tmpdir, 'archived_agendas')
+    _.system "svn up --depth empty #{agenda_archive}"
+    _.system "svn mv #{agenda_path} #{agenda_archive}"
   end
 end