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 2022/04/24 18:23:57 UTC
[whimsy] branch master updated: Trailing spaces
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 4d2af682 Trailing spaces
4d2af682 is described below
commit 4d2af68284ed019fb7a816ca4b3ccea73df1ef36
Author: Sebb <se...@apache.org>
AuthorDate: Sun Apr 24 19:23:50 2022 +0100
Trailing spaces
---
Rakefile | 4 ++--
lib/whimsy/asf/meeting-util.rb | 2 +-
lib/whimsy/asf/person.rb | 6 +++---
lib/whimsy/asf/petri.rb | 2 +-
tools/collate_minutes.rb | 2 +-
www/members/inactive.cgi | 2 +-
www/members/non-participants.cgi | 2 +-
www/members/security-subs.cgi | 2 +-
www/project/icla/main.rb | 2 +-
www/project/icla/views/actions/discuss.json.rb | 4 ++--
www/project/icla/views/actions/update.json.rb | 8 ++++----
www/project/icla/views/actions/validate.json.rb | 2 +-
www/project/icla/views/actions/vote.json.rb | 4 ++--
www/project/icla/views/app.js.rb | 2 +-
www/project/icla/views/pages/form.js.rb | 2 +-
www/project/icla/views/pages/interview.js.rb | 10 +++++-----
www/project/icla/views/pages/vote.js.rb | 2 +-
www/roster/views/pmc/add.js.rb | 2 +-
www/roster/views/pmc/mod.js.rb | 2 +-
www/roster/views/ppmc/add.js.rb | 2 +-
www/secretary/icla-dupes.cgi | 2 +-
www/secretary/public-names.cgi | 2 +-
22 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Rakefile b/Rakefile
index 3b9eccd6..e52a4cdc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -192,11 +192,11 @@ namespace :svn do
# log the failure - prefix tells monitor to ignore it
puts "#{PREFIX} failed!"
outerr.split("\n").each do |l|
- puts "#{PREFIX} #{l}"
+ puts "#{PREFIX} #{l}"
end
n = 10
puts "#{PREFIX} will retry in #{n} seconds"
- sleep n
+ sleep n
end
begin
r, w = IO.pipe
diff --git a/lib/whimsy/asf/meeting-util.rb b/lib/whimsy/asf/meeting-util.rb
index 0b898ca8..38953b70 100644
--- a/lib/whimsy/asf/meeting-util.rb
+++ b/lib/whimsy/asf/meeting-util.rb
@@ -206,7 +206,7 @@ module ASF
inactive = matrix.select do |id, _name, _first, missed|
id and missed >= meetingsMissed
end
-
+
Hash[inactive.map {|id, name, first, missed|
[id, {
'name' => name,
diff --git a/lib/whimsy/asf/person.rb b/lib/whimsy/asf/person.rb
index 871b735a..06201c15 100644
--- a/lib/whimsy/asf/person.rb
+++ b/lib/whimsy/asf/person.rb
@@ -167,9 +167,9 @@ module ASF
# extract sn and givenName from cn (needed for LDAP entries)
# returns sn, [givenName,...]
- # Note that givenName is returned as an array (may be empty).
+ # Note that givenName is returned as an array (may be empty).
# This is because givenName is an optional attribute which may appear multiple times.
- # It remains to be seen whether we want to create multiple attributes,
+ # It remains to be seen whether we want to create multiple attributes,
# or whether it is more appropriate to add at most one attribute
# containing all the givenName values. [The array can be joined to produce a single value].
# DRAFT version: not for general use yet
@@ -186,7 +186,7 @@ module ASF
# Name equivalences
names = [
- %w(Alex Alexander Alexandru),
+ %w(Alex Alexander Alexandru),
%w(Andrew Andy),
%w(William Bill),
%w(Chris Christopher Christoph),
diff --git a/lib/whimsy/asf/petri.rb b/lib/whimsy/asf/petri.rb
index 17b109a4..a78b05b1 100644
--- a/lib/whimsy/asf/petri.rb
+++ b/lib/whimsy/asf/petri.rb
@@ -3,7 +3,7 @@ require 'net/http'
module ASF
# Represents a Petri culture
- # currently defined in
+ # currently defined in
# https://petri.apache.org/info.yaml
PETRI_INFO = 'https://petri.apache.org/info.yaml'
diff --git a/tools/collate_minutes.rb b/tools/collate_minutes.rb
index f07094bb..b5db9cea 100755
--- a/tools/collate_minutes.rb
+++ b/tools/collate_minutes.rb
@@ -688,7 +688,7 @@ seen={}
title.sub! 'Vice Chairman', 'Vice Chair'
title.sub! 'Acting Chairman', 'Acting Chair'
title.sub! 'Chairman', 'Board Chair'
-
+
report = OpenStruct.new
if title.include? ' ['
report.owners = title.split(' [').last.sub(']','').strip
diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index 21d93e1b..ea74754d 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -171,7 +171,7 @@ _html do
_p_ %{
If you haven't attended or voted in meetings recently, please consider participating, at
- least by proxy, in the upcoming membership meeting. Assigning a proxy does NOT prevent
+ least by proxy, in the upcoming membership meeting. Assigning a proxy does NOT prevent
you from attending meetings or
automatically grant the assignee to the right to vote on your behalf.
}
diff --git a/www/members/non-participants.cgi b/www/members/non-participants.cgi
index 97e370dc..0ee339e8 100755
--- a/www/members/non-participants.cgi
+++ b/www/members/non-participants.cgi
@@ -25,7 +25,7 @@ end
# separator / is added when link is generated
ROSTER = "/roster/committer"
if not ENV['QUERY_STRING'] or ENV['QUERY_STRING'].include? 'json'
- ENV['HTTP_ACCEPT'] = 'application/json'
+ ENV['HTTP_ACCEPT'] = 'application/json'
end
# produce HTML
diff --git a/www/members/security-subs.cgi b/www/members/security-subs.cgi
index f06c6d25..8d0f8f5e 100755
--- a/www/members/security-subs.cgi
+++ b/www/members/security-subs.cgi
@@ -35,7 +35,7 @@ ASF::MLIST.list_parse('sub') do |dom, list, subs|
end
[sub, person]
end.to_h
- lists[dom.sub('.apache.org', '')] =
+ lists[dom.sub('.apache.org', '')] =
{subCount: unknown + ids.size, subscribers: sub_hash}
end
diff --git a/www/project/icla/main.rb b/www/project/icla/main.rb
index 243709da..8d3d15a9 100755
--- a/www/project/icla/main.rb
+++ b/www/project/icla/main.rb
@@ -29,7 +29,7 @@ helpers do
select {|pmc| committees.include?(pmc.name)}. # keep the ones relevant to the user
sort_by{|p| p.name}.
map{|p| [p.name, {pmc: true, display_name: p.display_name, mail_list: p.mail_list}]}.to_h # convert to hash of data items
- ppmcData =
+ ppmcData =
ASF::Podling.list.select {|podling| podling.status == 'current'}. # get the podlings
select {|p| committees.include?('incubator') || project_owners.include?(p.name)}. # keep the ones relevant to the user
sort_by{|p| p.name}.
diff --git a/www/project/icla/views/actions/discuss.json.rb b/www/project/icla/views/actions/discuss.json.rb
index c5ec1f9f..53f79d10 100644
--- a/www/project/icla/views/actions/discuss.json.rb
+++ b/www/project/icla/views/actions/discuss.json.rb
@@ -6,7 +6,7 @@ require 'mail'
require 'whimsy/lockfile'
# creates the discussion phase JSON file
-# sends an email to the originator with the link
+# sends an email to the originator with the link
# Called from invite.js.rb POST
# expects the following variables to be set:
@@ -55,7 +55,7 @@ end
# create the discussion object
timestamp = Time.now.utc.to_s
-date = timestamp[0..9] # keep only the date
+date = timestamp[0..9] # keep only the date
contributor = {:name => @iclaname, :email => @iclaemail}
comment = @proposalText + "\n" + @discussComment
comments = [{:member => @proposer, :timestamp => timestamp, :comment => comment}]
diff --git a/www/project/icla/views/actions/update.json.rb b/www/project/icla/views/actions/update.json.rb
index ff71da8c..4cec32f0 100644
--- a/www/project/icla/views/actions/update.json.rb
+++ b/www/project/icla/views/actions/update.json.rb
@@ -40,7 +40,7 @@ def sendTally(contents)
pmc = ASF::Committee.find(contents['project'])
pmc_email = "#{pmc.mail_list}@apache.org"
subject = "[RESULT]" + contents['subject']
- last_votes = Hash.new
+ last_votes = Hash.new
votes = contents['votes']
votes.each { |v|
last_votes[v['member']] = [v['vote'], v['timestamp']]
@@ -110,12 +110,12 @@ def update()
end
elsif HAS_COMMENT.include? @action
if @comment
- addComment =
+ addComment =
{
'comment' => @comment,
'member' => @member,
'timestamp' => timestamp,
- }
+ }
else
raise ArgumentError.new("comment must not be nil for '#{@action}'")
end
@@ -131,7 +131,7 @@ def update()
LockFile.lockfile(file, 'r+', File::LOCK_EX) do |f|
contents = JSON::parse(f.read)
phase = contents['phase']
- raise ArgumentError.new("Phase '#{phase}': expected '#{@expectedPhase}'") unless @expectedPhase == '*' or phases.include? phase
+ raise ArgumentError.new("Phase '#{phase}': expected '#{@expectedPhase}'") unless @expectedPhase == '*' or phases.include? phase
if @newPhase && @newPhase != phase
contents['phase'] = @newPhase
rewrite = true
diff --git a/www/project/icla/views/actions/validate.json.rb b/www/project/icla/views/actions/validate.json.rb
index 55e7a9bd..2692595a 100644
--- a/www/project/icla/views/actions/validate.json.rb
+++ b/www/project/icla/views/actions/validate.json.rb
@@ -113,7 +113,7 @@ if @votelink and not @votelink.empty?
http = Net::HTTP.new(uri.host.untaint, uri.port)
if uri.scheme == 'https'
http.use_ssl = true
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+ http.verify_mode = OpenSSL::SSL::VERIFY_NONE
end
request = Net::HTTP::Head.new(uri.request_uri.untaint)
response = http.request(request)
diff --git a/www/project/icla/views/actions/vote.json.rb b/www/project/icla/views/actions/vote.json.rb
index f561bfce..51c9d8d8 100644
--- a/www/project/icla/views/actions/vote.json.rb
+++ b/www/project/icla/views/actions/vote.json.rb
@@ -6,7 +6,7 @@ require 'mail'
require 'whimsy/lockfile'
# creates the vote phase JSON file
-# sends an email to the originator with the link
+# sends an email to the originator with the link
# Called from invite.js.rb POST
# expects the following variables to be set:
@@ -54,7 +54,7 @@ end
# create the vote object
timestamp = Time.now.utc.to_s # need HMS in order to calculate accurate elapsed times
-date = timestamp[0..9] # keep only the date
+date = timestamp[0..9] # keep only the date
contributor = {:name => @iclaname, :email => @iclaemail}
comment = @proposalText + "\n" + @voteComment
votes = [{:vote =>'+1', :member => @proposer, :timestamp => timestamp, :comment => comment}]
diff --git a/www/project/icla/views/app.js.rb b/www/project/icla/views/app.js.rb
index 7b73fd4e..e49bd25f 100644
--- a/www/project/icla/views/app.js.rb
+++ b/www/project/icla/views/app.js.rb
@@ -27,7 +27,7 @@ def post(target, data, &block)
begin
if xhr.status == 200
- data = JSON.parse(xhr.responseText)
+ data = JSON.parse(xhr.responseText)
elsif xhr.status == 404
alert "Not Found: actions/#{target}"
elsif xhr.status >= 400
diff --git a/www/project/icla/views/pages/form.js.rb b/www/project/icla/views/pages/form.js.rb
index cf1d7ba2..a77b1e75 100644
--- a/www/project/icla/views/pages/form.js.rb
+++ b/www/project/icla/views/pages/form.js.rb
@@ -52,7 +52,7 @@ class Form < Vue
if FormData.votelink
_div.form_group do
_p 'Preferred Apache Id:'
- _input.form_control.apacheId! value: @apacheId,
+ _input.form_control.apacheId! value: @apacheId,
placeholder: 'At least 3 lower-case alphanumeric, starting with alpha. Separate multiple choices with spaces.',
pattern: "^[a-z][a-z0-9]{2,}{1,}\s*(\s+[a-z][a-z0-9]{2,}{1,})*$"
# Single name, optional spaces after, followed by zero or more names with leading spaces
diff --git a/www/project/icla/views/pages/interview.js.rb b/www/project/icla/views/pages/interview.js.rb
index 8d7bc8c3..d2eb3973 100644
--- a/www/project/icla/views/pages/interview.js.rb
+++ b/www/project/icla/views/pages/interview.js.rb
@@ -9,7 +9,7 @@ class Interview < Vue
@disableButton3 = false
@disablePersonalDetails = false
- @alert = nil
+ @alert = nil
end
def render
@@ -24,7 +24,7 @@ class Interview < Vue
process of licensing to the ASF any copyright and patents that may apply
to your contributions.
}
-
+
_p %{
This process should only take a few minutes, and is entirely online.
First we will ask you verify your email address and Public Name.
@@ -73,7 +73,7 @@ class Interview < Vue
of that employer, or"
_li "has your employer waived such rights for your Contributions to
the Foundation, or"
- _li "has your employer executed a separate Corporate CLA with the
+ _li "has your employer executed a separate Corporate CLA with the
Foundation?"
end
@@ -164,12 +164,12 @@ class Interview < Vue
end
def clickButton1()
- @disableButton1 = true
+ @disableButton1 = true
@showQuestion2 = true
end
def clickButton2()
- @disableButton2 = true
+ @disableButton2 = true
@showQuestion3 = true
end
diff --git a/www/project/icla/views/pages/vote.js.rb b/www/project/icla/views/pages/vote.js.rb
index 50c86cfe..963e0c67 100644
--- a/www/project/icla/views/pages/vote.js.rb
+++ b/www/project/icla/views/pages/vote.js.rb
@@ -106,7 +106,7 @@ class Vote < Vue
}
_h5 'Summary of voting so far'
-
+
vote_count = {}
tally.each_key { |k|
vote_count[tally[k][0]] ||= 0
diff --git a/www/roster/views/pmc/add.js.rb b/www/roster/views/pmc/add.js.rb
index b315909b..9a25efac 100644
--- a/www/roster/views/pmc/add.js.rb
+++ b/www/roster/views/pmc/add.js.rb
@@ -57,7 +57,7 @@ class PMCAdd < Vue
_p do
_br
_b do
- _ 'Before adding a new PMC member, '
+ _ 'Before adding a new PMC member, '
_a 'email notification must be sent to the Board mailing list',
href: 'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
_ ' (cc: the PMC private@ mailing list).'
diff --git a/www/roster/views/pmc/mod.js.rb b/www/roster/views/pmc/mod.js.rb
index fd2cbeda..90767725 100644
--- a/www/roster/views/pmc/mod.js.rb
+++ b/www/roster/views/pmc/mod.js.rb
@@ -45,7 +45,7 @@ class PMCMod < Vue
_p do
_br
_b do
- _ 'Before adding a new PMC member, '
+ _ 'Before adding a new PMC member, '
_a 'email notification must be sent to the Board mailing list',
href: 'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
_ ' (cc: the PMC private@ mailing list).'
diff --git a/www/roster/views/ppmc/add.js.rb b/www/roster/views/ppmc/add.js.rb
index 1bdbaa49..b3adf6c2 100644
--- a/www/roster/views/ppmc/add.js.rb
+++ b/www/roster/views/ppmc/add.js.rb
@@ -57,7 +57,7 @@ class PPMCAdd < Vue
_p do
_br
_b do
- _ 'Before adding a new PPMC member, '
+ _ 'Before adding a new PPMC member, '
_a 'email notification must be sent to the Incubator private mailing list',
href: 'https://incubator.apache.org/guides/ppmc.html#voting_in_a_new_ppmc_member'
_br
diff --git a/www/secretary/icla-dupes.cgi b/www/secretary/icla-dupes.cgi
index da83f700..a1a47f29 100755
--- a/www/secretary/icla-dupes.cgi
+++ b/www/secretary/icla-dupes.cgi
@@ -101,6 +101,6 @@ _html do
end
end
end
- end
+ end
end
end
diff --git a/www/secretary/public-names.cgi b/www/secretary/public-names.cgi
index 38209b3a..bbe05153 100755
--- a/www/secretary/public-names.cgi
+++ b/www/secretary/public-names.cgi
@@ -38,7 +38,7 @@ _html do
_h1 "public names: LDAP vs iclas.txt"
- # prefetch LDAP data
+ # prefetch LDAP data
# Seems it needs to be saved in a variable to ensure it is cached
_cache = ASF::Person.preload(%w(cn dn))