You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2020/06/29 22:20:46 UTC
[whimsy] branch master updated: Replace magic URLs
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 700efbf Replace magic URLs
700efbf is described below
commit 700efbf901fd4b67bee1a62a9134f4b937553616
Author: Sebb <se...@apache.org>
AuthorDate: Mon Jun 29 23:20:36 2020 +0100
Replace magic URLs
---
www/members/meeting-util.rb | 2 +-
www/members/mentor-format.rb | 2 +-
www/roster/views/committerSearch.js.rb | 2 +-
www/roster/views/duties.html.rb | 2 +-
www/roster/views/iclaSearch.js.rb | 2 +-
www/roster/views/orgchart.html.rb | 2 +-
www/roster/views/podlings.html.rb | 2 +-
www/secretary/iclasort.rb | 2 +-
www/secretary/workbench/views/actions/ccla.json.rb | 6 +++---
www/secretary/workbench/views/actions/grant.json.rb | 6 +++---
www/secretary/workbench/views/actions/icla.json.rb | 6 +++---
www/secretary/workbench/views/actions/icla2.json.rb | 16 ++++++++--------
www/secretary/workbench/views/actions/memapp.json.rb | 6 +++---
www/secretary/workbench/views/parts.html.rb | 4 ++--
14 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/www/members/meeting-util.rb b/www/members/meeting-util.rb
index 20e6bcb..e0996d1 100644
--- a/www/members/meeting-util.rb
+++ b/www/members/meeting-util.rb
@@ -6,7 +6,7 @@ require 'whimsy/asf'
require 'json'
class MeetingUtil
- RECORDS = 'https://svn.apache.org/repos/private/foundation/Meetings'
+ RECORDS = ASF::SVN.svnurl!('Meetings')
MEETING_FILES = { # Filename in meeting dir, pathname to another deployed tool, or URL
'README.txt' => 'README For Meeting Process And Roll Call',
'nomination_of_board.txt' => 'How To Nominate Someone For Board',
diff --git a/www/members/mentor-format.rb b/www/members/mentor-format.rb
index 924a8ec..75bea94 100644
--- a/www/members/mentor-format.rb
+++ b/www/members/mentor-format.rb
@@ -4,7 +4,7 @@ require 'tzinfo'
class MentorFormat
ROSTER = 'https://whimsy.apache.org/roster/committer/'
- MENTORS_SVN = 'https://svn.apache.org/repos/private/foundation/mentors/'
+ MENTORS_SVN = ASF::SVN.svnurl!('foundation_mentors')
MENTORS_LIST = 'https://whimsy.apache.org/member/mentors.cgi'
PUBLICNAME = 'publicname'
NOTAVAILABLE = 'notavailable'
diff --git a/www/roster/views/committerSearch.js.rb b/www/roster/views/committerSearch.js.rb
index 5f8b23e..a730556 100644
--- a/www/roster/views/committerSearch.js.rb
+++ b/www/roster/views/committerSearch.js.rb
@@ -137,7 +137,7 @@ class CommitterSearch < Vue
_td ''
end
if @@notinavail
- _td { _a person.claRef, href: "https://svn.apache.org/repos/private/documents/iclas/#{person.iclaFile}" }
+ _td { _a person.claRef, href: ASF::SVN.svnpath!('iclas', person.iclaFile) }
end
end
end
diff --git a/www/roster/views/duties.html.rb b/www/roster/views/duties.html.rb
index 71fe882..c624d99 100644
--- a/www/roster/views/duties.html.rb
+++ b/www/roster/views/duties.html.rb
@@ -127,7 +127,7 @@ _html do
end
_li.list_group_item do
txtnam = File.basename("#{env['REQUEST_URI']}")
- _a "foundation/officers/personnel-duties/#{txtnam}.txt", href: "https://svn.apache.org/repos/private/foundation/officers/personnel-duties/#{txtnam}.txt"
+ _a "foundation/officers/personnel-duties/#{txtnam}.txt", href: ASF::SVN.svnpath!('personnel-duties', "#{txtnam}.txt")
end
end
diff --git a/www/roster/views/iclaSearch.js.rb b/www/roster/views/iclaSearch.js.rb
index 9440492..e5cb158 100644
--- a/www/roster/views/iclaSearch.js.rb
+++ b/www/roster/views/iclaSearch.js.rb
@@ -90,7 +90,7 @@ class IclaSearch < Vue
_tr do
_td icla.name
_td icla.mail
- _td { _a icla.claRef, href: "https://svn.apache.org/repos/private/documents/iclas/#{icla.iclaFile}" }
+ _td { _a icla.claRef, href: ASF::SVN.svnpath!('iclas', icla.iclaFile) }
end
end
diff --git a/www/roster/views/orgchart.html.rb b/www/roster/views/orgchart.html.rb
index 02a6bfb..5b153ad 100644
--- a/www/roster/views/orgchart.html.rb
+++ b/www/roster/views/orgchart.html.rb
@@ -18,7 +18,7 @@ _html do
title: 'Corporate Officer Listing (Member-private version)',
helpblock: -> {
_ 'This table lists all Corporate officers of the ASF, not including Apache TLP project Vice Presidents (except for a few special PMCs). '
- _a '(View source data)', href: 'https://svn.apache.org/repos/private/foundation/officers/personnel-duties/'
+ _a '(View source data)', href: ASF::SVN.svnurl!('personnel-duties')
_ ' A publicly viewable version (not including private data) of this is also '
_a 'posted here.', href: 'https://whimsy.apache.org/foundation/orgchart/'
}
diff --git a/www/roster/views/podlings.html.rb b/www/roster/views/podlings.html.rb
index 5ae640d..2d1ce34 100644
--- a/www/roster/views/podlings.html.rb
+++ b/www/roster/views/podlings.html.rb
@@ -36,7 +36,7 @@ _html do
title: 'Podling Summary',
helpblock: -> {
_ 'Podling data is derived from:'
- _a 'podlings.xml', href: 'https://svn.apache.org/repos/asf/incubator/public/trunk/content/podlings.xml'
+ _a 'podlings.xml', href: ASF::SVN.svnpath!('incubator-podlings', 'podlings.xml')
}
) do
_table.counts do
diff --git a/www/secretary/iclasort.rb b/www/secretary/iclasort.rb
index 619e3de..21cf38f 100644
--- a/www/secretary/iclasort.rb
+++ b/www/secretary/iclasort.rb
@@ -4,7 +4,7 @@ OFFICERS = ASF::SVN['officers']
unless OFFICERS
STDERR.puts 'Unable to locate a checked out version of '
- STDERR.puts 'https://svn.apache.org/repos/private/foundation/officers.'
+ STDERR.puts ASF::SVN.svnurl!('officers')
STDERR.puts
STDERR.puts "Please check your #{Dir.home}/.whimsy file"
exit 1
diff --git a/www/secretary/workbench/views/actions/ccla.json.rb b/www/secretary/workbench/views/actions/ccla.json.rb
index 5eb66b4..fa8f7a0 100644
--- a/www/secretary/workbench/views/actions/ccla.json.rb
+++ b/www/secretary/workbench/views/actions/ccla.json.rb
@@ -92,11 +92,11 @@ task "svn commit foundation/officers/cclas.txt" do
complete do |dir|
# checkout empty officers directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/foundation/officers',
- "#{dir}/officers"
+ ASF::SVN.svnurl!('officers'),
+ File.join(dir, 'officers')
# retrieve cclas.txt
- dest = "#{dir}/officers/cclas.txt"
+ dest = File.join(dir, 'officers', 'cclas.txt')
svn 'update', dest
# update cclas.txt
diff --git a/www/secretary/workbench/views/actions/grant.json.rb b/www/secretary/workbench/views/actions/grant.json.rb
index 30afa7f..9e5d54c 100644
--- a/www/secretary/workbench/views/actions/grant.json.rb
+++ b/www/secretary/workbench/views/actions/grant.json.rb
@@ -81,11 +81,11 @@ task "svn commit foundation/officers/grants.txt" do
complete do |dir|
# checkout empty officers directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/foundation/officers',
- "#{dir}/officers"
+ ASF::SVN.svnurl!('officers'),
+ File.join(dir, 'officers')
# retrieve grants.txt
- dest = "#{dir}/officers/grants.txt"
+ dest = File.join(dir, 'officers', 'grants.txt')
svn 'update', dest
# update grants.txt
diff --git a/www/secretary/workbench/views/actions/icla.json.rb b/www/secretary/workbench/views/actions/icla.json.rb
index ae9fbd3..c376241 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -103,11 +103,11 @@ task "svn commit foundation/officers/iclas.txt" do
complete do |dir|
# checkout empty officers directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/foundation/officers',
- "#{dir}/officers"
+ ASF::SVN.svnurl!('officers'),
+ File.join(dir, 'officers')
# retrieve iclas.txt
- dest = "#{dir}/officers/iclas.txt"
+ dest = File.join(dir, 'officers', 'iclas.txt')
svn 'update', dest
# update iclas.txt
diff --git a/www/secretary/workbench/views/actions/icla2.json.rb b/www/secretary/workbench/views/actions/icla2.json.rb
index e87814d..35f6b19 100644
--- a/www/secretary/workbench/views/actions/icla2.json.rb
+++ b/www/secretary/workbench/views/actions/icla2.json.rb
@@ -90,12 +90,12 @@ task "svn commit documents/iclas/#@filename/iclaN#{count}{fileext}" do
complete do |dir|
# checkout directory
- svn 'checkout',
- "https://svn.apache.org/repos/private/documents/iclas/#@filename",
- "#{dir}/#@filename"
+ svn 'checkout',
+ ASF::SVN.svnpath!('iclas', @filename),
+ File.join(dir, @filename)
# determine numeric suffix for the new ICLA
- count = Dir["#{dir}/#@filename/*"].
+ count = Dir[File.join(dir, @filename, '*')].
map {|name| name[/.*(\d+)\./, 1] || 1}.map(&:to_i).max + 1
# create/add file(s)
@@ -104,7 +104,7 @@ task "svn commit documents/iclas/#@filename/iclaN#{count}{fileext}" do
message.write_svn(dir, @filename, files)
# Show files to be added
- svn 'status', "#{dir}/#@filename"
+ svn 'status', File.join(dir, @filename)
# commit changes
svn 'commit',
@@ -140,11 +140,11 @@ task "svn commit foundation/officers/iclas.txt" do
complete do |dir|
# checkout empty officers directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/foundation/officers',
- "#{dir}/officers"
+ ASF::SVN.svnurl('officers'),
+ File.join(dir, 'officers')
# retrieve iclas.txt
- dest = "#{dir}/officers/iclas.txt"
+ dest = File.join(dir, 'officers', 'iclas.txt')
svn 'update', dest
# update iclas.txt
diff --git a/www/secretary/workbench/views/actions/memapp.json.rb b/www/secretary/workbench/views/actions/memapp.json.rb
index c3c2e24..9ff40a8 100644
--- a/www/secretary/workbench/views/actions/memapp.json.rb
+++ b/www/secretary/workbench/views/actions/memapp.json.rb
@@ -87,7 +87,7 @@ task "svn commit foundation/members.txt" do
complete do |dir|
# checkout empty foundation directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/foundation', "#{dir}/foundation"
+ ASF::SVN.svnurl!('foundation'), File.join(dir, 'foundation')
# retrieve members.txt
dest = "#{dir}/foundation/members.txt"
@@ -210,8 +210,8 @@ task "svn commit memapp-received.text" do
# checkout empty directory
meeting = file.split('/')[-2]
svn 'checkout', '--depth', 'empty',
- "https://svn.apache.org/repos/private/foundation/Meetings/#{meeting}",
- "#{dir}/#{meeting}"
+ ASF::SVN.svnpath!('Meetings', meeting),
+ File.join(dir, meeting)
# retrieve memapp-received.txt
dest = "#{dir}/#{meeting}/memapp-received.txt"
diff --git a/www/secretary/workbench/views/parts.html.rb b/www/secretary/workbench/views/parts.html.rb
index 3bf044d..ac48808 100644
--- a/www/secretary/workbench/views/parts.html.rb
+++ b/www/secretary/workbench/views/parts.html.rb
@@ -77,8 +77,8 @@ _html do
href: 'https://id.apache.org/info/MailAlias.txt'
end
_li do
- _a 'Member list', target: 'content',
- href: 'https://svn.apache.org/repos/private/foundation/members.txt'
+ _a 'Member list', target: 'content',
+ href: ASF::SVN.svnpath!('foundation', 'members.txt')
end
_li do
_a 'How to use this tool', href: '../../HOWTO.html',