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 679c87b5 Remove trailing whitespace (#160)
679c87b5 is described below
commit 679c87b59c63758fdbdda8eb4b898eaef7e5ebbf
Author: John Bampton <[email protected]>
AuthorDate: Wed May 18 07:43:32 2022 +1000
Remove trailing whitespace (#160)
---
CONFIGURE.md | 28 ++++++++++++++--------------
DEPLOYMENT.md | 2 +-
DOCKER.md | 6 +++---
Dockerfile | 8 ++++----
README.md | 22 +++++++++++-----------
TODOS.md | 26 +++++++++++++-------------
config/board-agenda.md | 2 +-
config/setupmymac | 12 ++++++------
doap_Whimsy.rdf | 10 +++++-----
docker-compose.yaml | 2 +-
docker-config/whimsy.conf | 4 ++--
repository.yml | 2 +-
secmail.py | 4 ++--
tools/asf-site-check.rb | 2 +-
tools/scan-page.js | 2 +-
www/401.html | 6 +++---
www/404.html | 10 +++++-----
www/500.html | 4 ++--
www/index.html | 6 +++---
www/technology.html | 12 ++++++------
20 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/CONFIGURE.md b/CONFIGURE.md
index 177ea680..1a5d96ed 100644
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@ -1,8 +1,8 @@
# Configuring Whimsy
-As a collection of tools that directly access organizational data,
-there are a number of places that you will need to configure to
-have most of the code work as expected. Whimsy Ruby code can
+As a collection of tools that directly access organizational data,
+there are a number of places that you will need to configure to
+have most of the code work as expected. Whimsy Ruby code can
run either in a local environment or with a webserver.
## Dependencies
@@ -23,22 +23,22 @@ run either in a local environment or with a webserver.
Whimsy can be run on a client or in a local container for development use.
-* **App-wide default settings** are stored in a local YAML formatted
- `~/.whimsy` file, notably including an `svn` pointer to where various
- local repo checkouts live as well as `sendmail` config (if used).
+* **App-wide default settings** are stored in a local YAML formatted
+ `~/.whimsy` file, notably including an `svn` pointer to where various
+ local repo checkouts live as well as `sendmail` config (if used).
See also `lib/whimsy/asf/config.rb`
-
+
* **LDAP configuration** will be stored in `/etc/(ldap|openldap)/ldap.conf`
- and will point to the production ASF LDAP servers along with associated
- certificate. See also `lib/whimsy/asf/ldap.rb` and `ASF::LDAP.configure`.
+ and will point to the production ASF LDAP servers along with associated
+ certificate. See also `lib/whimsy/asf/ldap.rb` and `ASF::LDAP.configure`.
-* **Web server configuration** - much of Whimsy runs within an Apache
- httpd instance, so see the usual `/etc/apache2/httpd.conf` along
+* **Web server configuration** - much of Whimsy runs within an Apache
+ httpd instance, so see the usual `/etc/apache2/httpd.conf` along
with associated Rack and/or Phusion configurations.
-
-* **Log files and debugging** are typically found in
`/var/log/apache2/whimsy_error.log`
+
+* **Log files and debugging** are typically found in
`/var/log/apache2/whimsy_error.log`
and `/var/log/apache2/error_log`
-
+
* **Development setup instructions** are in [DEVELOPMENT.md](DEVELOPMENT.md)
and [MACOSX.md](MACOSX.md).
* **whimsy-asf Gem** is a set of the core lib/whimsy/asf model as a normal
Gem: [asf.gemspec](asf.gemspec)
diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index 3106468a..87b22ab7 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -1,7 +1,7 @@
Deploying Production Whimsy.apache.org
==========
-The production `whimsy.apache.org` server is managed by [Puppet](puppetnode),
and
+The production `whimsy.apache.org` server is managed by [Puppet](puppetnode),
and
is automatically updated whenever commits are made to the master branch
of this repository. Thus code changes here are reflected in the production
server within a few minutes. In the event of a major server crash, the
diff --git a/DOCKER.md b/DOCKER.md
index ed3ab3f4..180feb93 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -1,8 +1,8 @@
Docker execution instructions
=============================
-:dizzy: **New!** For a simpler way to setup a Mac OSX machine, please
-check out the [setupmymac script](./SETUPMYMAC.md), which automates
+:dizzy: **New!** For a simpler way to setup a Mac OSX machine, please
+check out the [setupmymac script](./SETUPMYMAC.md), which automates
configuring and keeping updated a local whimsy instance with Docker.
This is experimental at this point.
@@ -109,7 +109,7 @@ the container)
Note on Repositories
--------------------
-If you don't want to check out all of the repositories, omit the
+If you don't want to check out all of the repositories, omit the
`rake docker:update svn:update git:pull`, and only checkout/clone
the repositories that you need. You can find the complete list in
[repository.yml](./repository.yml).
diff --git a/Dockerfile b/Dockerfile
index 81ebd49e..08a6b2cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,7 +64,7 @@ RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y vim
RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y ldap-utils
# Install puppeteer
-RUN curl -sL https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
add -
+RUN curl -sL https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
add -
RUN echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
> /etc/apt/sources.list.d/google.list
RUN apt update && apt install -y google-chrome-stable
RUN npm install -g puppeteer --unsafe-perm=true
@@ -76,9 +76,9 @@ RUN npm install -g puppeteer --unsafe-perm=true
# e.g. curl -o chromedriver.zip
https://chromedriver.storage.googleapis.com/99.0.4844.51/chromedriver_linux64.zip
# unzip it:
# unzip chromedriver.zip
-# mv chromedriver /usr/bin/chromedriver
-# chown root:root /usr/bin/chromedriver
-# chmod +x /usr/bin/chromedriver
+# mv chromedriver /usr/bin/chromedriver
+# chown root:root /usr/bin/chromedriver
+# chmod +x /usr/bin/chromedriver
# This should be last, as the source is likely to change
# It also takes very little time, so it does not matter if it has to be redone
diff --git a/README.md b/README.md
index 9a49536b..2a42a3b7 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
Apache Whimsy Project Overview
==================
-Apache Whimsy is a collection of useful organizational tools used by
-the ASF and Apache committers to access and manipulate data about
-Apache people, projects, and processes. Whimsy is both an [Apache
PMC](https://whimsical.apache.org/),
+Apache Whimsy is a collection of useful organizational tools used by
+the ASF and Apache committers to access and manipulate data about
+Apache people, projects, and processes. Whimsy is both an [Apache
PMC](https://whimsical.apache.org/),
this codebase, and the live deployed instance of https://whimsy.apache.org/.
The ASF's Whimsy instance hosts static content, repository checkouts/clones,
CGI scripts, Rack
-applications, Node.js applications, tools, and cron jobs. Note: features
accessing private
-ASF data are restricted to committers, Members, or Officers of the ASF.
+applications, Node.js applications, tools, and cron jobs. Note: features
accessing private
+ASF data are restricted to committers, Members, or Officers of the ASF.
-Every commit pushed to master is deployed within minutes to
https://whimsy.apache.org/ using
+Every commit pushed to master is deployed within minutes to
https://whimsy.apache.org/ using
[GitPubSub](https://www.apache.org/dev/gitpubsub.html).
[](https://app.travis-ci.com/github/apache/whimsy)
@@ -40,14 +40,14 @@ and mirrored for Apache committers at:
How To Get Involved!
===============
-Since Whimsy hosts many independent tools that make finding or updating
information
-at the ASF simpler, there are plenty of places for Apache committers to
-get involved. Bugs or improvement suggestions for the many
-[tools available on Whimsy](https://whimsy.apache.org/committers/tools)
+Since Whimsy hosts many independent tools that make finding or updating
information
+at the ASF simpler, there are plenty of places for Apache committers to
+get involved. Bugs or improvement suggestions for the many
+[tools available on Whimsy](https://whimsy.apache.org/committers/tools)
or [list of public datafiles](https://whimsy.apache.org/test/dataflow.cgi) are
always appreciated,
and please join us on the [public #whimsy channel on
Slack](https://the-asf.slack.com/).
-If you have an idea for a new Whimsy tool, [email
us](mailto:[email protected]?subject=Tool-Idea)!
+If you have an idea for a new Whimsy tool, [email
us](mailto:[email protected]?subject=Tool-Idea)!
The PMC supports a rich server environment, so deploying a new tool is as
simple as proposing a .cgi with a bit of Ruby code. We also have deployments
of Rack and Sinatra apps, and use JavaScript and Wunderbar for most of the
diff --git a/TODOS.md b/TODOS.md
index e802e8f8..88be50e7 100644
--- a/TODOS.md
+++ b/TODOS.md
@@ -1,8 +1,8 @@
# Whimsy Project TODOs
-The Apache Whimsy project is maintained by volunteers, and includes both
+The Apache Whimsy project is maintained by volunteers, and includes both
the core server and ASF:: libraries, as well as many individual applications.
-Patches are welcome - as is [reporting
bugs](https://issues.apache.org/jira/browse/WHIMSY)
+Patches are welcome - as is [reporting
bugs](https://issues.apache.org/jira/browse/WHIMSY)
or [asking
questions](https://lists.apache.org/[email protected]).
This TODO :pencil: list is used by various committers for tasks, improvements,
@@ -12,33 +12,33 @@ and crazy ideas alike. Comments appreciated.
- [ ] Share common code for places where we jump thru hoops or regexes
to account for historical or file formats or odd PMC names.
-
+
- [tools/collate_minutes.rb](tools/collate_minutes.rb) - maps PMC names
displayed in board reports like concom
- [lib/whimsy/asf/committee.rb](lib/whimsy/asf/committee.rb) - maps PMC
names within Committee @@aliases
- [lib/whimsy/asf/site.rb](lib/whimsy/asf/site.rb) - maps URLs for groups
within Site @@default
- [lib/whimsy/asf/mail.rb](lib/whimsy/asf/mail.rb) - maps mail list names
within Committee.mail_list
- [lib/whimsy/asf/podlings.rb](lib/whimsy/asf/podlings.rb) - maps mail
list names within *_mail_list
-- [ ] Improve code sharing between www/roster and www/board with lib/whimsy,
+- [ ] Improve code sharing between www/roster and www/board with lib/whimsy,
as above regexes, and improving themes.rb use
-
-- [ ] Higher level documentation of various lib/whimsy/asf modules, so that
- they and their associated output public/*.json files can be better
+
+- [ ] Higher level documentation of various lib/whimsy/asf modules, so that
+ they and their associated output public/*.json files can be better
used across whimsy and other tools.
## Crazy Ideas :tada:
-- [ ] Create templates for new applications and normalize behaviors of
+- [ ] Create templates for new applications and normalize behaviors of
existing applications to make a more consistent user experience.
## Done :checkered_flag:
-- [x] Define core ASF style & header information in the model and
+- [x] Define core ASF style & header information in the model and
implement in various applications.
[lib/whimsy/asf/themes.rb](lib/whimsy/asf/themes.rb)
- [x] Improve error handling in appropriate scripts to provide friendly
- user-visible cues on completion or stacktrace. Best practice to use
- _body? in scripts and do complex operations inside that block:
+ user-visible cues on completion or stacktrace. Best practice to use
+ _body? in scripts and do complex operations inside that block:
then wunderbar will emit header and formatted error message for user.
- [x] Implement custom server error messages. (done for /www browse and roster
tool)
@@ -46,8 +46,8 @@ and crazy ideas alike. Comments appreciated.
- [x] Show flow of data generated or consumed, tying back to the Role/Group
that maintains it.
[www/test/dataflow.cgi](https://whimsy.apache.org/test/dataflow.cgi)
-- [x] Implement directory level index functionality to display a list
- of other available (and publishable) scripts there.
+- [x] Implement directory level index functionality to display a list
+ of other available (and publishable) scripts there.
Scan curdir; forall *.cgi where second line includes WVisible, display
name/link.
Using a positive comment ensures only scripts wishing to be displayed
are visible.
Effectively done as much is valuable:
[www/committers/tools](https://whimsy.apache.org/committers/tools)
diff --git a/config/board-agenda.md b/config/board-agenda.md
index b2007cab..9e0bde89 100644
--- a/config/board-agenda.md
+++ b/config/board-agenda.md
@@ -1,6 +1,6 @@
Configuring the Board Agenda Tool
-You can run a local copy of the Board Agenda tool with the below config,
+You can run a local copy of the Board Agenda tool with the below config,
for testing or training purposes.
See also:
diff --git a/config/setupmymac b/config/setupmymac
index 23bc40fb..84c6c05b 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -188,9 +188,9 @@ end
if not $root and option != :docker
if `which n`.empty?
- brew 'install', 'n'
+ brew 'install', 'n'
elsif force[:node]
- brew 'upgrade', 'n'
+ brew 'upgrade', 'n'
end
end
@@ -518,8 +518,8 @@ end
wconf_content.sub! /^\s*PassengerUser .*/i, "PassengerUser #{user}"
wconf_content.sub! /^\s*PassengerGroup .*/i, "PassengerGroup #{group}"
wconf_target = '/private/etc/apache2/other/whimsy.conf'
-if
- not File.exist?(wconf_target) or
+if
+ not File.exist?(wconf_target) or
File.read(wconf_target) != wconf_content
then
sudo do
@@ -532,8 +532,8 @@ end
confd_source = "#{WHIMSY}/config/25-authz_ldap_group_membership.conf"
confd_target = '/private/etc/apache2/other/25-authz_ldap_group_membership.conf'
-if
- not File.exist?(confd_target) or
+if
+ not File.exist?(confd_target) or
File.read(confd_target) != File.read(confd_source)
then
sudo do
diff --git a/doap_Whimsy.rdf b/doap_Whimsy.rdf
index d542bbbb..337dc831 100644
--- a/doap_Whimsy.rdf
+++ b/doap_Whimsy.rdf
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns="http://usefulinc.com/ns/doap#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
xmlns:asfext="http://projects.apache.org/ns/asfext#";
xmlns:foaf="http://xmlns.com/foaf/0.1/";>
<!--
@@ -12,9 +12,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
<homepage rdf:resource="http://whimsy.apache.org/"; />
<asfext:pmc rdf:resource="http://whimsy.apache.org"; />
<shortdesc>Tools that display and visualize various bits of data related
to ASF organizations and processes.</shortdesc>
- <description>The production Whimsy server also has a number of tools that
automate some organizational processes,
+ <description>The production Whimsy server also has a number of tools that
automate some organizational processes,
like adding PMC members to official corporate rosters or reading,
updating, and approving the monthly board agenda.</description>
<programming-language>JavaScript</programming-language>
<programming-language>Ruby</programming-language>
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 969b35e2..1723e8a5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
web: # must agree with Rakefile
image: whimsy-web
build: .
- ports:
+ ports:
- "1999:80"
environment:
- "HOST_HOME=$HOME"
diff --git a/docker-config/whimsy.conf b/docker-config/whimsy.conf
index 2dac4d68..fd1fcfc7 100644
--- a/docker-config/whimsy.conf
+++ b/docker-config/whimsy.conf
@@ -6,7 +6,7 @@
# Vhost template in module puppetlabs-apache
# Managed by Puppet
# ************************************
-#
+#
<VirtualHost *:80>
ServerName whimsy.local
@@ -24,7 +24,7 @@
## Logging
ErrorLog "/var/log/apache2/whimsy_error.log"
ServerSignature Off
- CustomLog "/var/log/apache2/whimsy_access.log" combined
+ CustomLog "/var/log/apache2/whimsy_access.log" combined
## Server aliases
## ServerAlias whimsy6.apache.org
diff --git a/repository.yml b/repository.yml
index fa1208b0..7bab9f48 100644
--- a/repository.yml
+++ b/repository.yml
@@ -25,7 +25,7 @@
Bills:
url: private/financials/Bills
depth: skip
-
+
Meetings:
url: private/foundation/Meetings
diff --git a/secmail.py b/secmail.py
index 13713823..879d0da3 100644
--- a/secmail.py
+++ b/secmail.py
@@ -25,7 +25,7 @@ import gzip
import mailbox
import rfc822
import mimetypes
-import os
+import os
from datetime import datetime
from email.header import decode_header
from glob import glob
@@ -167,7 +167,7 @@ def detach(msg):
payload = payload.get_payload()
else:
payload = [payload]
-
+
# iterate over (possibly nested) attachments
for subpayload in payload:
if subpayload.get_content_type() in skip:
diff --git a/tools/asf-site-check.rb b/tools/asf-site-check.rb
index b619e9cc..b3c7f4d6 100644
--- a/tools/asf-site-check.rb
+++ b/tools/asf-site-check.rb
@@ -2,7 +2,7 @@
# Determines if a host name is controlled by the ASF
-# TODO: derive from the list at:
+# TODO: derive from the list at:
#
https://raw.githubusercontent.com/apache/privacy-website/main/policies/asf-domains.md
module ASFDOMAIN
diff --git a/tools/scan-page.js b/tools/scan-page.js
index fb3ff341..3980896e 100755
--- a/tools/scan-page.js
+++ b/tools/scan-page.js
@@ -45,7 +45,7 @@ if (!isASFhost(inithost)) {
}
interceptedRequest.abort();
}
- } else {
+ } else {
// Need to visit at least an initial redirect
interceptedRequest.continue();
}
diff --git a/www/401.html b/www/401.html
index b2d2999e..492f9c6f 100644
--- a/www/401.html
+++ b/www/401.html
@@ -75,12 +75,12 @@
</div>
<div class="panel-body">
<p class="lead">Tsk, tsk, that's secret magician stuff.
- Sorry, but a good magician never reveals their tricks -
+ Sorry, but a good magician never reveals their tricks -
you're not allowed to peek.
</p>
<p class="lead">
- If you are an Apache Committer, Member, or Officer,
- double-check that you entered your credentials correctly,
+ If you are an Apache Committer, Member, or Officer,
+ double-check that you entered your credentials correctly,
or check your <a href="https://id.apache.org/";>Apache ID</a>.
</p>
<p class="lead">
diff --git a/www/404.html b/www/404.html
index 5b4da7f2..1a20c700 100644
--- a/www/404.html
+++ b/www/404.html
@@ -74,8 +74,8 @@
</h2>
</div>
<div class="panel-body">
- <p class="lead">Whatever you're looking for is not there.
- We'll double-check our crystal balls, but you should
+ <p class="lead">Whatever you're looking for is not there.
+ We'll double-check our crystal balls, but you should
probably try another <a href="/">magic link</a>.
</p>
</div>
@@ -106,12 +106,12 @@
</div>
<div class="footer container-fluid" style="background-color: #f5f5f5;
padding: 10px;">
<p class="center">
- Copyright © 2020, the Apache Software Foundation. Licensed under the
+ Copyright © 2020, the Apache Software Foundation. Licensed under the
<a rel="license"
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version
2.0</a>
- |
+ |
<a href="https://www.apache.org/foundation/policies/privacy";>Privacy
Policy</a>
<br/>
- Apache®, the names of Apache projects, and the multicolor feather logo
are
+ Apache®, the names of Apache projects, and the multicolor feather logo
are
<a href="https://www.apache.org/foundation/marks/list/";>registered
trademarks or trademarks</a>
of the Apache Software Foundation in the United States and/or other
countries.
</p>
diff --git a/www/500.html b/www/500.html
index b373f30b..0422643e 100644
--- a/www/500.html
+++ b/www/500.html
@@ -75,11 +75,11 @@
</div>
<div class="panel-body">
<p class="lead">The server is having problems responding to that
URL, sorry!
- You can try waiting, waving a magic wand, or check the
+ You can try waiting, waving a magic wand, or check the
<a href="/status/">server status</a>. If the server status check
fails,
please check the <a href="https://status.apache.org";>ASF
status</a> page.
</p>
- <p class="lead">Access-protected server logs are in
+ <p class="lead">Access-protected server logs are in
<a href="/members/log/"><code>/members/log</code></a>
</p>
</div>
diff --git a/www/index.html b/www/index.html
index 4406e6dd..3776b380 100644
--- a/www/index.html
+++ b/www/index.html
@@ -10,11 +10,11 @@
header h2 span {display: none}
header:hover h2 span {display: inline}
aside {display: none}
- header:hover aside {margin-left: 4em; display: block;
+ header:hover aside {margin-left: 4em; display: block;
border: 3px solid #B7B; padding: 1em; border-radius: 1em;
position: absolute; background-color: white}
aside ol {margin-bottom: 0}
- .footer {
+ .footer {
margin-top: 20px;
margin-left: 20px;
}
@@ -64,7 +64,7 @@
</div>
</div>
</div>
-
+
<div class="content container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1">
diff --git a/www/technology.html b/www/technology.html
index 9f68749c..072069a5 100644
--- a/www/technology.html
+++ b/www/technology.html
@@ -7,7 +7,7 @@
<title>Apache Whimsy Project And Server Code</title>
<link rel="stylesheet" type="text/css" href="/assets/bootstrap-min.css"/>
<style type="text/css">
- .footer {
+ .footer {
margin-top: 20px;
margin-left: 20px;
}
@@ -52,16 +52,16 @@
</div>
</div>
</div>
-
+
<div class="content container-fluid">
<div class="row">
<div class="col-md-6 col-sm-4">
<h2>About Whimsy Code</h2>
<ul>
- <li>Get the source:
+ <li>Get the source:
<a href="https://gitbox.apache.org/repos/asf/whimsy.git";>Apache</a>
<a href="https://github.com/apache/whimsy";>GitHub</a></li>
- -
+ -
<a href="https://matt.apache.org/pushlogs.html?repo=whimsy";>Push
logs</a></li>
</li>
<li><a href="https://issues.apache.org/jira/browse/WHIMSY/";>Issue
Tracker</a></li>
@@ -71,7 +71,7 @@
<li><a
href="https://github.com/apache/whimsy/blob/master/DEPLOYMENT.md";>How to:
Deploy this server</a></li>
<li><a
href="https://github.com/apache/whimsy/blob/master/www/status/README.md";>How
to: Monitoring setup</a></li>
</ul>
- <h2>Operational Issues</h2>
+ <h2>Operational Issues</h2>
<ul>
<li><a href="status/">Current server status</a></li>
<li><a
href="https://lists.apache.org/[email protected]";>Contact the
Apache Whimsy Project</a></li>
@@ -80,7 +80,7 @@
</ul>
</div>
<div class="col-md-6 col-sm-4">
- <h2>Technology Behind Whimsy</h2>
+ <h2>Technology Behind Whimsy</h2>
<ul>
<li><a href="http://getbootstrap.com/";>Bootstrap</a></li>
<li><a href="http://www.w3.org/Style/CSS/";>CSS</a></li>
