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 ad500137 Remove trailing whitespace from Ruby files (#256)
ad500137 is described below
commit ad50013795b7e703ea53e8ef6490d44d1459b888
Author: John Bampton <jbamp...@users.noreply.github.com>
AuthorDate: Fri Feb 21 03:36:14 2025 +1000
Remove trailing whitespace from Ruby files (#256)
---
lib/whimsy/asf/board.rb | 2 +-
lib/whimsy/asf/documents.rb | 2 +-
lib/whimsy/asf/podling.rb | 2 +-
lib/whimsy/asf/string-utils.rb | 2 +-
lib/whimsy/asf/svn.rb | 2 +-
tools/download_check.rb | 2 +-
tools/pubsub-ci-email.rb | 12 ++++++------
www/roster/views/actions/memstat.json.rb | 2 +-
www/roster/views/orgchart.html.rb | 2 +-
www/secretary/workbench/models/message.rb | 4 ++--
www/secretary/workbench/tasks.rb | 2 +-
www/site_or_pod.rb | 4 ++--
www/status/monitor.rb | 4 ++--
13 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/lib/whimsy/asf/board.rb b/lib/whimsy/asf/board.rb
index 126b996f..59007e8f 100644
--- a/lib/whimsy/asf/board.rb
+++ b/lib/whimsy/asf/board.rb
@@ -192,7 +192,7 @@ module ASF
'jim' => ['jj', 'Jim', 'Jim Jagielski'],
'jjirsa' => ['jjr', 'Jeff', 'Jeff Jirsa'],
'jmclean' => ['jm', 'Justin', 'Justin Mclean'],
- 'kanchana' => ['kw', 'Kanchana', 'Kanchana Welagedara'],
+ 'kanchana' => ['kw', 'Kanchana', 'Kanchana Welagedara'],
'ke4qqq' => ['dn', 'David', 'David Nalley'],
'lrosen' => ['lr', 'Larry', 'Lawrence Rosen'],
'markt' => ['mt', 'Mark', 'Mark Thomas'],
diff --git a/lib/whimsy/asf/documents.rb b/lib/whimsy/asf/documents.rb
index 894027d6..07d86aec 100644
--- a/lib/whimsy/asf/documents.rb
+++ b/lib/whimsy/asf/documents.rb
@@ -269,7 +269,7 @@ module ASF
def self.refreshnames(storedates, env)
ASF::DocumentUtils.update_cache(STEM, env, storedates: storedates,
force: true)
end
-
+
# Find the file name (or directory) that matches a person
# return [svnpath, name, timestamp, epoch (int)] if found
# return nil if not found
diff --git a/lib/whimsy/asf/podling.rb b/lib/whimsy/asf/podling.rb
index 222fe747..f791044c 100644
--- a/lib/whimsy/asf/podling.rb
+++ b/lib/whimsy/asf/podling.rb
@@ -294,7 +294,7 @@ module ASF
name.downcase
end
end
-
+
# development mailing list associated with a given podling
def dev_mail_list
case name
diff --git a/lib/whimsy/asf/string-utils.rb b/lib/whimsy/asf/string-utils.rb
index 6e7a0e60..a9deee2f 100644
--- a/lib/whimsy/asf/string-utils.rb
+++ b/lib/whimsy/asf/string-utils.rb
@@ -58,7 +58,7 @@ module ASFString
# fix encoding errors
def self.fix_encoding(text)
-
+
if text.encoding == Encoding::BINARY
return text.encode('utf-8', invalid: :replace, undef: :replace)
end
diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index f70f817c..a14ee9e2 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -504,7 +504,7 @@ module ASF
end
out
end
-
+
# get list of commits from initial to current, and parses the output
# Returns: [out, err], where:
# out = array of entries, each of which is a hash
diff --git a/tools/download_check.rb b/tools/download_check.rb
index 7227668c..e767a0c0 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -283,7 +283,7 @@ def get_links(path, body, checkSpaces=false)
href = path + URI.decode_www_form_component(href)
end
# Strip spurious text from link (age, baremaps)
- text = node.text.gsub(/[[:space:]]+/, ' ').sub('(opens in a new tab)',
'').sub('➚', '').strip
+ text = node.text.gsub(/[[:space:]]+/, ' ').sub('(opens in a new tab)',
'').sub('➚', '').strip
[href, text] unless href =~ %r{/httpcomponents.+/xdoc/downloads.xml} #
breadcrumb link to source
}.select {|x, _y| x =~ %r{^(https?:)?//} }
end
diff --git a/tools/pubsub-ci-email.rb b/tools/pubsub-ci-email.rb
index 22ba995a..2e4d2b21 100755
--- a/tools/pubsub-ci-email.rb
+++ b/tools/pubsub-ci-email.rb
@@ -24,7 +24,7 @@ def mail_notify(subject, body=nil)
body body
end
if Status.active? or Status.testnode?
- mail.deliver!
+ mail.deliver!
else
puts stamp "Would have sent: #{mail}"
end
@@ -157,7 +157,7 @@ end
def do_diff(initialhash, currenthash, triggerrev)
initialrev = initialhash[:revision]
# initialcommitter = initialhash[:author]
- # initialdate = initialhash[:date]
+ # initialdate = initialhash[:date]
currentrev = currenthash[:revision]
currentcommitter = currenthash[:author]
currentdate = currenthash[:date]
@@ -216,7 +216,7 @@ def do_diff(initialhash, currenthash, triggerrev)
body body
end
if Status.active? or Status.testnode?
- mail.deliver!
+ mail.deliver!
else
puts stamp "Would have sent: #{subject}"
end
@@ -297,13 +297,13 @@ if $0 == __FILE__
Generated by #{__FILE__}
EOD
-
+
raise ArgumentError.new error if error
-
+
options = {}
args = ARGV.dup # preserve ARGV for relaunch
- prompt = args.delete('--prompt') #
+ prompt = args.delete('--prompt') #
options[:debug] = args.delete('--debug')
pubsub_URL = args[0] || PUBSUB_URL
pubsub_FILE = args[1] || File.join(Dir.home, '.pubsub')
diff --git a/www/roster/views/actions/memstat.json.rb
b/www/roster/views/actions/memstat.json.rb
index caa42621..50c966d7 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -60,7 +60,7 @@ if @action == 'emeritus' or @action == 'active' or @action ==
'deceased'
elsif @action == 'withdraw' # process withdrawal request (secretary only)
require 'whimsy/asf/subreq'
- # TODO
+ # TODO
# Check members.md for entry and report - how?
# unsubscribe from member only mailing lists:
diff --git a/www/roster/views/orgchart.html.rb
b/www/roster/views/orgchart.html.rb
index 9b694c7e..f0729ed4 100644
--- a/www/roster/views/orgchart.html.rb
+++ b/www/roster/views/orgchart.html.rb
@@ -47,7 +47,7 @@ _html do
_a ASF::Person.find(id1).public_name, href:
"committer/#{id1}"
end
end
-
+
# Reports-To - clarifies orgchart reporting structure
_td do
value['info']['reports-to'].nil? ? _('') :
_(value['info']['reports-to'])
diff --git a/www/secretary/workbench/models/message.rb
b/www/secretary/workbench/models/message.rb
index f4193be0..08a8bffc 100644
--- a/www/secretary/workbench/models/message.rb
+++ b/www/secretary/workbench/models/message.rb
@@ -125,7 +125,7 @@ class Message
attachments = headers[:attachments]
return [] unless attachments
attachments.
- reject do |attachment|
+ reject do |attachment|
(!includeDeleted and attachment[:status] == :deleted) or
(SIG_MIMES.include?(attachment[:mime]) and (not attachment[:name] or
attachment[:name] !~ /\.pdf\.(asc|sig)$/))
end.
@@ -225,7 +225,7 @@ class Message
end
end
end
-
+
# Add some properties from the email
def add_email_details(pathname)
PROPNAMES_DEFAULT.each do |propname|
diff --git a/www/secretary/workbench/tasks.rb b/www/secretary/workbench/tasks.rb
index 63663d98..5c2a8957 100644
--- a/www/secretary/workbench/tasks.rb
+++ b/www/secretary/workbench/tasks.rb
@@ -73,7 +73,7 @@ class Wunderbar::JsonBuilder
end
end
end
-
+
# Commit new file(s) and update associated index
# e.g. add ccla.pdf, ccla.pdf.asc to documents/cclas/xyz/ and update
officers/cclas.txt
# Parameters:
diff --git a/www/site_or_pod.rb b/www/site_or_pod.rb
index 46481fc4..87bab9b8 100644
--- a/www/site_or_pod.rb
+++ b/www/site_or_pod.rb
@@ -88,8 +88,8 @@ _html do
) do
# Encapsulate data display (same for projects and podlings)
if sites.size > 0
- display_application(path_info, sites, analysis, checks_performed,
cgi_for_tlps?)
- else
+ display_application(path_info, sites, analysis, checks_performed,
cgi_for_tlps?)
+ else
_h3 'Could not parse the site data. Please check the error log for
details.'
end
end
diff --git a/www/status/monitor.rb b/www/status/monitor.rb
index 7f67667f..2322be29 100644
--- a/www/status/monitor.rb
+++ b/www/status/monitor.rb
@@ -38,7 +38,7 @@ class StatusMonitor
@timings << [what, now - @prev]
@prev = now
end
-
+
def initialize(args = [])
@timings = []
@prev = Time.now
@@ -112,7 +112,7 @@ class StatusMonitor
newstatus = {}
threads.each do |thread|
thread.join
- timediff(thread[:name])
+ timediff(thread[:name])
newstatus[thread[:name]] = thread[:status]
end
