(whimsy) branch master updated: Allow for null/nil as a scalar JSON value
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 d5708936 Allow for null/nil as a scalar JSON value
d5708936 is described below
commit d5708936a8fbf3b3f6adc0bb0f556da15db5e122
Author: Sebb
AuthorDate: Wed Jun 5 10:54:51 2024 +0100
Allow for null/nil as a scalar JSON value
---
lib/whimsy/asf/json-utils.rb | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/whimsy/asf/json-utils.rb b/lib/whimsy/asf/json-utils.rb
index 56d9285b..d433f113 100644
--- a/lib/whimsy/asf/json-utils.rb
+++ b/lib/whimsy/asf/json-utils.rb
@@ -13,18 +13,16 @@ module ASFJSON
bc ||= ['root']
h1.each do |k, v1|
v2 = h2[k]
- if v2.nil?
+ if !h2.include? k
yield [bc, 'Dropped', k, v1]
elsif v1 != v2
case v1.class.to_s
-when 'String', 'Integer'
- yield [bc, 'Scalar', k, [v1, v2]]
when 'Array'
yield [bc, 'Array', k, [v1, v2]]
when 'Hash'
self.cmphash v1, v2, [bc,k].flatten,
-else
- raise ArgumentError.new "#{bc.join('.')} #{k} Unexpected class
#{v1.class}"
+else # treat as scalar
+ yield [bc, 'Scalar', k, [v1, v2]]
end
end
end
@@ -77,4 +75,5 @@ if __FILE__ == $0
out = StringIO.new
ASFJSON.compare_json(old_json, new_json, out=out)
puts out.string
+
end
(whimsy) branch master updated: See if it is audit that causes the failure
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 594607bc See if it is audit that causes the failure 594607bc is described below commit 594607bc00a9d8724aeabb924c3452de071a17e2 Author: Sebb AuthorDate: Wed May 29 23:57:25 2024 +0100 See if it is audit that causes the failure --- .github/workflows/unittestagenda.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index 5037017e..fd336fd8 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -14,6 +14,7 @@ permissions: # added using https://github.com/step-security/secure-workflows jobs: test: strategy: + max-parallel: 1 # Run sequentially fail-fast: true matrix: os: [ubuntu-20.04, macos-latest] @@ -68,7 +69,7 @@ jobs: run: | cd www/board/agenda # SKIP_NAVIGATION=1 bundle exec rake RSPEC_OPTS='--pattern=secret*.rb' || echo "action_state=failed" >> $GITHUB_ENV -SKIP_NAVIGATION=1 bundle exec rake || echo "action_state=failed" >> $GITHUB_ENV +SKIP_AUDIT=1 SKIP_NAVIGATION=1 bundle exec rake || echo "action_state=failed" >> $GITHUB_ENV continue-on-error: true - name: Run Summary run: |
(whimsy) branch master updated: Allow to skip audit
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 5b04f8fd Allow to skip audit 5b04f8fd is described below commit 5b04f8fd8e30b5600ea2401a09719ea2eef83487 Author: Sebb AuthorDate: Wed May 29 23:23:05 2024 +0100 Allow to skip audit --- www/board/agenda/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile index bda9d3f3..e560b821 100644 --- a/www/board/agenda/Rakefile +++ b/www/board/agenda/Rakefile @@ -61,7 +61,7 @@ end file 'package-lock.json' => 'package.json' do sh 'npm install' sh 'touch package-lock.json' - sh 'npm audit fix --force' # as advised in GH action log + sh 'npm audit fix --force' unless ENV['SKIP_AUDIT'] # as advised in GH action log end file 'test/work' do
(whimsy) branch master updated: Allow for another name
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 0adcf4af Allow for another name 0adcf4af is described below commit 0adcf4afb8d2761a79bca4943b2c0c99512b729c Author: Sebb AuthorDate: Wed May 29 16:41:54 2024 +0100 Allow for another name --- lib/spec/lib/mail/mlist_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/spec/lib/mail/mlist_spec.rb b/lib/spec/lib/mail/mlist_spec.rb index c22a573d..61f37267 100644 --- a/lib/spec/lib/mail/mlist_spec.rb +++ b/lib/spec/lib/mail/mlist_spec.rb @@ -104,6 +104,7 @@ describe ASF::MLIST do expect(list.class).to eq(String) expect(dom).to match(/^[a-z.0-9-]+\.[a-z]+$/) next if list == 'commits.deprecated' # allow for unusual list name +next if list == '_test_ephemeral_' # allow for unusual list name expect(list).to match(/^[a-z0-9-]+$/) end end
(whimsy) branch master updated: Fix up some incorrect mailing list names
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 4379c9e6 Fix up some incorrect mailing list names
4379c9e6 is described below
commit 4379c9e69bf44627ed231e4eaa64e22e6a124281
Author: Sebb
AuthorDate: Wed May 29 15:58:56 2024 +0100
Fix up some incorrect mailing list names
---
lib/whimsy/asf/committee.rb | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/whimsy/asf/committee.rb b/lib/whimsy/asf/committee.rb
index d9f53bfb..f5c0a8d8 100644
--- a/lib/whimsy/asf/committee.rb
+++ b/lib/whimsy/asf/committee.rb
@@ -110,6 +110,8 @@ module ASF
# list names (e.g. dev, private) and .apache.org is to be
# appended. In some cases, the name contains an @ sign and
# is the full name for the mail list.
+# TODO: this is awkward to use as some non-PMCs have their own domain and
some don't
+# Should probably be replaced by mail_private and mail_dev
def mail_list
case name.downcase
when 'comdev'
@@ -121,8 +123,8 @@ module ASF
when 'brand'
'tradema...@apache.org'
- when 'infrastructure'
-'infra'
+ when 'infrastructure', 'infra'
+'priv...@infra.apache.org'
when 'dataprivacy'
'priv...@apache.org'
when 'legalaffairs' # Not sure what uses this
@@ -132,10 +134,9 @@ module ASF
when 'fundraising'
'fundraising-priv...@apache.org'
when 'marketingandpublicity'
-'pr...@apache.org'
- # now using priv...@tac.apache.org
- # when 'tac'
- # 'travel-assista...@apache.org'
+'mark...@apache.org'
+ when 'tac', 'diversity'
+ "private@#{name.downcase}.apache.org"
when 'w3crelations'
'w...@apache.org'
when 'concom'
(whimsy) branch master updated: What generates the warning
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 c4051de4 What generates the warning
c4051de4 is described below
commit c4051de45fb57beee632166a0759abe310247ade
Author: Sebb
AuthorDate: Wed May 29 09:13:51 2024 +0100
What generates the warning
---
www/roster/public_committee_info.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/roster/public_committee_info.rb
b/www/roster/public_committee_info.rb
index ffb02c53..e2952d62 100644
--- a/www/roster/public_committee_info.rb
+++ b/www/roster/public_committee_info.rb
@@ -206,7 +206,7 @@ if ARGV.length >= 2
end
else
unless active.include? key
-Wunderbar.warn "Has '#{key}'' retired? Could not find it in
committee-info.txt!"
+Wunderbar.warn "Checking committee-info.yml: has '#{key}'' retired?
Could not find it in committee-info.txt!"
end
end
end
(whimsy) branch master updated: Bump setup-node
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 766c8345 Bump setup-node 766c8345 is described below commit 766c834512e57b69a694670bb68ac71a70ad35f8 Author: Sebb AuthorDate: Mon May 27 23:29:09 2024 +0100 Bump setup-node --- .github/workflows/npmtest.yml| 2 +- .github/workflows/unittestagenda.yml | 2 +- .github/workflows/unittestnavigation.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/npmtest.yml b/.github/workflows/npmtest.yml index b58e7786..de88d79a 100644 --- a/.github/workflows/npmtest.yml +++ b/.github/workflows/npmtest.yml @@ -25,7 +25,7 @@ jobs: which -a node || true which -a npm || true echo "===" -- uses: actions/setup-node@v3 +- uses: actions/setup-node@v4 with: node-version: '18.16.0' - name: Check Path 2 diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index 22fb2917..5037017e 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -38,7 +38,7 @@ jobs: run: | brew install subversion if: runner.os == 'macOS' -- uses: actions/setup-node@v3 +- uses: actions/setup-node@v4 with: node-version: 'v21.4.0' # works on macOS - uses: actions/checkout@v4 diff --git a/.github/workflows/unittestnavigation.yml b/.github/workflows/unittestnavigation.yml index 4984c727..936420c9 100644 --- a/.github/workflows/unittestnavigation.yml +++ b/.github/workflows/unittestnavigation.yml @@ -21,7 +21,7 @@ jobs: sudo apt-get install libsasl2-dev sudo apt-get install libyaml-dev # psych 5.0.0 if: matrix.os == 'ubuntu-20.04' -- uses: actions/setup-node@v3 +- uses: actions/setup-node@v4 with: node-version: '18.16.0' # it seems that using the default Ubuntu version of node (14.19.0)
(whimsy) branch master updated: Move mail_list methods into main classes
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 1f37c99e Move mail_list methods into main classes 1f37c99e is described below commit 1f37c99eee85b8fb1b13ecfab478185c4bce04b3 Author: Sebb AuthorDate: Mon May 27 23:22:51 2024 +0100 Move mail_list methods into main classes --- lib/whimsy/asf/committee.rb | 42 ++ lib/whimsy/asf/mail.rb | 56 - lib/whimsy/asf/podling.rb | 10 3 files changed, 52 insertions(+), 56 deletions(-) diff --git a/lib/whimsy/asf/committee.rb b/lib/whimsy/asf/committee.rb index 0e9f0e74..d9f53bfb 100644 --- a/lib/whimsy/asf/committee.rb +++ b/lib/whimsy/asf/committee.rb @@ -105,6 +105,48 @@ module ASF @@namemap.call(name.downcase) end +# mailing list for this committee. Generally returns the first name in +# the dns (e.g. whimsical). If so, it can be prefixed by a number of +# list names (e.g. dev, private) and .apache.org is to be +# appended. In some cases, the name contains an @ sign and +# is the full name for the mail list. +def mail_list + case name.downcase + when 'comdev' +'community' + when 'httpcomponents' +'hc' + when 'whimsy' +'whimsical' + + when 'brand' +'tradema...@apache.org' + when 'infrastructure' +'infra' + when 'dataprivacy' +'priv...@apache.org' + when 'legalaffairs' # Not sure what uses this +'legal-inter...@apache.org' + when 'legal' # This seems to be used by the board agenda +'legal-priv...@apache.org' + when 'fundraising' +'fundraising-priv...@apache.org' + when 'marketingandpublicity' +'pr...@apache.org' + # now using priv...@tac.apache.org + # when 'tac' + # 'travel-assista...@apache.org' + when 'w3crelations' +'w...@apache.org' + when 'concom' +'plann...@apachecon.com' + when 'publicaffairs' +'public-affairs-priv...@apache.org' + else +name.downcase + end +end + # load committee info from committee-info.txt. Will not reparse # if the file has already been parsed and the underlying file has not # changed. diff --git a/lib/whimsy/asf/mail.rb b/lib/whimsy/asf/mail.rb index 38cea631..944917f4 100644 --- a/lib/whimsy/asf/mail.rb +++ b/lib/whimsy/asf/mail.rb @@ -331,60 +331,4 @@ module ASF end end - class Committee -# mailing list for this committee. Generally returns the first name in -# the dns (e.g. whimsical). If so, it can be prefixed by a number of -# list names (e.g. dev, private) and .apache.org is to be -# appended. In some cases, the name contains an @ sign and -# is the full name for the mail list. -def mail_list - case name.downcase - when 'comdev' -'community' - when 'httpcomponents' -'hc' - when 'whimsy' -'whimsical' - - when 'brand' -'tradema...@apache.org' - when 'infrastructure' -'infra' - when 'dataprivacy' -'priv...@apache.org' - when 'legalaffairs' # Not sure what uses this -'legal-inter...@apache.org' - when 'legal' # This seems to be used by the board agenda -'legal-priv...@apache.org' - when 'fundraising' -'fundraising-priv...@apache.org' - when 'marketingandpublicity' -'pr...@apache.org' - # now using priv...@tac.apache.org - # when 'tac' - # 'travel-assista...@apache.org' - when 'w3crelations' -'w...@apache.org' - when 'concom' -'plann...@apachecon.com' - when 'publicaffairs' -'public-affairs-priv...@apache.org' - else -name.downcase - end -end - end - - class Podling -# base name used in constructing mailing list name. -def mail_list - case name.downcase - when 'odftoolkit' -'odf' - else -name.downcase - end -end - end - end diff --git a/lib/whimsy/asf/podling.rb b/lib/whimsy/asf/podling.rb index d2fa0cf3..b0ffb8c7 100644 --- a/lib/whimsy/asf/podling.rb +++ b/lib/whimsy/asf/podling.rb @@ -285,6 +285,16 @@ module ASF ASF::Project.find(id).hasLDAP? end +# base name used in constructing mailing list name. +def mail_list + case name.downcase + when 'odftoolkit' +'odf' + else +name.downcase + end +end + # development mailing list associated with a given podling def dev_mail_list case name
(whimsy) branch master updated: No need to create top-level directory
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 fc4f74d5 No need to create top-level directory fc4f74d5 is described below commit fc4f74d50195537e211c6440017319cd7962e63c Author: Sebb AuthorDate: Mon May 27 23:18:52 2024 +0100 No need to create top-level directory --- .github/workflows/unittestagenda.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index ce3bd7a8..22fb2917 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -55,10 +55,9 @@ jobs: - name: setup agenda 2 # need to run the ruby that has all the gems installed run: | -sudo mkdir -p /srv -sudo bash -c 'printf "\n\n\n" >/srv/ldap.txt' -ls -l /srv +bash -c 'printf "\n\n\n" >.ldap.txt' echo ":ldap: ldaps://ldap-us.apache.org:636" >> .whimsy +echo ":ldap_creds: $PWD/.ldap.txt" >> .whimsy sudo $(which ruby) -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure" - name: show environ run: |
(whimsy) branch master updated: Need to add subversion for latest macOS versions
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 070442a6 Need to add subversion for latest macOS versions 070442a6 is described below commit 070442a6794824ee5a99dfcffc6f61b288520f16 Author: Sebb AuthorDate: Mon May 27 23:17:00 2024 +0100 Need to add subversion for latest macOS versions --- .github/workflows/unittestagenda.yml | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index 63c42b01..ce3bd7a8 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -32,7 +32,12 @@ jobs: sudo apt-get install libldap2-dev sudo apt-get install libsasl2-dev sudo apt-get install libyaml-dev # seems to be needed for installing ruby since psych 5.0.0 release - if: matrix.os != 'macos-latest' + if: runner.os != 'macOS' +# Default host no longer includes subversion +- name: setup macos + run: | +brew install subversion + if: runner.os == 'macOS' - uses: actions/setup-node@v3 with: node-version: 'v21.4.0' # works on macOS
(whimsy) branch master updated: Bump actions/checkout
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 4309b206 Bump actions/checkout
4309b206 is described below
commit 4309b2060496b648c96485bfa9e8e06a6774
Author: Sebb
AuthorDate: Mon May 27 23:13:39 2024 +0100
Bump actions/checkout
---
.github/workflows/unittestagenda.yml | 2 +-
.github/workflows/unittestlib.yml| 2 +-
.github/workflows/unittestnavigation.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/unittestagenda.yml
b/.github/workflows/unittestagenda.yml
index e383eab1..63c42b01 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -36,7 +36,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 'v21.4.0' # works on macOS
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/unittestlib.yml
b/.github/workflows/unittestlib.yml
index 5653624a..ca0108ca 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -34,7 +34,7 @@ jobs:
run: |
brew install subversion
if: ${{ runner.os == 'macOS' }}
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
with:
persist-credentials: false
- name: ruby
diff --git a/.github/workflows/unittestnavigation.yml
b/.github/workflows/unittestnavigation.yml
index 0eb5843d..4984c727 100644
--- a/.github/workflows/unittestnavigation.yml
+++ b/.github/workflows/unittestnavigation.yml
@@ -26,7 +26,7 @@ jobs:
node-version: '18.16.0'
# it seems that using the default Ubuntu version of node (14.19.0)
# somehow fails to set the correct path for rake to use
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: ruby/setup-ruby@v1
(whimsy) branch unit-test updated: Any good?
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch unit-test
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/unit-test by this push:
new 4027a932 Any good?
4027a932 is described below
commit 4027a9329554723363613bd58da336bec3e8535b
Author: Sebb
AuthorDate: Mon May 27 17:55:57 2024 +0100
Any good?
---
www/board/agenda/views/vue-config.js.rb| 4 ++--
www/project/icla/views/vue-config.js.rb| 4 ++--
www/roster/views/vue-config.js.rb | 4 ++--
www/secretary/workbench/views/vue-config.js.rb | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/www/board/agenda/views/vue-config.js.rb
b/www/board/agenda/views/vue-config.js.rb
index b2e9ae57..688b7b29 100644
--- a/www/board/agenda/views/vue-config.js.rb
+++ b/www/board/agenda/views/vue-config.js.rb
@@ -1,10 +1,10 @@
# Filter out "data property already declared as a prop" warnings
-Vue.config.warnHandler = proc do |msg, vm, trace|
+app.config.warnHandler = proc do |msg, vm, trace|
return if msg =~ /^The data property "\w+" is already declared as a prop\./
console.error "[Vue warn]: " + msg + trace if defined? console
end
# reraise uncapturable errors asynchronously to enable easier debugging
-Vue.config.errorHandler = proc do |err, vm, info|
+app.config.errorHandler = proc do |err, vm, info|
setTimeout(0) { raise err }
end
diff --git a/www/project/icla/views/vue-config.js.rb
b/www/project/icla/views/vue-config.js.rb
index b2e9ae57..688b7b29 100644
--- a/www/project/icla/views/vue-config.js.rb
+++ b/www/project/icla/views/vue-config.js.rb
@@ -1,10 +1,10 @@
# Filter out "data property already declared as a prop" warnings
-Vue.config.warnHandler = proc do |msg, vm, trace|
+app.config.warnHandler = proc do |msg, vm, trace|
return if msg =~ /^The data property "\w+" is already declared as a prop\./
console.error "[Vue warn]: " + msg + trace if defined? console
end
# reraise uncapturable errors asynchronously to enable easier debugging
-Vue.config.errorHandler = proc do |err, vm, info|
+app.config.errorHandler = proc do |err, vm, info|
setTimeout(0) { raise err }
end
diff --git a/www/roster/views/vue-config.js.rb
b/www/roster/views/vue-config.js.rb
index b2e9ae57..688b7b29 100644
--- a/www/roster/views/vue-config.js.rb
+++ b/www/roster/views/vue-config.js.rb
@@ -1,10 +1,10 @@
# Filter out "data property already declared as a prop" warnings
-Vue.config.warnHandler = proc do |msg, vm, trace|
+app.config.warnHandler = proc do |msg, vm, trace|
return if msg =~ /^The data property "\w+" is already declared as a prop\./
console.error "[Vue warn]: " + msg + trace if defined? console
end
# reraise uncapturable errors asynchronously to enable easier debugging
-Vue.config.errorHandler = proc do |err, vm, info|
+app.config.errorHandler = proc do |err, vm, info|
setTimeout(0) { raise err }
end
diff --git a/www/secretary/workbench/views/vue-config.js.rb
b/www/secretary/workbench/views/vue-config.js.rb
index b2e9ae57..688b7b29 100644
--- a/www/secretary/workbench/views/vue-config.js.rb
+++ b/www/secretary/workbench/views/vue-config.js.rb
@@ -1,10 +1,10 @@
# Filter out "data property already declared as a prop" warnings
-Vue.config.warnHandler = proc do |msg, vm, trace|
+app.config.warnHandler = proc do |msg, vm, trace|
return if msg =~ /^The data property "\w+" is already declared as a prop\./
console.error "[Vue warn]: " + msg + trace if defined? console
end
# reraise uncapturable errors asynchronously to enable easier debugging
-Vue.config.errorHandler = proc do |err, vm, info|
+app.config.errorHandler = proc do |err, vm, info|
setTimeout(0) { raise err }
end
(whimsy) branch unit-test updated: productionTip no longer available
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch unit-test
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/unit-test by this push:
new 252ca212 productionTip no longer available
252ca212 is described below
commit 252ca21250fc6e8229713ec9a9899d66590ac191
Author: Sebb
AuthorDate: Mon May 27 17:46:13 2024 +0100
productionTip no longer available
---
.github/workflows/unittestagenda.yml | 2 +-
www/board/agenda/spec/vue_server.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/unittestagenda.yml
b/.github/workflows/unittestagenda.yml
index a9a0ccba..d58c98b9 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
-os: [ubuntu-20.04, macos-latest]
+os: [ubuntu-20.04]
ruby: [2.7]
# os: [ubuntu-20.04, ubuntu-22.04]
# ruby: [2.7, 3.1]
diff --git a/www/board/agenda/spec/vue_server.rb
b/www/board/agenda/spec/vue_server.rb
index 97bc2ef8..42382b44 100644
--- a/www/board/agenda/spec/vue_server.rb
+++ b/www/board/agenda/spec/vue_server.rb
@@ -78,7 +78,7 @@ class VueServer
process.env.VUE_ENV = 'server'
Vue = require('vue')
-Vue.config.productionTip = false
+# Vue.config.productionTip = false
# render a response, using server side rendering
def Vue.renderResponse(component, response)
(whimsy) branch unit-test updated: Try upgrade to Vue3 (compat)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch unit-test in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/unit-test by this push: new c7f0fc0f Try upgrade to Vue3 (compat) c7f0fc0f is described below commit c7f0fc0fbe6b5df3e3e26bdc0e615e99ea8c20da Author: Sebb AuthorDate: Mon May 27 17:41:50 2024 +0100 Try upgrade to Vue3 (compat) --- .github/workflows/unittestagenda.yml | 2 +- www/board/agenda/package.json| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index a7c9ef49..a9a0ccba 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -1,6 +1,6 @@ name: Unit test agenda on: - # push: + push: # paths: # - '**/unittestagenda.yml' # - 'www/board/agenda/**' diff --git a/www/board/agenda/package.json b/www/board/agenda/package.json index e40ac3bc..ed2a2ff9 100644 --- a/www/board/agenda/package.json +++ b/www/board/agenda/package.json @@ -9,7 +9,7 @@ "jsdom": "^22.0.0", "jsdom-global": "^3.0.2", "jquery": "^3.2.1", -"vue": "^2.7.16", -"vue-server-renderer": "^2.7.16" +"vue": "^3.1.0", +"@vue/compat": "^3.1.0" } }
(whimsy) branch unit-test updated: Update to last Vue 2 release
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch unit-test in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/unit-test by this push: new 64d30185 Update to last Vue 2 release 64d30185 is described below commit 64d3018509df0e4e6c5ee1dd402159c4577d3c9c Author: Sebb AuthorDate: Mon May 27 17:07:43 2024 +0100 Update to last Vue 2 release --- www/board/agenda/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/board/agenda/package.json b/www/board/agenda/package.json index 620276f6..e40ac3bc 100644 --- a/www/board/agenda/package.json +++ b/www/board/agenda/package.json @@ -9,7 +9,7 @@ "jsdom": "^22.0.0", "jsdom-global": "^3.0.2", "jquery": "^3.2.1", -"vue": "^2.4.4", -"vue-server-renderer": "^2.4.4" +"vue": "^2.7.16", +"vue-server-renderer": "^2.7.16" } }
(whimsy) branch unit-test updated: Add subversion
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch unit-test
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/unit-test by this push:
new 90febbbe Add subversion
90febbbe is described below
commit 90febbbe7fef7209e23f0c3d87ddc1a060751ff9
Author: Sebb
AuthorDate: Mon May 27 16:46:38 2024 +0100
Add subversion
---
.github/workflows/unittestagenda.yml | 5 +
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/unittestagenda.yml
b/.github/workflows/unittestagenda.yml
index f4b8dea1..a7c9ef49 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -33,6 +33,11 @@ jobs:
sudo apt-get install libsasl2-dev
sudo apt-get install libyaml-dev # seems to be needed for installing
ruby since psych 5.0.0 release
if: runner.os != 'macOS'
+# Default host no longer includes subversion
+- name: setup macos
+ run: |
+brew install subversion
+ if: ${{ runner.os == 'macOS' }}
- uses: actions/setup-node@v3
with:
node-version: 'v21.4.0' # works on macOS
(whimsy) branch inline-privates deleted (was b96285db)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch inline-privates in repository https://gitbox.apache.org/repos/asf/whimsy.git was b96285db remove two data sources that no longer exist This change permanently discards the following revisions: discard b96285db remove two data sources that no longer exist
(whimsy) branch agenda_on_vue deleted (was 2cbab49a)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch agenda_on_vue in repository https://gitbox.apache.org/repos/asf/whimsy.git was 2cbab49a Merge branch 'master' into agenda_on_vue The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch vagrant deleted (was 455d6368)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch vagrant in repository https://gitbox.apache.org/repos/asf/whimsy.git was 455d6368 Remove from status check The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch ldapversion deleted (was 08573e25)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch ldapversion in repository https://gitbox.apache.org/repos/asf/whimsy.git was 08573e25 Allow update to ruby-ldap version The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch agenda-private deleted (was 0ab7ed18)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch agenda-private in repository https://gitbox.apache.org/repos/asf/whimsy.git was 0ab7ed18 Added info to icla message for folks who have not been invited. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch roster_on_vue deleted (was 92772668)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch roster_on_vue in repository https://gitbox.apache.org/repos/asf/whimsy.git was 92772668 put script in body The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch cml/test deleted (was 27053bc0)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch cml/test in repository https://gitbox.apache.org/repos/asf/whimsy.git was 27053bc0 test commit The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch cml/test created (now 27053bc0)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch cml/test in repository https://gitbox.apache.org/repos/asf/whimsy.git at 27053bc0 test commit No new revisions were added by this update.
(whimsy) branch cml/test deleted (was 27053bc0)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch cml/test in repository https://gitbox.apache.org/repos/asf/whimsy.git was 27053bc0 test commit The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch secmail-icla deleted (was 5afd0fa8)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch secmail-icla in repository https://gitbox.apache.org/repos/asf/whimsy.git was 5afd0fa8 secmail add (clear form) button to ICLA form The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch proxy-form deleted (was 834e3726)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch proxy-form in repository https://gitbox.apache.org/repos/asf/whimsy.git was 834e3726 update the meeting date for 2017 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch secmail_on_vue deleted (was a6ef877c)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch secmail_on_vue in repository https://gitbox.apache.org/repos/asf/whimsy.git was a6ef877c bunch o' fixes The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch reuse-auth-parser deleted (was b03e66cc)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch reuse-auth-parser in repository https://gitbox.apache.org/repos/asf/whimsy.git was b03e66cc preload more attrs, and don't die if person is not in LDAP The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch docker_mount_home deleted (was e150d91a)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch docker_mount_home in repository https://gitbox.apache.org/repos/asf/whimsy.git was e150d91a Allow per directory .whimsy overrides The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch signature_not_armored deleted (was 00a2825b)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch signature_not_armored in repository https://gitbox.apache.org/repos/asf/whimsy.git was 00a2825b Update incomplete.json.rb The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch script-font deleted (was d68b0ed1)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch script-font in repository https://gitbox.apache.org/repos/asf/whimsy.git was d68b0ed1 Update incomplete.json.rb The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch clr-apache-postal-address deleted (was 4df22955)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch clr-apache-postal-address in repository https://gitbox.apache.org/repos/asf/whimsy.git was 4df22955 Update incomplete.json.rb The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch WHIMSY-334 deleted (was 56cb08b4)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch WHIMSY-334 in repository https://gitbox.apache.org/repos/asf/whimsy.git was 56cb08b4 don't process keystrokes if focus is in an INPUT or TEXTAREA The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch iroh/update_agenda_instructions deleted (was 878a04c2)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch iroh/update_agenda_instructions in repository https://gitbox.apache.org/repos/asf/whimsy.git was 878a04c2 Updated prereqs The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch gs-typo-fix deleted (was acb2687c)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch gs-typo-fix in repository https://gitbox.apache.org/repos/asf/whimsy.git was acb2687c fix a typo The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(whimsy) branch unit-test updated: No need to create top-level dir
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch unit-test in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/unit-test by this push: new d53fb891 No need to create top-level dir d53fb891 is described below commit d53fb891297c44913228dbc482e701ec129887ab Author: Sebb AuthorDate: Mon May 27 15:56:28 2024 +0100 No need to create top-level dir --- .github/workflows/unittestagenda.yml | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index d3751005..f4b8dea1 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -14,9 +14,9 @@ permissions: # added using https://github.com/step-security/secure-workflows jobs: test: strategy: - fail-fast: true + fail-fast: false matrix: -os: [ubuntu-20.04, macos-13] +os: [ubuntu-20.04, macos-latest] ruby: [2.7] # os: [ubuntu-20.04, ubuntu-22.04] # ruby: [2.7, 3.1] @@ -50,10 +50,9 @@ jobs: - name: setup agenda 2 # need to run the ruby that has all the gems installed run: | -sudo mkdir -p /srv -sudo bash -c 'printf "\n\n\n" >/srv/ldap.txt' -ls -l /srv +bash -c 'printf "\n\n\n" >.ldap.txt' echo ":ldap: ldaps://ldap-us.apache.org:636" >> .whimsy +echo ":ldap_creds: $PWD/.ldap.txt" >> .whimsy sudo $(which ruby) -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure" - name: show environ run: |
(whimsy) branch unit-test updated: Try an earlier macOS
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch unit-test in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/unit-test by this push: new d01b70f2 Try an earlier macOS d01b70f2 is described below commit d01b70f2f0d7998a953a78a01ddfd32e8e9b61c1 Author: Sebb AuthorDate: Mon May 27 15:45:22 2024 +0100 Try an earlier macOS --- .github/workflows/unittestagenda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittestagenda.yml b/.github/workflows/unittestagenda.yml index 63c42b01..d3751005 100644 --- a/.github/workflows/unittestagenda.yml +++ b/.github/workflows/unittestagenda.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: true matrix: -os: [ubuntu-20.04, macos-latest] +os: [ubuntu-20.04, macos-13] ruby: [2.7] # os: [ubuntu-20.04, ubuntu-22.04] # ruby: [2.7, 3.1] @@ -32,7 +32,7 @@ jobs: sudo apt-get install libldap2-dev sudo apt-get install libsasl2-dev sudo apt-get install libyaml-dev # seems to be needed for installing ruby since psych 5.0.0 release - if: matrix.os != 'macos-latest' + if: runner.os != 'macOS' - uses: actions/setup-node@v3 with: node-version: 'v21.4.0' # works on macOS
(whimsy) branch unit-test updated: Update checkout action
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch unit-test
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/unit-test by this push:
new 6abaa7ce Update checkout action
6abaa7ce is described below
commit 6abaa7ce9d7700461198be2c6005713d08d9c214
Author: Sebb
AuthorDate: Mon May 27 15:39:29 2024 +0100
Update checkout action
---
.github/workflows/unittestagenda.yml | 2 +-
.github/workflows/unittestlib.yml| 2 +-
.github/workflows/unittestnavigation.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/unittestagenda.yml
b/.github/workflows/unittestagenda.yml
index e383eab1..63c42b01 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -36,7 +36,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 'v21.4.0' # works on macOS
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/unittestlib.yml
b/.github/workflows/unittestlib.yml
index 5653624a..ca0108ca 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -34,7 +34,7 @@ jobs:
run: |
brew install subversion
if: ${{ runner.os == 'macOS' }}
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
with:
persist-credentials: false
- name: ruby
diff --git a/.github/workflows/unittestnavigation.yml
b/.github/workflows/unittestnavigation.yml
index 0eb5843d..4984c727 100644
--- a/.github/workflows/unittestnavigation.yml
+++ b/.github/workflows/unittestnavigation.yml
@@ -26,7 +26,7 @@ jobs:
node-version: '18.16.0'
# it seems that using the default Ubuntu version of node (14.19.0)
# somehow fails to set the correct path for rake to use
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: ruby/setup-ruby@v1
(whimsy) 01/01: Merge mail_list into main class
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch unit-test in repository https://gitbox.apache.org/repos/asf/whimsy.git commit 9353a8af6b78d0bcf743420713700dcb58e64e66 Author: Sebb AuthorDate: Mon May 27 15:34:06 2024 +0100 Merge mail_list into main class --- lib/whimsy/asf/committee.rb | 42 ++ lib/whimsy/asf/mail.rb | 56 - lib/whimsy/asf/podling.rb | 10 3 files changed, 52 insertions(+), 56 deletions(-) diff --git a/lib/whimsy/asf/committee.rb b/lib/whimsy/asf/committee.rb index 0e9f0e74..d9f53bfb 100644 --- a/lib/whimsy/asf/committee.rb +++ b/lib/whimsy/asf/committee.rb @@ -105,6 +105,48 @@ module ASF @@namemap.call(name.downcase) end +# mailing list for this committee. Generally returns the first name in +# the dns (e.g. whimsical). If so, it can be prefixed by a number of +# list names (e.g. dev, private) and .apache.org is to be +# appended. In some cases, the name contains an @ sign and +# is the full name for the mail list. +def mail_list + case name.downcase + when 'comdev' +'community' + when 'httpcomponents' +'hc' + when 'whimsy' +'whimsical' + + when 'brand' +'tradema...@apache.org' + when 'infrastructure' +'infra' + when 'dataprivacy' +'priv...@apache.org' + when 'legalaffairs' # Not sure what uses this +'legal-inter...@apache.org' + when 'legal' # This seems to be used by the board agenda +'legal-priv...@apache.org' + when 'fundraising' +'fundraising-priv...@apache.org' + when 'marketingandpublicity' +'pr...@apache.org' + # now using priv...@tac.apache.org + # when 'tac' + # 'travel-assista...@apache.org' + when 'w3crelations' +'w...@apache.org' + when 'concom' +'plann...@apachecon.com' + when 'publicaffairs' +'public-affairs-priv...@apache.org' + else +name.downcase + end +end + # load committee info from committee-info.txt. Will not reparse # if the file has already been parsed and the underlying file has not # changed. diff --git a/lib/whimsy/asf/mail.rb b/lib/whimsy/asf/mail.rb index 38cea631..944917f4 100644 --- a/lib/whimsy/asf/mail.rb +++ b/lib/whimsy/asf/mail.rb @@ -331,60 +331,4 @@ module ASF end end - class Committee -# mailing list for this committee. Generally returns the first name in -# the dns (e.g. whimsical). If so, it can be prefixed by a number of -# list names (e.g. dev, private) and .apache.org is to be -# appended. In some cases, the name contains an @ sign and -# is the full name for the mail list. -def mail_list - case name.downcase - when 'comdev' -'community' - when 'httpcomponents' -'hc' - when 'whimsy' -'whimsical' - - when 'brand' -'tradema...@apache.org' - when 'infrastructure' -'infra' - when 'dataprivacy' -'priv...@apache.org' - when 'legalaffairs' # Not sure what uses this -'legal-inter...@apache.org' - when 'legal' # This seems to be used by the board agenda -'legal-priv...@apache.org' - when 'fundraising' -'fundraising-priv...@apache.org' - when 'marketingandpublicity' -'pr...@apache.org' - # now using priv...@tac.apache.org - # when 'tac' - # 'travel-assista...@apache.org' - when 'w3crelations' -'w...@apache.org' - when 'concom' -'plann...@apachecon.com' - when 'publicaffairs' -'public-affairs-priv...@apache.org' - else -name.downcase - end -end - end - - class Podling -# base name used in constructing mailing list name. -def mail_list - case name.downcase - when 'odftoolkit' -'odf' - else -name.downcase - end -end - end - end diff --git a/lib/whimsy/asf/podling.rb b/lib/whimsy/asf/podling.rb index d2fa0cf3..b0ffb8c7 100644 --- a/lib/whimsy/asf/podling.rb +++ b/lib/whimsy/asf/podling.rb @@ -285,6 +285,16 @@ module ASF ASF::Project.find(id).hasLDAP? end +# base name used in constructing mailing list name. +def mail_list + case name.downcase + when 'odftoolkit' +'odf' + else +name.downcase + end +end + # development mailing list associated with a given podling def dev_mail_list case name
(whimsy) branch unit-test created (now 9353a8af)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch unit-test in repository https://gitbox.apache.org/repos/asf/whimsy.git at 9353a8af Merge mail_list into main class This branch includes the following new commits: new 9353a8af Merge mail_list into main class The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(whimsy-whimsical-site) branch asf-site updated: changed link
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/whimsy-whimsical-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 610416f changed link 610416f is described below commit 610416fa510c91e9c80c316f38d58c481aa3db2d Author: Sebb AuthorDate: Sat May 18 09:37:57 2024 +0100 changed link --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index ab92baa..70fdba4 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,4 +1,4 @@ -# See: https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features +# See: https://github.com/apache/infrastructure-asfyaml/blob/main/README.md publish: profile: ~
(whimsy) branch master updated: Wrong check
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 e05573b4 Wrong check
e05573b4 is described below
commit e05573b4e26df0657e8cdbf07a5068e4d9082c4e
Author: Sebb
AuthorDate: Sat May 18 09:23:10 2024 +0100
Wrong check
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 271635fd..1fd906b4 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -170,7 +170,7 @@ def parse(id, site, name, podling=false)
subpages[site2.to_s] = a
end
rescue StandardError => e
-if show_anyway or
!%w(a_href).include?('fineract.gateway.scarf.sh/{version}') # reported, but not
yet fixed, so suppress noise
+if show_anyway or
!a_href.include?('fineract.gateway.scarf.sh/{version}') # reported, but not yet
fixed, so suppress noise
$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
end
end
(whimsy) branch master updated: Fix logic
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 e7002de9 Fix logic
e7002de9 is described below
commit e7002de995599411ac62ae324b642fb49786ebe6
Author: Sebb
AuthorDate: Sat May 18 02:32:02 2024 +0100
Fix logic
---
tools/site-scan.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index b74f8878..271635fd 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -67,7 +67,7 @@ end
# @return Hash of symbols: text|url found from a check made
# @see SiteStandards for definitions of what we should scan for (in general)
def parse(id, site, name, podling=false)
- show_anyway = Time.now.gmtime.strftime("%H") == '00' # show suppressed
errors once a day
+ show_anyway = Time.now.gmtime.strftime("%H") == '08' # show suppressed
errors once a day
data = {}
# force https to avoid issue with cache (sites should use https anyway)
site.sub!(%r{^http:},'https:')
@@ -170,7 +170,7 @@ def parse(id, site, name, podling=false)
subpages[site2.to_s] = a
end
rescue StandardError => e
-unless show_anyway or
%w(a_href).include?('fineract.gateway.scarf.sh/{version}') # reported, but not
yet fixed, so suppress noise
+if show_anyway or
!%w(a_href).include?('fineract.gateway.scarf.sh/{version}') # reported, but not
yet fixed, so suppress noise
$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
end
end
@@ -221,7 +221,7 @@ def parse(id, site, name, podling=false)
nodisclaimer << subpage
end
else
- unless show_anyway or %w(nlpcraft teaclave).include? id # reported,
but not yet fixed, so suppress noise
+ if show_anyway or !%w(nlpcraft teaclave).include? id # reported, but
not yet fixed, so suppress noise
$stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
end
end
(whimsy) branch master updated: Show suppressed errors daily
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 35146a99 Show suppressed errors daily
35146a99 is described below
commit 35146a9970bae3295be8007a179ceb0e09043188
Author: Sebb
AuthorDate: Sat May 18 00:34:26 2024 +0100
Show suppressed errors daily
---
tools/site-scan.rb | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 51d6647a..b74f8878 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -67,6 +67,7 @@ end
# @return Hash of symbols: text|url found from a check made
# @see SiteStandards for definitions of what we should scan for (in general)
def parse(id, site, name, podling=false)
+ show_anyway = Time.now.gmtime.strftime("%H") == '00' # show suppressed
errors once a day
data = {}
# force https to avoid issue with cache (sites should use https anyway)
site.sub!(%r{^http:},'https:')
@@ -169,7 +170,9 @@ def parse(id, site, name, podling=false)
subpages[site2.to_s] = a
end
rescue StandardError => e
-$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
+unless show_anyway or
%w(a_href).include?('fineract.gateway.scarf.sh/{version}') # reported, but not
yet fixed, so suppress noise
+ $stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
+end
end
end
end
@@ -218,7 +221,7 @@ def parse(id, site, name, podling=false)
nodisclaimer << subpage
end
else
- unless %w(nlpcraft teaclave).include? id # reported, but not yet
fixed, so suppress noise
+ unless show_anyway or %w(nlpcraft teaclave).include? id # reported,
but not yet fixed, so suppress noise
$stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
end
end
(whimsy) branch master updated: Show potential download pages
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 c9860dee Show potential download pages
c9860dee is described below
commit c9860deef2378401d297148617756c928725b0dc
Author: Sebb
AuthorDate: Thu May 9 22:59:27 2024 +0100
Show potential download pages
---
tools/site-scan.rb | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 44582153..51d6647a 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -199,12 +199,11 @@ def parse(id, site, name, podling=false)
end
end
- # Brief scan of initial sub-pages to look for disclaimers
- # TODO also look for a download page?
- if podling
-hasdisclaimer = 0
-nodisclaimer = []
-subpages.each do |subpage, anchor|
+ # Brief scan of initial sub-pages to look for disclaimers and downloads
+ hasdisclaimer = 0
+ nodisclaimer = []
+ subpages.each do |subpage, anchor|
+if podling
begin
uri, response, status = $cache.get(subpage)
if uri&.to_s == subpage or uri&.to_s == subpage + '/'
@@ -224,12 +223,15 @@ def parse(id, site, name, podling=false)
end
end
rescue URI::InvalidURIError
+# ignore
end
end
-if nodisclaimer.size > 0
- data[:disclaimers] = [hasdisclaimer, nodisclaimer]
-end
end
+ if nodisclaimer.size > 0
+data[:disclaimers] = [hasdisclaimer, nodisclaimer]
+ end
+ # Show potential download pages
+ data[:downloads] = subpages.select{|k,_v| k =~
%r{download|release|install|dlcdn\.apache\.org|dyn/closer}i}
# THIRD: see if an image has been uploaded
data[:image] = ASF::SiteImage.find(id)
(whimsy) branch master updated: No longer need to allow for the bug
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 974b73b8 No longer need to allow for the bug
974b73b8 is described below
commit 974b73b8b27f62372f9bd346305a013d065ed1cd
Author: Sebb
AuthorDate: Thu May 9 17:25:53 2024 +0100
No longer need to allow for the bug
---
lib/whimsy/cache.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/whimsy/cache.rb b/lib/whimsy/cache.rb
index a3103c19..420e17db 100644
--- a/lib/whimsy/cache.rb
+++ b/lib/whimsy/cache.rb
@@ -61,8 +61,7 @@ class Cache
if data and (lastmod or etag)
cond = {}
cond['If-Modified-Since'] = lastmod if lastmod
- # Allow for Apache Bug 45023
- cond['If-None-Match'] = etag.gsub(/-gzip"$/,'"') if etag
+ cond['If-None-Match'] = etag if etag
uri, res = fetch(url, cond)
if res.is_a?(Net::HTTPSuccess)
write_cache(url, res)
@@ -111,6 +110,7 @@ class Cache
options.each do |k,v|
request[k] = v
end
+ Wunderbar.debug "Request: #{request.to_hash.inspect}"
response = http.request(request)
Wunderbar.debug "Headers: #{response.to_hash.inspect}"
Wunderbar.debug response.code
(whimsy) branch master updated: Report bad options
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 6d34eb01 Report bad options
6d34eb01 is described below
commit 6d34eb01c161de8273788c80c6eb00aa32816560
Author: Sebb
AuthorDate: Wed May 8 12:32:02 2024 +0100
Report bad options
---
tools/site-scan.rb | 5 +
1 file changed, 5 insertions(+)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 70494439..44582153 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -339,6 +339,11 @@ $verbose = ARGV.delete '--verbose'
$saveparse = ARGV.delete '--saveparse'
$skipresourcecheck = ARGV.delete '--noresource'
+k = ARGV.select {|k| k.start_with? '-'}
+if k.size > 0
+ raise "Unexpected options: #{k} (valid: verbose, saveparse, noresource)"
+end
+
puts "Started: #{Time.now}" # must agree with site-scan monitor
# USAGE:
(whimsy) branch master updated: Move recipient to start of subject for easier scanning
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 834c7297 Move recipient to start of subject for easier scanning
834c7297 is described below
commit 834c7297285234eab267ee2b075518c955f1c048
Author: Sebb
AuthorDate: Tue May 7 11:38:35 2024 +0100
Move recipient to start of subject for easier scanning
---
www/board/agenda/views/buttons/email.js.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/board/agenda/views/buttons/email.js.rb
b/www/board/agenda/views/buttons/email.js.rb
index c12d503e..d0edd53b 100644
--- a/www/board/agenda/views/buttons/email.js.rb
+++ b/www/board/agenda/views/buttons/email.js.rb
@@ -45,7 +45,7 @@ class Email < Vue
cc = "#{mail_list},#{@@item.cc}"
if @@item.missing
- subject = "[REMINDER] Please submit the #{@@item.title} Board Report"
+ subject = "[REMINDER] #{@@item.title} Please submit your Board Report"
if @@item.attach =~ /^\d/
body = %{
Dear #{@@item.owner},
(whimsy) branch master updated: Try to clarify the GitHub id field
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 271d7d18 Try to clarify the GitHub id field 271d7d18 is described below commit 271d7d187810f54c6fa43cb713823f6f12af4d22 Author: Sebb AuthorDate: Tue May 7 11:30:48 2024 +0100 Try to clarify the GitHub id field --- www/roster/views/person/github.js.rb | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/www/roster/views/person/github.js.rb b/www/roster/views/person/github.js.rb index e992c419..e99bcd71 100644 --- a/www/roster/views/person/github.js.rb +++ b/www/roster/views/person/github.js.rb @@ -8,10 +8,9 @@ class PersonGitHub < Vue _div.row data_edit: 'github' do _div.name do -_ 'GitHub username(s) ' -_b '(user-provided)' +_ 'GitHub username(s)' _br -_b 'N.B. not synched with the linked id' +_b 'N.B. not synched with the ASF-linked id' _br _a 'Link GitHub username to ASF id', href: 'https://gitbox.apache.org/boxer/' end @@ -52,7 +51,7 @@ class PersonGitHub < Vue end end end -_ '(user-provided, so might not be the one linked to the ASF id)' +_ '(The above are added by the user, so might not match the one linked to the ASF id)' end end end
(whimsy) branch master updated: Check all non-error for disclaimer
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 1f0729ef Check all non-error for disclaimer
1f0729ef is described below
commit 1f0729ef9972821b14497b46090a3d843402a5b0
Author: Sebb
AuthorDate: Tue May 7 08:09:18 2024 +0100
Check all non-error for disclaimer
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index e40e5462..70494439 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -212,7 +212,7 @@ def parse(id, site, name, podling=false)
else
puts "#{id} #{subpage} => #{uri} #{status}"
end
-if %w{unchanged recent updated}.include? status
+unless status == 'error'
if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
hasdisclaimer += 1
else
(whimsy) branch master updated: Docco
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 8b438bf5 Docco 8b438bf5 is described below commit 8b438bf5807768ccc17c9cd4f18890185ee6bbd5 Author: Sebb AuthorDate: Sun May 5 22:50:19 2024 +0100 Docco --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 0bfa0032..493ade2f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' +# The gemspec line tells bundler that it can find a .gemspec file alongside the Gemfile. gemspec gem 'mime-types' gem 'wunderbar'
(whimsy) branch master updated: Unused
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 c38439cd Unused c38439cd is described below commit c38439cd8a76a9260352933c3ea325e324e6e73b Author: Sebb AuthorDate: Sun May 5 22:38:22 2024 +0100 Unused --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index cc7f05ee..0bfa0032 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source 'https://rubygems.org' -root = '..' gemspec gem 'mime-types' gem 'wunderbar'
(whimsy) branch master updated: For local overrides
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 476c1255 For local overrides 476c1255 is described below commit 476c12559b873425751bd08d3368670c906d9c5f Author: Sebb AuthorDate: Sun May 5 22:34:24 2024 +0100 For local overrides --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 59742496..1c0596b0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ work maintenance.txt migrating.txt .ruby-version +asfldap.version
(whimsy) branch master updated: Allow override of Cache directory
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 9693ce71 Allow override of Cache directory
9693ce71 is described below
commit 9693ce712f44b3cae2c032c515a147e018c7a2c9
Author: Sebb
AuthorDate: Sun May 5 12:34:31 2024 +0100
Allow override of Cache directory
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index a7f5750c..e40e5462 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -334,7 +334,7 @@ end
# Main execution begins here
results = {}
podlings = {}
-$cache = Cache.new(dir: 'site-scan')
+$cache = Cache.new(dir: ENV['SITE_SCAN_CACHE'] || 'site-scan')
$verbose = ARGV.delete '--verbose'
$saveparse = ARGV.delete '--saveparse'
$skipresourcecheck = ARGV.delete '--noresource'
(whimsy) branch master updated (36e353c0 -> 820edd52)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git from 36e353c0 Don't delete attachments on completion add 08573e25 Allow update to ruby-ldap version new 820edd52 Trailing space The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: asf.gemspec | 10 -- lib/Gemfile | 9 - 2 files changed, 16 insertions(+), 3 deletions(-)
(whimsy) 01/01: Trailing space
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
commit 820edd52deff5f29ea3430f4262b5c0969001625
Author: Sebb
AuthorDate: Sun May 5 10:36:52 2024 +0100
Trailing space
---
lib/Gemfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Gemfile b/lib/Gemfile
index 7d8dfc35..458a94db 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-ldapversion =
+ldapversion =
begin
File.read(File.expand_path('../../asfldap.version', __FILE__)).strip
rescue Exception => e
(whimsy) 01/01: Allow update to ruby-ldap version
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch ldapversion
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 08573e25d93beb9dedf6be20d9d95ae2be638784
Author: Sebb
AuthorDate: Sat May 4 22:59:41 2024 +0100
Allow update to ruby-ldap version
---
asf.gemspec | 10 --
lib/Gemfile | 9 -
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/asf.gemspec b/asf.gemspec
index 6ac263a2..fa2529e6 100644
--- a/asf.gemspec
+++ b/asf.gemspec
@@ -1,10 +1,16 @@
version = File.read(File.expand_path('../asf.version', __FILE__)).strip
+ldapversion =
+begin
+ File.read(File.expand_path('../asfldap.version', __FILE__)).strip
+rescue Exception => e
+ nil
+end
Gem::Specification.new do |s|
# Change these as appropriate
s.name = "whimsy-asf"
- s.license= 'Apache License, Version 2.0'
+ s.license= 'Apache-2.0'
s.version= version
s.summary= "Whimsy 'model' of the ASF"
s.author = "Sam Ruby"
@@ -23,7 +29,7 @@ Gem::Specification.new do |s|
# relevant versions
s.add_dependency("nokogiri")
s.add_dependency("rack")
- s.add_dependency("ruby-ldap")
+ s.add_dependency("ruby-ldap", ldapversion)
s.add_dependency("tzinfo")
s.add_dependency("tzinfo-data")
s.add_dependency("wunderbar")
diff --git a/lib/Gemfile b/lib/Gemfile
index bc814767..7d8dfc35 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -1,10 +1,17 @@
source 'https://rubygems.org'
+ldapversion =
+begin
+ File.read(File.expand_path('../../asfldap.version', __FILE__)).strip
+rescue Exception => e
+ nil
+end
+
# lib needs these at run-time
gem 'json'
gem 'nokogiri'
gem 'rake'
-gem 'ruby-ldap'
+gem 'ruby-ldap', ldapversion
gem 'wunderbar'
gem 'pdf-reader'
(whimsy) branch ldapversion created (now 08573e25)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch ldapversion in repository https://gitbox.apache.org/repos/asf/whimsy.git at 08573e25 Allow update to ruby-ldap version This branch includes the following new commits: new 08573e25 Allow update to ruby-ldap version The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(whimsy) branch master updated: Don't delete attachments on completion
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 36e353c0 Don't delete attachments on completion
36e353c0 is described below
commit 36e353c0ceac282f988ab1504eac4b8992acd6b2
Author: Sebb
AuthorDate: Sat May 4 00:34:01 2024 +0100
Don't delete attachments on completion
Makes it easier to reprocess if necessary
---
www/secretary/workbench/views/parts.js.rb | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/www/secretary/workbench/views/parts.js.rb
b/www/secretary/workbench/views/parts.js.rb
index a5a2558c..84717462 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -543,6 +543,18 @@ class Parts < Vue
}
end
+ # delete a message (keeping attachments)
+ def delete_message(event)
+@busy = true
+pathname = window.parent.location.pathname
+HTTP.delete(pathname).then {
+ window.parent.location.href = '../..'
+}.catch {|error|
+ alert error
+ @busy = false
+}
+ end
+
# delete an attachment
def delete_attachment(event)
data = {
@@ -736,7 +748,7 @@ class Parts < Vue
# tasklist completion events
def status_update(event)
if event.data.status == 'complete'
- self.delete_attachment(event)
+ self.delete_message(event)
elsif event.data.status == 'keep'
@selected = nil
@form = :categorize
(whimsy) branch master updated: Bug - incorrectly converted
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 8b324e62 Bug - incorrectly converted
8b324e62 is described below
commit 8b324e62397cbe4f4550c571cbbc998f50e58ac4
Author: Sebb
AuthorDate: Fri May 3 15:00:42 2024 +0100
Bug - incorrectly converted
---
lib/whimsy/asf/string-utils.rb | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/whimsy/asf/string-utils.rb b/lib/whimsy/asf/string-utils.rb
index b660273d..6e7a0e60 100644
--- a/lib/whimsy/asf/string-utils.rb
+++ b/lib/whimsy/asf/string-utils.rb
@@ -58,13 +58,12 @@ module ASFString
# fix encoding errors
def self.fix_encoding(text)
-result = text
-
-if encoding == Encoding::BINARY
- result = encode('utf-8', invalid: :replace, undef: :replace)
+
+if text.encoding == Encoding::BINARY
+ return text.encode('utf-8', invalid: :replace, undef: :replace)
end
+return text
-result
end
end
@@ -79,4 +78,7 @@ if __FILE__ == $0
# puts txt
puts ASFString.word_wrap(txt)
puts ASFString.reflow(txt)
+ text="\x05\x00\x68\x65\x6c\x6c\x6f"
+ text.force_encoding(Encoding::BINARY)
+ puts ASFString.fix_encoding(text)
end
(whimsy) branch master updated: Typo
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 b7c3d6de Typo
b7c3d6de is described below
commit b7c3d6de88998c9813e7e5e8e359ac284e9e8848
Author: Sebb
AuthorDate: Wed May 1 22:58:30 2024 +0100
Typo
---
www/members/invitations.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/members/invitations.cgi b/www/members/invitations.cgi
index 46369198..27a336ec 100755
--- a/www/members/invitations.cgi
+++ b/www/members/invitations.cgi
@@ -160,7 +160,7 @@ _html do
else
_b "Applications can no longer be accepted, sorry."
_ "The meeting ended at
#{Time.at(meeting_end).getutc.strftime('%Y-%m-%d %H:%M %Z')}."
- _ "This was #{remain[:days]} days and #{remain[:hours]} hours
ago."
+ _ "Applications closed #{remain[:days]} days and
#{remain[:hours]} hours ago."
end
end
}
(whimsy) branch master updated: Reduce noise
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 d7df9f0a Reduce noise
d7df9f0a is described below
commit d7df9f0a0277b134c60ea4f4bfd4c2c8851d1992
Author: Sebb
AuthorDate: Sun Apr 28 14:54:11 2024 +0100
Reduce noise
---
tools/site-scan.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 41adc6f5..a7f5750c 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -219,7 +219,9 @@ def parse(id, site, name, podling=false)
nodisclaimer << subpage
end
else
- $stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
+ unless %w(nlpcraft teaclave).include? id # reported, but not yet
fixed, so suppress noise
+$stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
+ end
end
rescue URI::InvalidURIError
end
(whimsy) branch master updated: Fix up link text once
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 8d2e6e57 Fix up link text once
8d2e6e57 is described below
commit 8d2e6e5794b1c45f82dc542ebb058840e1624438
Author: Sebb
AuthorDate: Sat Apr 27 23:32:39 2024 +0100
Fix up link text once
---
tools/download_check.rb | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/download_check.rb b/tools/download_check.rb
index c5c1fc06..27ab7568 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -282,7 +282,8 @@ def get_links(path, body, checkSpaces=false)
if href =~ %r{^?Preferred=https?://}
href = path + URI.decode_www_form_component(href)
end
-text = node.text.gsub(/[[:space:]]+/, ' ').strip
+# Strip spurious text from link (age, baremaps)
+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
@@ -581,15 +582,13 @@ def _checkDownloadPage(path, tlp, version)
else
E "Bug: found hash #{h} for missing artifact #{stem}"
end
- t.sub!('âžš', '') # age
- t.strip!
next if t == '' # empire-db
tmp = text2ext(t)
next if ext == tmp # i.e. link is just the type or [TYPE]
next if ext == 'sha' and tmp == 'sha1' # historic
next if %w(sha256 md5 mds sha512 sha1).include?(ext) and %w(SHA digest
Digest CheckSum checksums).include?(t) # generic
next if ext == 'mds' and (tmp == 'hashes' or t == 'Digests')
- if base != t
+ unless base == t or h == t # Allow for full path to sig/hash
if t == 'Download' # MXNet
W "Mismatch: #{h} and '#{t}'"
elsif not %w{checksum Hash}.include? t
(whimsy) branch master updated: Oops
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 89f4152e Oops
89f4152e is described below
commit 89f4152866ea985fa4b618c963673336cd58
Author: Sebb
AuthorDate: Fri Apr 26 11:09:33 2024 +0100
Oops
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 3657a26c..41adc6f5 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -163,7 +163,7 @@ def parse(id, site, name, podling=false)
if a_href =~ %r{^https?://} # no need to rebase this
site2 = URI.parse(a_href.gsub(' ','%20').gsub('|', '%7C')) # needs
to be a URI
else
- site2 = URI.join(site,a_href.gsub(' ','%20').gsub('|', '%7C') # HACK
+ site2 = URI.join(site,a_href.gsub(' ','%20').gsub('|', '%7C')) # HACK
end
if site2.host == uri.host and site2.path.size > 2
subpages[site2.to_s] = a
(whimsy) branch master updated: Alloe for more special chars
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 284e4efa Alloe for more special chars
284e4efa is described below
commit 284e4efac417fde8866233299fd6e02574adaa3a
Author: Sebb
AuthorDate: Fri Apr 26 09:12:23 2024 +0100
Alloe for more special chars
---
tools/site-scan.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 3790ee23..3657a26c 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -161,9 +161,9 @@ def parse(id, site, name, podling=false)
unless a_href =~ %r{^(#|mailto:)}
begin
if a_href =~ %r{^https?://} # no need to rebase this
- site2 = URI.parse(a_href) # needs to be a URI
+ site2 = URI.parse(a_href.gsub(' ','%20').gsub('|', '%7C')) # needs
to be a URI
else
- site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
+ site2 = URI.join(site,a_href.gsub(' ','%20').gsub('|', '%7C') # HACK
end
if site2.host == uri.host and site2.path.size > 2
subpages[site2.to_s] = a
(whimsy) branch master updated: Fix up stale credentials
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 1810b574 Fix up stale credentials 1810b574 is described below commit 1810b574daf4f48d64662da525f880f4766dd0c2 Author: Sebb AuthorDate: Thu Apr 25 17:22:36 2024 +0100 Fix up stale credentials --- docker-config/25-authz_ldap_group_membership.conf | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-config/25-authz_ldap_group_membership.conf b/docker-config/25-authz_ldap_group_membership.conf index 1ce8054e..1680b2a3 100644 --- a/docker-config/25-authz_ldap_group_membership.conf +++ b/docker-config/25-authz_ldap_group_membership.conf @@ -59,8 +59,8 @@ # LDAP alias: infrastructure AuthLDAPUrl "ldaps://ldap-us.apache.org:636 ldap-eu.apache.org:636/ou=people,dc=apache,dc=org?uid" - AuthLDAPBindDN cn=nss_p6,ou=users,ou=services,dc=apache,dc=org - AuthLDAPBindPassword "exec:/usr/bin/asfldapsearch --pwd" + AuthLDAPBindDN <%= ldapbinddn %> + AuthLDAPBindPassword "<%= ldapbindpw %>" AuthLDAPGroupAttribute member AuthLDAPGroupAttributeIsDN on AuthLDAPMaxSubGroupDepth 0 @@ -69,8 +69,8 @@ # LDAP alias: apldap AuthLDAPUrl "ldaps://ldap-us.apache.org:636 ldap-eu.apache.org:636/ou=people,dc=apache,dc=org?uid" - AuthLDAPBindDN cn=nss_p6,ou=users,ou=services,dc=apache,dc=org - AuthLDAPBindPassword "exec:/usr/bin/asfldapsearch --pwd" + AuthLDAPBindDN <%= ldapbinddn %> + AuthLDAPBindPassword "<%= ldapbindpw %>" AuthLDAPGroupAttribute member AuthLDAPGroupAttributeIsDN on AuthLDAPMaxSubGroupDepth 0
(whimsy) branch master updated: Fix file name
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 cb97709c Fix file name
cb97709c is described below
commit cb97709c1100d9865d1adb904f1b274e926fddc8
Author: Sebb
AuthorDate: Thu Apr 25 15:27:42 2024 +0100
Fix file name
---
lib/whimsy/asf/committee.rb | 4 ++--
www/test/dataflow.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/whimsy/asf/committee.rb b/lib/whimsy/asf/committee.rb
index a2402194..0e9f0e74 100644
--- a/lib/whimsy/asf/committee.rb
+++ b/lib/whimsy/asf/committee.rb
@@ -305,9 +305,9 @@ module ASF
contents
end
-# record termination date in committee-info.yml
+# record termination date in committee-info.yaml
# Params:
-# - input: the contents of committee-info.yml
+# - input: the contents of committee-info.yaml
# - pmc: the pmc name
# - mm: -MM retirement date
# Returns: the updated contents
diff --git a/www/test/dataflow.json b/www/test/dataflow.json
index cac408a4..098ea569 100644
--- a/www/test/dataflow.json
+++ b/www/test/dataflow.json
@@ -19,7 +19,7 @@
"maintainer": "/www/roster/public_committee_info.rb",
"sources": [
"/lib/whimsy/asf/committee.rb",
- "private/committers/board/committee-info.yml"
+ "private/committers/board/committee-info.yaml"
]
},
"https://whimsy.apache.org/public/icla-info.json": {
(whimsy) 02/02: Show anchor for error 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
commit 736aa0fdc2d4517b1e8617b17bc7ee061f1cbdda
Author: Sebb
AuthorDate: Thu Apr 25 14:00:51 2024 +0100
Show anchor for error URLs
---
tools/site-scan.rb | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 1a907412..3790ee23 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -7,7 +7,6 @@
#
# Makes no value judgements. Simply extracts raw data for offline analysis.
$LOAD_PATH.unshift '/srv/whimsy/lib'
-require 'set'
require 'net/http'
require 'nokogiri'
require 'json'
@@ -103,7 +102,7 @@ def parse(id, site, name, podling=false)
end
data[:uri] = uri.to_s
- subpages = Set.new
+ subpages = Hash.new
# FIRST: scan each link's a_href to see if we need to capture it
# also capture script src for events, and some page refs for podlings
doc.traverse do |a|
@@ -167,7 +166,7 @@ def parse(id, site, name, podling=false)
site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
end
if site2.host == uri.host and site2.path.size > 2
- subpages.add site2.to_s
+ subpages[site2.to_s] = a
end
rescue StandardError => e
$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
@@ -205,7 +204,7 @@ def parse(id, site, name, podling=false)
if podling
hasdisclaimer = 0
nodisclaimer = []
-subpages.each do |subpage|
+subpages.each do |subpage, anchor|
begin
uri, response, status = $cache.get(subpage)
if uri&.to_s == subpage or uri&.to_s == subpage + '/'
@@ -219,6 +218,8 @@ def parse(id, site, name, podling=false)
else
nodisclaimer << subpage
end
+else
+ $stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
end
rescue URI::InvalidURIError
end
(whimsy) branch master updated (83488587 -> 736aa0fd)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git from 83488587 Show error text new ce25fdac Don't show trivial URL changes new 736aa0fd Show anchor for error URLs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: tools/site-scan.rb | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-)
(whimsy) 01/02: Don't show trivial URL changes
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
commit ce25fdaca37a7c627e9dc72362bdd1a04eb42425
Author: Sebb
AuthorDate: Thu Apr 25 13:46:07 2024 +0100
Don't show trivial URL changes
---
tools/site-scan.rb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 9877fb58..1a907412 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -208,7 +208,11 @@ def parse(id, site, name, podling=false)
subpages.each do |subpage|
begin
uri, response, status = $cache.get(subpage)
-puts "#{id} #{subpage} => #{uri} #{status}" # uri might be nil
+if uri&.to_s == subpage or uri&.to_s == subpage + '/'
+ puts "#{id} #{uri} #{status}"
+else
+ puts "#{id} #{subpage} => #{uri} #{status}"
+end
if %w{unchanged recent updated}.include? status
if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
hasdisclaimer += 1
(whimsy) branch master updated: Show error text
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 83488587 Show error text
83488587 is described below
commit 83488587ec6ced95e8c31be86b99082e0c7ab202
Author: Sebb
AuthorDate: Thu Apr 25 13:26:12 2024 +0100
Show error text
---
tools/site-scan.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 96d1d2bd..9877fb58 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -169,8 +169,8 @@ def parse(id, site, name, podling=false)
if site2.host == uri.host and site2.path.size > 2
subpages.add site2.to_s
end
- rescue StandardError
-$stderr.puts "#{id}: Bad a_href #{a_href}"
+ rescue StandardError => e
+$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
end
end
end
(whimsy) branch master updated: Needs to be a URI
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 8ac7efea Needs to be a URI
8ac7efea is described below
commit 8ac7efea44f494d0372aa386a992e41307fcf5e7
Author: Sebb
AuthorDate: Thu Apr 25 13:17:39 2024 +0100
Needs to be a URI
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 92255621..96d1d2bd 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -162,7 +162,7 @@ def parse(id, site, name, podling=false)
unless a_href =~ %r{^(#|mailto:)}
begin
if a_href =~ %r{^https?://} # no need to rebase this
- site2 = a_href
+ site2 = URI.parse(a_href) # needs to be a URI
else
site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
end
(whimsy) branch master updated: Have to do it ourselves now
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 df051701 Have to do it ourselves now
df051701 is described below
commit df05170108f8776f9bcb6fe64b4bb48b6e48f9c3
Author: Sebb
AuthorDate: Thu Apr 25 13:11:03 2024 +0100
Have to do it ourselves now
---
.github/workflows/unittestlib.yml | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/unittestlib.yml
b/.github/workflows/unittestlib.yml
index eb1ed68a..5653624a 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -15,8 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
-# Subversion not currently present on macos-13+
-os: [macos-12, ubuntu-20.04, ubuntu-22.04]
+os: [macos-latest, ubuntu-20.04, ubuntu-22.04]
ruby: [2.7, 3.1]
# 2.7 not supported on 22.04
exclude:
@@ -24,13 +23,17 @@ jobs:
ruby: 2.7
runs-on: ${{ matrix.os }}
steps:
-- name: setup # needed for installing ruby-ldap
+- name: setup non-macOS # needed for installing ruby-ldap
run: |
sudo apt-get update
sudo apt-get install libldap2-dev
sudo apt-get install libsasl2-dev
sudo apt-get install libyaml-dev # seems to be needed for installing
ruby since psych 5.0.0 release
- if: matrix.os != 'macos-latest'
+ if: ${{ runner.os != 'macOS' }}
+- name: setup macos
+ run: |
+brew install subversion
+ if: ${{ runner.os == 'macOS' }}
- uses: actions/checkout@v3
with:
persist-credentials: false
(whimsy) branch master updated: Tidy up matched text
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 6d03c8b5 Tidy up matched text
6d03c8b5 is described below
commit 6d03c8b53bba67c25e375ba460121978fb94652d
Author: Sebb
AuthorDate: Thu Apr 25 13:01:04 2024 +0100
Tidy up matched text
---
tools/download_check.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/download_check.rb b/tools/download_check.rb
index b62d3135..c5c1fc06 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -488,8 +488,10 @@ def _checkDownloadPage(path, tlp, version)
hasGPGverify = false
# Check if GPG verify has two parameters
- body.scan(%r{^.+gpg --verify.+$}) { |m|
+ body.scan(%r{gpg --verify.+$}) { |m|
hasGPGverify = true
+# Hack to tidy matched text: drop spans and truncate at or
+m.gsub!(%r{]+>|}, '').sub!(%r{(https://www.apache.org/info/verification.html#specify_both;
end
(whimsy) branch master updated: Allow for missing Subversion
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 d53c6b39 Allow for missing Subversion d53c6b39 is described below commit d53c6b39da4b873b9e901f3c4c5b29c1e7c1924d Author: Sebb AuthorDate: Thu Apr 25 12:33:36 2024 +0100 Allow for missing Subversion --- .github/workflows/unittestlib.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittestlib.yml b/.github/workflows/unittestlib.yml index aea0ee98..eb1ed68a 100644 --- a/.github/workflows/unittestlib.yml +++ b/.github/workflows/unittestlib.yml @@ -15,7 +15,8 @@ jobs: strategy: fail-fast: false matrix: -os: [macos-latest, ubuntu-20.04, ubuntu-22.04] +# Subversion not currently present on macos-13+ +os: [macos-12, ubuntu-20.04, ubuntu-22.04] ruby: [2.7, 3.1] # 2.7 not supported on 22.04 exclude:
(whimsy) branch master updated: Match new log messages
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 a9a500d0 Match new log messages
a9a500d0 is described below
commit a9a500d08869af4185986194e9c255726a199dea
Author: Sebb
AuthorDate: Thu Apr 25 11:41:25 2024 +0100
Match new log messages
---
www/status/monitors/site_scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/status/monitors/site_scan.rb b/www/status/monitors/site_scan.rb
index 4fcca158..d2cca96d 100644
--- a/www/status/monitors/site_scan.rb
+++ b/www/status/monitors/site_scan.rb
@@ -20,7 +20,7 @@ def Monitor.site_scan(previous_status)
log = File.read(logfile)
# Drop standard cache info
- log.gsub! /^([-\w]+ )*https?:\S+ \w+\n/, ''
+ log.gsub! /^([-\w]+ )*https?:\S+ (=> \S* )?\w+\n/, ''
# Drop other info (must agree with scanner script)
log.gsub! %r{^(Started|Ended|Events):.+\n}, '' # drop 'Events: already have'
(whimsy) branch master updated: Fix up relative links
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 591e32cb Fix up relative links
591e32cb is described below
commit 591e32cb2af5384522663ce3c573bd12326f1396
Author: Sebb
AuthorDate: Thu Apr 25 11:20:31 2024 +0100
Fix up relative links
---
tools/site-scan.rb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 9e2c614d..92255621 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -161,7 +161,11 @@ def parse(id, site, name, podling=false)
end
unless a_href =~ %r{^(#|mailto:)}
begin
-site2 = URI.join(site,a_href.gsub(' ','+'))
+if a_href =~ %r{^https?://} # no need to rebase this
+ site2 = a_href
+else
+ site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
+end
if site2.host == uri.host and site2.path.size > 2
subpages.add site2.to_s
end
(whimsy) branch master updated: Show original page for error case
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 90ca069a Show original page for error case
90ca069a is described below
commit 90ca069af28d2396fb56c56a77eb4e78e190ce86
Author: Sebb
AuthorDate: Thu Apr 25 09:18:10 2024 +0100
Show original page for error case
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 583d4617..9e2c614d 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -204,7 +204,7 @@ def parse(id, site, name, podling=false)
subpages.each do |subpage|
begin
uri, response, status = $cache.get(subpage)
-puts "#{id} #{uri} #{status}"
+puts "#{id} #{subpage} => #{uri} #{status}" # uri might be nil
if %w{unchanged recent updated}.include? status
if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
hasdisclaimer += 1
(whimsy) branch master updated: Docco
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 87b7877e Docco 87b7877e is described below commit 87b7877eb670fd5518217511b00d8e591b5ef7d5 Author: Sebb AuthorDate: Thu Apr 25 09:14:41 2024 +0100 Docco --- lib/whimsy/cache.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/whimsy/cache.rb b/lib/whimsy/cache.rb index cab0f0c1..a3103c19 100644 --- a/lib/whimsy/cache.rb +++ b/lib/whimsy/cache.rb @@ -42,8 +42,8 @@ class Cache # # Returns: # - uri (after redirects) - # - content - # - status: nocache, recent, updated, missing or no last mod/etag + # - content - or response if status is error + # - status: nocache, recent, updated, unchanged, error, cachemiss or no last mod/etag def get(url) if not @enabled uri, res = fetch(url)
(whimsy) branch master updated: Identify site with bad ref
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 b1c52f60 Identify site with bad ref
b1c52f60 is described below
commit b1c52f60fb99f7a7bd616c8a098789cca6c74f21
Author: Sebb
AuthorDate: Thu Apr 25 09:05:01 2024 +0100
Identify site with bad ref
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index b52ea858..583d4617 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -166,7 +166,7 @@ def parse(id, site, name, podling=false)
subpages.add site2.to_s
end
rescue StandardError
-$stderr.puts "Bad a_href #{a_href}"
+$stderr.puts "#{id}: Bad a_href #{a_href}"
end
end
end
(whimsy) branch master updated: Check for failed fetch
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 fe4ee630 Check for failed fetch
fe4ee630 is described below
commit fe4ee630fdaf3f3be27acb5fcfb82a34a6aafef6
Author: Sebb
AuthorDate: Thu Apr 25 08:45:51 2024 +0100
Check for failed fetch
---
tools/site-scan.rb | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index f57a832e..b52ea858 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -204,10 +204,13 @@ def parse(id, site, name, podling=false)
subpages.each do |subpage|
begin
uri, response, status = $cache.get(subpage)
-if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
- hasdisclaimer += 1
-else
- nodisclaimer << subpage
+puts "#{id} #{uri} #{status}"
+if %w{unchanged recent updated}.include? status
+ if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
+hasdisclaimer += 1
+ else
+nodisclaimer << subpage
+ end
end
rescue URI::InvalidURIError
end
(whimsy) branch master updated: Look for disclaimer away from home page
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 87295b5c Look for disclaimer away from home page
87295b5c is described below
commit 87295b5c305ba64447012d3285c97592b3c6d5d5
Author: Sebb
AuthorDate: Thu Apr 25 01:03:47 2024 +0100
Look for disclaimer away from home page
TODO: add this into reports
---
tools/site-scan.rb | 45 -
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 4e267580..f57a832e 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -7,6 +7,7 @@
#
# Makes no value judgements. Simply extracts raw data for offline analysis.
$LOAD_PATH.unshift '/srv/whimsy/lib'
+require 'set'
require 'net/http'
require 'nokogiri'
require 'json'
@@ -66,7 +67,7 @@ end
# Parse an Apache project website and return text|urls that match our checks
# @return Hash of symbols: text|url found from a check made
# @see SiteStandards for definitions of what we should scan for (in general)
-def parse(id, site, name)
+def parse(id, site, name, podling=false)
data = {}
# force https to avoid issue with cache (sites should use https anyway)
site.sub!(%r{^http:},'https:')
@@ -102,8 +103,9 @@ def parse(id, site, name)
end
data[:uri] = uri.to_s
+ subpages = Set.new
# FIRST: scan each link's a_href to see if we need to capture it
- # also capture script src for events
+ # also capture script src for events, and some page refs for podlings
doc.traverse do |a|
if a.name == 'script'
@@ -157,6 +159,16 @@ def parse(id, site, name)
end
end
end
+unless a_href =~ %r{^(#|mailto:)}
+ begin
+site2 = URI.join(site,a_href.gsub(' ','+'))
+if site2.host == uri.host and site2.path.size > 2
+ subpages.add site2.to_s
+end
+ rescue StandardError
+$stderr.puts "Bad a_href #{a_href}"
+ end
+end
end
# SECOND: scan each text node to match and capture
@@ -183,6 +195,28 @@ def parse(id, site, name)
data[:disclaimer] = t
end
end
+
+ # Brief scan of initial sub-pages to look for disclaimers
+ # TODO also look for a download page?
+ if podling
+hasdisclaimer = 0
+nodisclaimer = []
+subpages.each do |subpage|
+ begin
+uri, response, status = $cache.get(subpage)
+if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
+ hasdisclaimer += 1
+else
+ nodisclaimer << subpage
+end
+ rescue URI::InvalidURIError
+ end
+end
+if nodisclaimer.size > 0
+ data[:disclaimers] = [hasdisclaimer, nodisclaimer]
+end
+ end
+
# THIRD: see if an image has been uploaded
data[:image] = ASF::SiteImage.find(id)
@@ -299,10 +333,11 @@ puts "Started: #{Time.now}" # must agree with site-scan
monitor
# If additional projname|podlingname are provided, only scans those sites
if ARGV.first =~ /^https?:\/\/\w/
# Scan a single URL provided by user
- site = ARGV.shift
+ podling = ARGV.delete('--podling')
+ site = ARGV.shift.dup # needs to be unfrozen
name = ARGV.shift || site[/\/(\w[^.]*)/, 1].capitalize
output_projects = ARGV.shift
- results[name] = parse(name, site, name)
+ results[name] = parse(name, site, name, podling)
else
# Gather output filenames (if any) and scan various projects
if ARGV.first =~ %r{[./]} # have we a file name?
@@ -335,7 +370,7 @@ else
if ARGV.length > 0
next unless ARGV.include? podling.name
end
- podlings[podling.name] = parse(podling.name,
podling.podlingStatus[:website], podling.display_name)
+ podlings[podling.name] = parse(podling.name,
podling.podlingStatus[:website], podling.display_name, true)
end
end
end
(whimsy) branch master updated: Obsolete
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 e6072e81 Obsolete e6072e81 is described below commit e6072e81dd79747728f09a5f7ab5a64798aa8580 Author: Sebb AuthorDate: Tue Apr 23 21:31:57 2024 +0100 Obsolete --- docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1723e8a5..5c95b8ad 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3' services: web: # must agree with Rakefile image: whimsy-web
(whimsy) branch master updated: Add separato
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 5e1f5532 Add separato
5e1f5532 is described below
commit 5e1f553217c7d2038644297b80797cbfaba7bdd9
Author: Sebb
AuthorDate: Tue Apr 23 21:15:19 2024 +0100
Add separato
---
www/members/page-scanner.cgi | 1 +
1 file changed, 1 insertion(+)
diff --git a/www/members/page-scanner.cgi b/www/members/page-scanner.cgi
index 6bda8d67..05ef3428 100755
--- a/www/members/page-scanner.cgi
+++ b/www/members/page-scanner.cgi
@@ -45,6 +45,7 @@ if qs =~ %r{^url=(https?://[^&]+)(?:&(.+))?}
puts ""
puts "Transitive references:"
extras.each do |k, v|
+puts "" #separator
puts "Loaded by: "+k
v.each do |url,_|
print ASFDOMAIN.asfurl?(url) ? 'OK ' : 'NO '
(whimsy) branch master updated: Look for nested JS references
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 4acc5ccd Look for nested JS references
4acc5ccd is described below
commit 4acc5ccd514c0efad141da3d65979a4b38d86f4e
Author: Sebb
AuthorDate: Tue Apr 23 17:08:22 2024 +0100
Look for nested JS references
---
tools/scan-page.js | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/tools/scan-page.js b/tools/scan-page.js
index 6aa31787..c5ea2910 100755
--- a/tools/scan-page.js
+++ b/tools/scan-page.js
@@ -18,6 +18,10 @@ if (!isASFhost(inithost)) {
throw new Error("Only ASF hosts are supported - saw " + inithost);
}
+function getHost(url) {
+ return new URL(url).host;
+}
+
(async () => {
// new fails with:
// Error: Failed to launch the browser process!
@@ -41,8 +45,12 @@ if (!isASFhost(inithost)) {
console.log(url);
interceptedRequest.continue();
} else if (option == 'allref') {
- let iniurl = interceptedRequest.initiator().url;
- if (iniurl && !iniurl.startsWith(target)) { // second level
+ ini = interceptedRequest.initiator();
+ let iniurl = ini.url;
+ if (!iniurl && ini.stack) {
+iniurl = ini.stack.callFrames[0].url;
+ }
+ if (iniurl && inithost != getHost(iniurl)) { // second level
console.log(url + ' <= ' + iniurl);
} else {
console.log(url);
(whimsy) branch master updated: Cannot share /srv/gems
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 400799db Cannot share /srv/gems 400799db is described below commit 400799db3478a120417468901be01532d450c61a Author: Sebb AuthorDate: Tue Apr 23 13:38:31 2024 +0100 Cannot share /srv/gems --- DOCKER.md | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/DOCKER.md b/DOCKER.md index d0455fc1..316a0763 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -5,7 +5,8 @@ Docker execution instructions 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. +This is experimental at this point, and may not work if you have already +used it to set up a local macOS installation. Do *NOT* proceed unless you are comfortable with the notion of containers, images, Dockerfiles, Volumes, Port Forwarding, and likely Docker Compose. @@ -56,6 +57,9 @@ Installation instructions * The `svn` and `git` sub-directories cannot be links to another part of host file system outside of your home directory as those files will not be visible to the container. +* The /srv/gems directory cannot be shared between macOS and the container. + This is because some Gems have native code, and the bundler versions are + unlikely to be the same. * `cd` into that directory * `git clone g...@github.com:apache/whimsy.git` OR * `git clone https://github.com/apache/whimsy.git` (whichever works best for you) @@ -65,7 +69,7 @@ Installation instructions There is a sample template `whimsy/config/bash_aliases.template` to get you started * `mkdir apache2_logs` if required - this will be used for the server logs (makes it easier to review them) * `cd whimsy` -* Start Docker if necessary: `$ open /Applications/Docker.app` +* Start Docker if necessary: `$ open [~]/Applications/Docker.app` * `rake docker:update` # this runs docker:build and updates any Gems * If you are using a local copy of SVN, you will need to start the server and run `rake svn:update` from a shell * Otherwise you can run `rake svn:update` externally
(whimsy) branch master updated: Another Docker reference
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 dffb0ecd Another Docker reference
dffb0ecd is described below
commit dffb0ecdf7e4e43145625caeeb0ea3d97f5e5ee5
Author: Sebb
AuthorDate: Tue Apr 23 13:11:41 2024 +0100
Another Docker reference
---
config/setupmymac | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/config/setupmymac b/config/setupmymac
index 1115eb1b..d574f63c 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -82,6 +82,15 @@ def sudo
end
end
+def findDocker
+ if Dir.exist? "#{Dir.home}/Applications/Docker.app"
+return "#{Dir.home}/Applications/Docker.app"
+ elsif Dir.exist? '/Applications/Docker.app'
+return '/Applications/Docker.app'
+ end
+ return nil
+end
+
### Parse options to determine how whimsy code is to be run
option = :www
@@ -178,7 +187,7 @@ sudo_user = ENV['SUDO_USER'] ?
### Install Homebrew
-unless $root and (option != :docker or not Dir.exist?
'/Applications/Docker.app')
+unless $root and (option != :docker or not findDocker)
if `which brew`.empty?
script =
'https://raw.githubusercontent.com/Homebrew/install/master/install'
color %($ ruby -e "$(curl -fsSL #{script})")
@@ -334,12 +343,7 @@ if force[:prune]
end
if option == :docker
- dockerapp = nil
- if Dir.exist? "#{Dir.home}/Applications/Docker.app"
-dockerapp = "#{Dir.home}/Applications/Docker.app"
- elsif Dir.exist? '/Applications/Docker.app'
-dockerapp = '/Applications/Docker.app'
- end
+ dockerapp = findDocker
unless dockerapp
dockerapp = '/Applications/Docker.app'
brew 'cask', 'install', 'docker'
(whimsy) branch master updated: Try to allow for locally installed Docker
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 03ec59e4 Try to allow for locally installed Docker
03ec59e4 is described below
commit 03ec59e4f319b0277c82d0932229c75780744f11
Author: Sebb
AuthorDate: Tue Apr 23 12:18:57 2024 +0100
Try to allow for locally installed Docker
---
config/setupmymac | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/config/setupmymac b/config/setupmymac
index b7e73dab..1115eb1b 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -66,6 +66,8 @@ def brew *args
run 'brew', *args
end
+# TODO: this does not work well for dry-run;
+# the script can be called multiple times
# Switch to root
def sudo
if $root
@@ -332,19 +334,27 @@ if force[:prune]
end
if option == :docker
- unless Dir.exist? '/Applications/Docker.app'
+ dockerapp = nil
+ if Dir.exist? "#{Dir.home}/Applications/Docker.app"
+dockerapp = "#{Dir.home}/Applications/Docker.app"
+ elsif Dir.exist? '/Applications/Docker.app'
+dockerapp = '/Applications/Docker.app'
+ end
+ unless dockerapp
+dockerapp = '/Applications/Docker.app'
brew 'cask', 'install', 'docker'
end
if `which docker-compose`.empty?
-run 'open /Applications/Docker.app'
+run dockerapp
end
unless system 'docker info > /dev/null 2>&1'
-run 'open /Applications/Docker.app'
+run dockerapp
end
unless $root
+# TODO: this is wrong if Docker is to be used alongside a local install
Dir.chdir '/srv/whimsy' do
run 'rake docker:update'
end
(whimsy) branch master updated: Typo
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 7c59d292 Typo 7c59d292 is described below commit 7c59d2928119260554a2a2cb6f685e4d99fbc836 Author: Sebb AuthorDate: Tue Apr 23 11:29:49 2024 +0100 Typo --- config/setupmymac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/setupmymac b/config/setupmymac index ef4ef35c..b7e73dab 100755 --- a/config/setupmymac +++ b/config/setupmymac @@ -327,7 +327,7 @@ if force[:prune] end run 'docker', 'container', 'prune', '--force' - run 'docker', 'imagea', 'prune', '--force' + run 'docker', 'image', 'prune', '--force' exit end
(whimsy) branch master updated: Don't show empty changes
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 8e5708cc Don't show empty changes 8e5708cc is described below commit 8e5708cca46c887616c2deb08ddb2cab3f8555d5 Author: Sebb AuthorDate: Tue Apr 23 11:19:03 2024 +0100 Don't show empty changes --- lib/whimsy/asf/json-utils.rb | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/whimsy/asf/json-utils.rb b/lib/whimsy/asf/json-utils.rb index 4afe29ae..56d9285b 100644 --- a/lib/whimsy/asf/json-utils.rb +++ b/lib/whimsy/asf/json-utils.rb @@ -47,7 +47,15 @@ module ASFJSON out.puts [bcj, key, v1, '=>', v2].inspect when 'Array' v1, v2 = args -out.puts [bcj, key, 'Dropped', v1-v2, 'Added', v2-v1].inspect +dropped = v1 - v2 +added = v2 - v1 +if dropped.size == 0 + out.puts [bcj, key, 'Added', v2-v1].inspect +elsif added.size == 0 + out.puts [bcj, key, 'Dropped', v1-v2].inspect +else + out.puts [bcj, key, 'Dropped', v1-v2, 'Added', v2-v1].inspect +end when 'Dropped' out.puts [bcj, 'Dropped', key, args].inspect when 'Added'
(whimsy) branch master updated: Can use personal LDAP creds
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 7e7a04f8 Can use personal LDAP creds 7e7a04f8 is described below commit 7e7a04f8dfdea4518dc39b8ca3b4af02a8d05a06 Author: Sebb AuthorDate: Tue Apr 23 11:12:36 2024 +0100 Can use personal LDAP creds --- config/whimsy.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/whimsy.template b/config/whimsy.template index e9f01848..f4f64591 100644 --- a/config/whimsy.template +++ b/config/whimsy.template @@ -28,4 +28,6 @@ # Optionally define httpd_dn in case you want to use a different role for httpd authentication # :whimsy_dn: cn=,ou=users,ou=services,dc=apache,dc=org +# Or you can use your personal credentials: +# :whimsy_dn: uid=,ou=people,dc=apache,dc=org # :httpd_dn: cn=,ou=users,ou=services,dc=apache,dc=org
(whimsy) branch master updated: Synch with updated LDAP auth using aliases
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 0bd608c4 Synch with updated LDAP auth using aliases 0bd608c4 is described below commit 0bd608c47f3a08c2c6633e6fa239192c03c79fef Author: Sebb AuthorDate: Sun Apr 21 22:29:39 2024 +0100 Synch with updated LDAP auth using aliases --- docker-config/whimsy.conf | 105 -- 1 file changed, 35 insertions(+), 70 deletions(-) diff --git a/docker-config/whimsy.conf b/docker-config/whimsy.conf index 2f3cf6ed..bc8637df 100644 --- a/docker-config/whimsy.conf +++ b/docker-config/whimsy.conf @@ -73,10 +73,7 @@ ExpiresActive On AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute memberUid - AuthLDAPGroupAttributeIsDN off - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=member,ou=groups,dc=apache,dc=org + Require ldap-alias-member @@ -223,10 +220,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=committers,ou=role,ou=groups,dc=apache,dc=org + Require ldap-alias-committer @@ -236,10 +230,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=committers,ou=role,ou=groups,dc=apache,dc=org + Require ldap-alias-committer @@ -249,10 +240,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=committers,ou=role,ou=groups,dc=apache,dc=org + Require ldap-alias-committer @@ -262,10 +250,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=committers,ou=role,ou=groups,dc=apache,dc=org + Require ldap-alias-committer @@ -275,10 +260,10 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=committers,ou=role,ou=groups,dc=apache,dc=org + +Require ldap-alias-member +Require ldap-alias-incubator-pmc + @@ -288,10 +273,10 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=committers,ou=role,ou=groups,dc=apache,dc=org + +Require ldap-alias-member +Require ldap-alias-incubator-pmc + @@ -301,10 +286,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupDepth 0 - Require ldap-group cn=committers,ou=role,ou=groups,dc=apache,dc=org + Require ldap-alias-committer @@ -314,10 +296,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid" AuthLDAPBindDN <%= ldapbinddn %> AuthLDAPBindPassword "<%= ldapbindpw %>" - AuthLDAPGroupAttribute member - AuthLDAPGroupAttributeIsDN on - AuthLDAPMaxSubGroupD
(whimsy) branch master updated: Fix logic
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 89d6bb7c Fix logic
89d6bb7c is described below
commit 89d6bb7c27e803579bb272368050ab08e6133223
Author: Sebb
AuthorDate: Sun Apr 21 12:20:07 2024 +0100
Fix logic
---
config/setupmymac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/setupmymac b/config/setupmymac
index 560adae8..ef4ef35c 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -371,7 +371,7 @@ if option != :user
snippet += "PassengerUser #{user}\nPassengerGroup #{group}\n"
end
-unless File.exist?(passenger_conf) or File.read(passenger_conf) != snippet
+if !File.exist?(passenger_conf) or File.read(passenger_conf) != snippet
sudo do
color "$ sudo edit #{passenger_conf}"
File.write passenger_conf, snippet unless $dry_run
(whimsy) branch master updated: Default to showing transitive references separately
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 8bb0d446 Default to showing transitive references separately
8bb0d446 is described below
commit 8bb0d446c3516f76d376f22504cbfabc909b7763
Author: Sebb
AuthorDate: Sat Apr 20 15:05:13 2024 +0100
Default to showing transitive references separately
---
www/members/page-scanner.cgi | 31 +++
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/www/members/page-scanner.cgi b/www/members/page-scanner.cgi
index 0df899c8..6bda8d67 100755
--- a/www/members/page-scanner.cgi
+++ b/www/members/page-scanner.cgi
@@ -10,13 +10,14 @@ require_relative '../../tools/asf-site-check'
print "Content-type: text/plain; charset=UTF-8\r\n\r\n"
-# puts ENV['REQUEST_URI']
+DIVIDER=' <= '
+
qs = ENV['QUERY_STRING']
if qs =~ %r{^url=(https?://[^&]+)(?:&(.+))?}
url = $1
option = $2
# we only want full URLs
- option = 'all' unless option == 'showurl'
+ option = 'allref' unless %w{all showurl}.include? option
print "Checking the page #{url}\n\n"
puts "The following references were found to hosts other than apache.org and
apachecon.com"
puts "The first column shows if the host is recognised as being under ASF
control according to"
@@ -25,9 +26,31 @@ if qs =~ %r{^url=(https?://[^&]+)(?:&(.+))?}
cmd = ['node', '/srv/whimsy/tools/scan-page.js', url, option]
out, err, status = Open3.capture3(*cmd)
if status.success?
+if out == ''
+ puts "No external references found"
+else
+ puts "Top-level references:"
+end
+extras = Hash.new {|h,k| h[k] = Hash.new}
out.split("\n").each do |url|
- print ASFDOMAIN.asfurl?(url) ? 'OK ' : 'NO '
- puts url
+ p1, p2 = url.split(DIVIDER)
+ if p2
+extras[p2][p1]=1
+ else
+print ASFDOMAIN.asfurl?(url) ? 'OK ' : 'NO '
+puts url
+ end
+end
+if extras.size > 0
+ puts ""
+ puts "Transitive references:"
+ extras.each do |k, v|
+puts "Loaded by: "+k
+v.each do |url,_|
+ print ASFDOMAIN.asfurl?(url) ? 'OK ' : 'NO '
+ puts url
+ end
+ end
end
else
puts err.scan(/^Error:.+/).first || err # Show only the Error line if
present
(whimsy) branch master updated: Option to show initiator
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 51660fb3 Option to show initiator
51660fb3 is described below
commit 51660fb3a6b1708b9ae6e7f5269792ac75226ca4
Author: Sebb
AuthorDate: Sat Apr 20 15:04:14 2024 +0100
Option to show initiator
---
tools/scan-page.js | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/tools/scan-page.js b/tools/scan-page.js
index f91107ce..6aa31787 100755
--- a/tools/scan-page.js
+++ b/tools/scan-page.js
@@ -6,7 +6,7 @@ module.paths.push('/usr/lib/node_modules')
const puppeteer = require('puppeteer');
-const target = process.argv[2] || 'http://apache.org/';
+const target = process.argv[2] || 'https://apache.org/';
const inithost = new URL(target).host;
const option = process.argv[3] || '';
@@ -40,6 +40,14 @@ if (!isASFhost(inithost)) {
if (option == 'all') {
console.log(url);
interceptedRequest.continue();
+} else if (option == 'allref') {
+ let iniurl = interceptedRequest.initiator().url;
+ if (iniurl && !iniurl.startsWith(target)) { // second level
+console.log(url + ' <= ' + iniurl);
+ } else {
+console.log(url);
+ }
+ interceptedRequest.continue();
} else {
if (option == 'showurl') {
console.log(url);
(whimsy) branch master updated: selfserve page was renamed
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 d1bc1b82 selfserve page was renamed
d1bc1b82 is described below
commit d1bc1b82946f04b8bc361f2f9f36dda9031a2387
Author: Sebb
AuthorDate: Sat Apr 20 11:39:34 2024 +0100
selfserve page was renamed
---
docker-config/whimsy.conf | 2 +-
www/officers/index.cgi| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker-config/whimsy.conf b/docker-config/whimsy.conf
index 9072a420..2f3cf6ed 100644
--- a/docker-config/whimsy.conf
+++ b/docker-config/whimsy.conf
@@ -101,7 +101,7 @@ RedirectMatch permanent ^/secmail /secretary/workbench
RedirectMatch permanent ^/officers/public_names /secretary/public-names
# redirect obsolete mailing list request form to replacement application
-RedirectMatch permanent ^/officers/mlreq https://selfserve.apache.org/mail.html
+RedirectMatch permanent ^/officers/mlreq
https://selfserve.apache.org/mailinglist-new.html
ProxyPass "/board/agenda/websocket/" "ws://localhost:34234/"
diff --git a/www/officers/index.cgi b/www/officers/index.cgi
index 7ce369dc..ee3eadc9 100755
--- a/www/officers/index.cgi
+++ b/www/officers/index.cgi
@@ -11,7 +11,7 @@ OFFICERS = {
'/board/agenda' => "Monthly Board Agenda Tool",
'acreq.cgi' => "New Account Request Helper",
'unlistedclas.cgi' => "Unlisted CLAs (prospective committers)",
- 'mlreq.cgi' => "New Mailing List Request Form",
+ 'https://selfserve.apache.org/mailinglist-new.html' => "New Mailing List
Request Form",
'/committers/subscribe.cgi' => "Apache Mailing List
Subscription/Unsubscription Tool",
'/board/subscriptions' => "PMC Chair board@ Subscription Crosscheck",
'list-traffic.cgi' => "Statistics About The board@ Mailing List",
(whimsy) branch master updated: Indent 2 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 5a1bef15 Indent 2 spaces
5a1bef15 is described below
commit 5a1bef154415724295b071a8ffd4d7bc0eed2aa9
Author: Sebb
AuthorDate: Fri Apr 19 23:26:11 2024 +0100
Indent 2 spaces
---
tools/scan-page.js | 40
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/tools/scan-page.js b/tools/scan-page.js
index 7d184ccf..f91107ce 100755
--- a/tools/scan-page.js
+++ b/tools/scan-page.js
@@ -12,10 +12,10 @@ const inithost = new URL(target).host;
const option = process.argv[3] || '';
function isASFhost(host) {
-return host == '' || host == 'apache.org' || host.endsWith('.apache.org')
|| host.endsWith('.apachecon.com');
+ return host == '' || host == 'apache.org' || host.endsWith('.apache.org') ||
host.endsWith('.apachecon.com');
}
if (!isASFhost(inithost)) {
-throw new Error("Only ASF hosts are supported - saw " + inithost);
+ throw new Error("Only ASF hosts are supported - saw " + inithost);
}
(async () => {
@@ -31,27 +31,27 @@ if (!isASFhost(inithost)) {
const url = interceptedRequest.url();
if (url == target) {
-// must allow this through
-interceptedRequest.continue();
+ // must allow this through
+ interceptedRequest.continue();
} else {
-let host = new URL(url).host
-if (!isASFhost(host)) {
-// don't visit non-ASF hosts unless requested
-if (option == 'all') {
-console.log(url);
-interceptedRequest.continue();
-} else {
-if (option == 'showurl') {
- console.log(url);
-} else {
- console.log(host);
-}
-interceptedRequest.abort();
-}
+ let host = new URL(url).host
+ if (!isASFhost(host)) {
+// don't visit non-ASF hosts unless requested
+if (option == 'all') {
+ console.log(url);
+ interceptedRequest.continue();
} else {
-// Need to visit at least an initial redirect
-interceptedRequest.continue();
+ if (option == 'showurl') {
+console.log(url);
+ } else {
+console.log(host);
+ }
+ interceptedRequest.abort();
}
+ } else {
+// Need to visit at least an initial redirect
+interceptedRequest.continue();
+ }
}
});
let result = await page.goto(target);
(whimsy) branch master updated: Allow showurl option
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 561ab34d Allow showurl option
561ab34d is described below
commit 561ab34dab9ac3d4b0c2f28ef6f1fb6e91ae6c35
Author: Sebb
AuthorDate: Fri Apr 19 22:52:39 2024 +0100
Allow showurl option
---
www/members/page-scanner.cgi | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/www/members/page-scanner.cgi b/www/members/page-scanner.cgi
index 276d3ec9..0df899c8 100755
--- a/www/members/page-scanner.cgi
+++ b/www/members/page-scanner.cgi
@@ -12,14 +12,17 @@ print "Content-type: text/plain; charset=UTF-8\r\n\r\n"
# puts ENV['REQUEST_URI']
qs = ENV['QUERY_STRING']
-if qs =~ %r{^url=(https?://.+)}
+if qs =~ %r{^url=(https?://[^&]+)(?:&(.+))?}
url = $1
+ option = $2
+ # we only want full URLs
+ option = 'all' unless option == 'showurl'
print "Checking the page #{url}\n\n"
puts "The following references were found to hosts other than apache.org and
apachecon.com"
puts "The first column shows if the host is recognised as being under ASF
control according to"
puts "https://privacy.apache.org/policies/asf-domains;
print "=\n"
- cmd = ['node', '/srv/whimsy/tools/scan-page.js', url, 'all']
+ cmd = ['node', '/srv/whimsy/tools/scan-page.js', url, option]
out, err, status = Open3.capture3(*cmd)
if status.success?
out.split("\n").each do |url|
@@ -31,6 +34,6 @@ if qs =~ %r{^url=(https?://.+)}
end
print "=\n"
else
- print "Expecting: ?url=http://.../\n;
+ print "Expecting: ?url=http://.../[]\n;
end
(whimsy) branch master updated: _url and _status are obsolete; use the functions instead
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 b52e8dad _url and _status are obsolete; use the functions instead
b52e8dad is described below
commit b52e8dadee4a2be0359d8f7861eca326158a0804
Author: Sebb
AuthorDate: Thu Apr 18 10:58:17 2024 +0100
_url and _status are obsolete; use the functions instead
---
tools/scan-page.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/scan-page.js b/tools/scan-page.js
index e75372c8..7d184ccf 100755
--- a/tools/scan-page.js
+++ b/tools/scan-page.js
@@ -55,9 +55,9 @@ if (!isASFhost(inithost)) {
}
});
let result = await page.goto(target);
- let status = result._status; // now seems to be null if it completed OK?
+ let status = result.status();
if (status && status != 200) {
-let url = result._url;
+let url = result.url();
let error = `Status ${status} for ${url}`;
throw new Error(error);
}
