[whimsy] branch master updated: Add date stamp to COI Resolution link
This is an automated email from the ASF dual-hosted git repository.
clr 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 6a9d304 Add date stamp to COI Resolution link
6a9d304 is described below
commit 6a9d3046b7bac4730ba809e5616d30b7c9ef07da
Author: Craig L Russell
AuthorDate: Sun Jun 28 18:49:26 2020 -0700
Add date stamp to COI Resolution link
---
www/officers/coi.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index 568da96..aec5304 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -93,7 +93,7 @@ _html do
related: {
'http://www.apache.org/foundation/records/minutes/2020/board_minutes_2020_03_18.txt'
=>
'Conflict of Interest Resolution Board minutes',
- COI_CURRENT_TEMPLATE_URL => 'Conflict of Interest Resolution',
+ COI_CURRENT_TEMPLATE_URL => 'Conflict of Interest Resolution (March
2020)',
'http://www.apache.org/foundation/#who-runs-the-asf' =>
'BOARD MEMBERS and OFFICERS are required to sign',
COI_CURRENT_URL => "#{YEAR} affirmations",
[whimsy] branch master updated: Seems to be required on Ubuntu 20.04 / Ruby 2.7
This is an automated email from the ASF dual-hosted git repository. rubys 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 477d749 Seems to be required on Ubuntu 20.04 / Ruby 2.7 477d749 is described below commit 477d749cb2817adfb3b48bdf0b87f92930c34ebe Author: Sam Ruby AuthorDate: Sun Jun 28 21:29:07 2020 -0400 Seems to be required on Ubuntu 20.04 / Ruby 2.7 --- www/ruby2js.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/ruby2js.cgi b/www/ruby2js.cgi index bd0843d..ccc38c2 100755 --- a/www/ruby2js.cgi +++ b/www/ruby2js.cgi @@ -1,4 +1,4 @@ #!/usr/bin/env ruby Dir.chdir "/srv/git/ruby2js/demo" $:.unshift '/srv/git/ruby2js/lib' -require "./ruby2js" +load "./ruby2js.rb"
[whimsy] branch master updated: Order has changed
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 1eb5381 Order has changed
1eb5381 is described below
commit 1eb53815166cad37ddd9aa66d8cfd7dea26a5f75
Author: Sebb
AuthorDate: Mon Jun 29 01:41:36 2020 +0100
Order has changed
---
lib/spec/lib/svn_wunderbar_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/spec/lib/svn_wunderbar_spec.rb
b/lib/spec/lib/svn_wunderbar_spec.rb
index ca54fcf..fceddb0 100644
--- a/lib/spec/lib/svn_wunderbar_spec.rb
+++ b/lib/spec/lib/svn_wunderbar_spec.rb
@@ -111,7 +111,7 @@ describe "ASF::SVN.svn_" do
ASF::SVN.svn_('help', 'help', _, {auth: [['a','b']], env:
ENV_.new('c','d'), user: 'user', password: 'pass', verbose: true, dryrun: true})
end
expect(rc1).to eq(0)
-exp = [["svn", [["a", "b"]], "--no-auth-cache", "help",
"--non-interactive", "--", "help"], {}]
+exp = [["svn", "help", [["a", "b"]], "--no-auth-cache",
"--non-interactive", "--", "help"], {}]
act = out1['transcript'][1]
expect(act).to eq(exp.inspect)
end
[whimsy] branch master updated: Add the auth after command 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 a0c1eb0 Add the auth after command name a0c1eb0 is described below commit a0c1eb0b1a56201a4b20e3f886648406a5abe286 Author: Sebb AuthorDate: Mon Jun 29 01:17:02 2020 +0100 Add the auth after command name --- lib/whimsy/asf/svn.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb index 6f0b48b..13a63f8 100644 --- a/lib/whimsy/asf/svn.rb +++ b/lib/whimsy/asf/svn.rb @@ -425,8 +425,8 @@ module ASF cmd, stdin = self._svn_build_cmd(command, path, options) sysopts[:stdin] = stdin if stdin - if auth -cmd.insert(1, auth, '--no-auth-cache') + if auth # insert after the command name +cmd.insert(2, auth, '--no-auth-cache') end # This ensures the output is captured in the response
[whimsy] branch master updated: Oops, misplaced and missing code
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 2477021 Oops, misplaced and missing code
2477021 is described below
commit 247702145edebff31a9a6636dcb2a61b985e6c51
Author: Sebb
AuthorDate: Mon Jun 29 00:16:11 2020 +0100
Oops, misplaced and missing code
---
lib/whimsy/asf/git.rb | 3 ++-
lib/whimsy/asf/svn.rb | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/whimsy/asf/git.rb b/lib/whimsy/asf/git.rb
index f093320..3fbb367 100644
--- a/lib/whimsy/asf/git.rb
+++ b/lib/whimsy/asf/git.rb
@@ -55,9 +55,10 @@ module ASF
if repo_override
git_over = repo_override[:git]
if git_over
+ require 'wunderbar'
Wunderbar.warn("Found override for repository.yml[:git]")
+ @@repository_entries[:git].merge!(git_over)
end
-@@repository_entries[:git].merge!(git_over)
end
@repos = Hash[Dir[*git].map { |name|
diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 94a9644..6f0b48b 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -45,6 +45,7 @@ module ASF
if repo_override
svn_over = repo_override[:svn]
if svn_over
+ require 'wunderbar'
Wunderbar.warn("Found override for repository.yml[:svn]")
end
@@repository_entries[:svn].merge!(svn_over)
[whimsy] branch master updated: Try 20.04 (focal)
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 58340ac Try 20.04 (focal) 58340ac is described below commit 58340acf8c34b79d97873d9344cf2763577d2c71 Author: Sebb AuthorDate: Sun Jun 28 23:49:23 2020 +0100 Try 20.04 (focal) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ab8fcd7..75242cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ rvm: # http://rubies.travis-ci.org/ jobs: include: - rvm: 2.5 -dist: bionic +dist: focal gemfile: lib/Gemfile # add subversion on Linux
[whimsy] branch master updated: Ran the wrong test combination
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 e75d097 Ran the wrong test combination e75d097 is described below commit e75d097a0b42aa8cdbe4d26b2ce2603f77ff040a Author: Sebb AuthorDate: Sun Jun 28 23:40:55 2020 +0100 Ran the wrong test combination --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 01af129..ab8fcd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ rvm: # http://rubies.travis-ci.org/ # Additionally test lib on 2.5 jobs: include: - - dist: bionic - rvm: 2.5 +dist: bionic gemfile: lib/Gemfile # add subversion on Linux
[whimsy] branch master updated: Try later dist
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 c9bdee9 Try later dist c9bdee9 is described below commit c9bdee9e102d214e170467afee4cf9e667733761 Author: Sebb AuthorDate: Sun Jun 28 23:35:43 2020 +0100 Try later dist --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dd76cd9..01af129 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ rvm: # http://rubies.travis-ci.org/ # Additionally test lib on 2.5 jobs: include: + - dist: bionic - rvm: 2.5 gemfile: lib/Gemfile
[whimsy] branch master updated: Show what we are working with
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 a1d9871 Show what we are working with
a1d9871 is described below
commit a1d98713dfe2c483f48029d7a75c097625218bf1
Author: Sebb
AuthorDate: Sun Jun 28 23:14:13 2020 +0100
Show what we are working with
---
lib/spec/lib/svn_spec.rb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/spec/lib/svn_spec.rb b/lib/spec/lib/svn_spec.rb
index 2e8ad4a..29475dd 100644
--- a/lib/spec/lib/svn_spec.rb
+++ b/lib/spec/lib/svn_spec.rb
@@ -227,6 +227,9 @@ describe ASF::SVN do
it "passwordStdinOK? should return true or false" do
res = ASF::SVN.passwordStdinOK?
expect(res).to be(true).or be(false)
+ # show what we are working with
+ ver = %x(svn --version --quiet).chomp
+ puts "\n>> version = '#{ver}' passwordStdinOK = #{res}"
end
end
[whimsy] branch master updated: More tests
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 8812734 More tests
8812734 is described below
commit 881273405388eb1ebbe62e81eb5f586e42ce38f3
Author: Sebb
AuthorDate: Sun Jun 28 22:54:34 2020 +0100
More tests
---
lib/spec/lib/svn_wunderbar_spec.rb | 60 ++
1 file changed, 60 insertions(+)
diff --git a/lib/spec/lib/svn_wunderbar_spec.rb
b/lib/spec/lib/svn_wunderbar_spec.rb
index e7f5530..ca54fcf 100644
--- a/lib/spec/lib/svn_wunderbar_spec.rb
+++ b/lib/spec/lib/svn_wunderbar_spec.rb
@@ -106,7 +106,67 @@ describe "ASF::SVN.svn_" do
expect(out1).to eq(out2)
end
+ it "auth: should override env: and user:/password:" do
+rc1, out1 = _json do |_|
+ ASF::SVN.svn_('help', 'help', _, {auth: [['a','b']], env:
ENV_.new('c','d'), user: 'user', password: 'pass', verbose: true, dryrun: true})
+end
+expect(rc1).to eq(0)
+exp = [["svn", [["a", "b"]], "--no-auth-cache", "help",
"--non-interactive", "--", "help"], {}]
+act = out1['transcript'][1]
+expect(act).to eq(exp.inspect)
+ end
+
+ it "env: should include password" do
+rc, out = _json do |_|
+ ASF::SVN.svn_('help', 'help', _, {env: ENV_.new('a','b'), verbose: true})
+end
+expect(rc).to eq(0)
+act = out['transcript'][1]
+if ASF::SVN.passwordStdinOK?
+ exp = [["svn", "help", "--non-interactive", ["--username", "a",
"--no-auth-cache"], ["--password-from-stdin"], "--", "help"], {:stdin=>"b"}]
+else
+ exp = [["svn", "help", "--non-interactive", ["--username", "a",
"--no-auth-cache"], ["--password", "b"], "--", "help"], {}]
+end
+expect(act).to eq(exp.inspect)
+ end
+
+ it "env: should include password and override user" do
+rc, out = _json do |_|
+ ASF::SVN.svn_('help', 'help', _, {env: ENV_.new('a','b'), verbose: true,
user: 'user', password: 'pass'})
+end
+expect(rc).to eq(0)
+act = out['transcript'][1]
+if ASF::SVN.passwordStdinOK?
+ exp = [["svn", "help", "--non-interactive", ["--username", "a",
"--no-auth-cache"], ["--password-from-stdin"], "--", "help"], {:stdin=>"b"}]
+else
+ exp = [["svn", "help", "--non-interactive", ["--username", "a",
"--no-auth-cache"], ["--password", "b"], "--", "help"], {}]
+end
+expect(act).to eq(exp.inspect)
+ end
+ it "user: alone should not appear" do
+rc, out = _json do |_|
+ ASF::SVN.svn_('help', 'help', _, {verbose: true, user: 'user'})
+end
+expect(rc).to eq(0)
+act = out['transcript'][1]
+exp = [["svn", "help", "--non-interactive", "--", "help"], {}]
+expect(act).to eq(exp.inspect)
+ end
+
+ it "user: and password: should appear" do
+rc, out = _json do |_|
+ ASF::SVN.svn_('help', 'help', _, {verbose: true, user: 'user', password:
'pass'})
+end
+expect(rc).to eq(0)
+act = out['transcript'][1]
+if ASF::SVN.passwordStdinOK?
+ exp = [["svn", "help", "--non-interactive", ["--username", "user",
"--no-auth-cache"], ["--password-from-stdin"], "--", "help"], {:stdin=>"pass"}]
+else
+ exp = [["svn", "help", "--non-interactive", ["--username", "user",
"--no-auth-cache"], ["--password", "pass"], "--", "help"], {}]
+end
+expect(act).to eq(exp.inspect)
+ end
end
[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 8bb1cc0 Unused
8bb1cc0 is described below
commit 8bb1cc01a9ca27743dcce3973fd35de4eb893d29
Author: Sebb
AuthorDate: Sun Jun 28 22:54:00 2020 +0100
Unused
---
lib/spec/lib/svn_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/spec/lib/svn_spec.rb b/lib/spec/lib/svn_spec.rb
index f46df50..2e8ad4a 100644
--- a/lib/spec/lib/svn_spec.rb
+++ b/lib/spec/lib/svn_spec.rb
@@ -309,7 +309,7 @@ describe ASF::SVN do
it "_svn_build_cmd('help', 'path', {user: 'whimsy', password: 'pass})
should include username" do
cmd, stdin = ASF::SVN._svn_build_cmd('help', 'path', {user: 'whimsy',
password: 'pass'})
exp = ["svn", "help", "--non-interactive", ["--username", "whimsy",
"--no-auth-cache"], "--", "path"]
- if res = ASF::SVN.passwordStdinOK?
+ if ASF::SVN.passwordStdinOK?
expect(stdin).to eq('pass')
expect(cmd-exp).to eq([["--password-from-stdin"]])
else
[whimsy] branch master updated: Ensure verbose can be captured
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 9056774 Ensure verbose can be captured 9056774 is described below commit 90567742189a38d830c1214e1bd96fdf90307807 Author: Sebb AuthorDate: Sun Jun 28 22:39:44 2020 +0100 Ensure verbose can be captured --- lib/whimsy/asf/svn.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb index 747f19b..94a9644 100644 --- a/lib/whimsy/asf/svn.rb +++ b/lib/whimsy/asf/svn.rb @@ -428,7 +428,8 @@ module ASF cmd.insert(1, auth, '--no-auth-cache') end - Wunderbar.warn cmd.inspect if options[:verbose] # includes auth + # This ensures the output is captured in the response + _.system ['echo', [cmd,sysopts].inspect] if options[:verbose] # includes auth if options[:dryrun] # excludes auth # TODO: improve this
[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 11de3e6 Typo 11de3e6 is described below commit 11de3e6c69a902ebc85ccaf59fcfade33e9c574c Author: Sebb AuthorDate: Sun Jun 28 20:52:10 2020 +0100 Typo --- lib/whimsy/asf/svn.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb index c5b049c..747f19b 100644 --- a/lib/whimsy/asf/svn.rb +++ b/lib/whimsy/asf/svn.rb @@ -417,7 +417,7 @@ module ASF if auth # override any other auth [:env, :user, :password].each do |k| - options.delete[k] + options.delete(k) end end
[whimsy] branch master updated: Tests for _svn_build_cmd
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 848b05b Tests for _svn_build_cmd
848b05b is described below
commit 848b05bd4ec9218e73f0346fa6f198eabdca9d11
Author: Sebb
AuthorDate: Sun Jun 28 20:45:40 2020 +0100
Tests for _svn_build_cmd
---
lib/spec/lib/svn_spec.rb | 47 +++
1 file changed, 47 insertions(+)
diff --git a/lib/spec/lib/svn_spec.rb b/lib/spec/lib/svn_spec.rb
index cad0cd3..f46df50 100644
--- a/lib/spec/lib/svn_spec.rb
+++ b/lib/spec/lib/svn_spec.rb
@@ -292,4 +292,51 @@ describe ASF::SVN do
end
end
+
+ describe "ASF::SVN._svn_build_cmd" do
+it "_svn_build_cmd('help', 'path', {}) should include path" do
+ cmd, stdin = ASF::SVN._svn_build_cmd('help', 'path', {})
+ expect(stdin).to eq(nil)
+ expect(cmd).to eq(["svn", "help", "--non-interactive", "--", "path"])
+end
+
+it "_svn_build_cmd('help', 'path', {user: 'whimsy'}) should not include
username" do
+ cmd, stdin = ASF::SVN._svn_build_cmd('help', 'path', {user: 'whimsy'})
+ expect(stdin).to eq(nil)
+ expect(cmd).to eq(["svn", "help", "--non-interactive", "--", "path"])
+end
+
+it "_svn_build_cmd('help', 'path', {user: 'whimsy', password: 'pass})
should include username" do
+ cmd, stdin = ASF::SVN._svn_build_cmd('help', 'path', {user: 'whimsy',
password: 'pass'})
+ exp = ["svn", "help", "--non-interactive", ["--username", "whimsy",
"--no-auth-cache"], "--", "path"]
+ if res = ASF::SVN.passwordStdinOK?
+expect(stdin).to eq('pass')
+expect(cmd-exp).to eq([["--password-from-stdin"]])
+ else
+expect(stdin).to eq(nil)
+expect(cmd-exp).to eq([["--password", "pass"]])
+ end
+end
+
+it "_svn_build_cmd('help', 'path', {user: 'whimsysvn'}) should include
username" do
+ cmd, stdin = ASF::SVN._svn_build_cmd('help', 'path', {user: 'whimsysvn'})
+ expect(stdin).to eq(nil)
+ expect(cmd).to eq(["svn", "help", "--non-interactive", ["--username",
"whimsysvn", "--no-auth-cache"], "--", "path"])
+end
+
+it "_svn_build_cmd('help', 'path', {user: 'whimsysvn', dryrun: false})
should include username" do
+ cmd, stdin = ASF::SVN._svn_build_cmd('help', 'path', {user: 'whimsysvn',
dryrun: false})
+ expect(stdin).to eq(nil)
+ expect(cmd).to eq(["svn", "help", "--non-interactive", ["--username",
"whimsysvn", "--no-auth-cache"], "--", "path"])
+end
+it "_svn_build_cmd('help', 'path', {user: 'whimsysvn', dryrun: true})
should not include username" do
+ cmd, stdin = ASF::SVN._svn_build_cmd('help', 'path', {user: 'whimsysvn',
dryrun: true})
+ expect(stdin).to eq(nil)
+ expect(cmd).to eq(["svn", "help", "--non-interactive", "--", "path"])
+end
+
+it "_svn_build_cmd('help', 'path', {_error: true}) should raise error" do
+ expect { ASF::SVN._svn_build_cmd('help', 'path', {_error: true}) }.to
raise_error(ArgumentError, "Following options not recognised: [:_error]")
+end
+ end
end
[whimsy] branch master updated: Allow local override of repository.yml definitions
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 33cfa99 Allow local override of repository.yml definitions
33cfa99 is described below
commit 33cfa998a32b140c5505c7f9d09d90a5a9d39080
Author: Sebb
AuthorDate: Sun Jun 28 20:08:09 2020 +0100
Allow local override of repository.yml definitions
---
lib/whimsy/asf/git.rb | 8
lib/whimsy/asf/svn.rb | 43 +--
2 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/lib/whimsy/asf/git.rb b/lib/whimsy/asf/git.rb
index 60399a4..f093320 100644
--- a/lib/whimsy/asf/git.rb
+++ b/lib/whimsy/asf/git.rb
@@ -51,6 +51,14 @@ module ASF
unless @repos
@@repository_mtime = File.exist?(REPOSITORY) &&
File.mtime(REPOSITORY)
@@repository_entries = YAML.load_file(REPOSITORY)
+ repo_override = ASF::Config.get(:repository)
+ if repo_override
+git_over = repo_override[:git]
+if git_over
+ Wunderbar.warn("Found override for repository.yml[:git]")
+end
+@@repository_entries[:git].merge!(git_over)
+ end
@repos = Hash[Dir[*git].map { |name|
if Dir.exist? name.untaint
diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 70213c7..c5b049c 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -41,6 +41,14 @@ module ASF
unless @repos
@@repository_mtime = File.exist?(REPOSITORY) &&
File.mtime(REPOSITORY)
@@repository_entries = YAML.load_file(REPOSITORY)
+ repo_override = ASF::Config.get(:repository)
+ if repo_override
+svn_over = repo_override[:svn]
+if svn_over
+ Wunderbar.warn("Found override for repository.yml[:svn]")
+end
+@@repository_entries[:svn].merge!(svn_over)
+ end
@repos = Hash[Dir[*svn].map { |name|
if Dir.exist? name.untaint
@@ -299,16 +307,20 @@ module ASF
user = env.user
else
password = options[:password]
-user = options[:user] if password
- end
- # password was supplied, add credentials
- if password and not options[:dryrun] # don't add auth for dryrun
-cmd << ['--username', user, '--no-auth-cache']
-if self.passwordStdinOK?()
- stdin = password
- cmd << ['--password-from-stdin']
-else
- cmd << ['--password', password]
+user = options[:user]
+ end
+ unless options[:dryrun] # don't add auth for dryrun
+if password or user == 'whimsysvn' # whimsysvn user does not require
password
+ cmd << ['--username', user, '--no-auth-cache']
+end
+# password was supplied, add credentials
+if password
+ if self.passwordStdinOK?()
+stdin = password
+cmd << ['--password-from-stdin']
+ else
+cmd << ['--password', password]
+ end
end
end
@@ -383,6 +395,7 @@ module ASF
# :args - string or array of strings, e.g. '-v', ['--depth','empty']
# :msg - shorthand for {args: ['--message', value]}
# :depth - shorthand for {args: ['--depth', value]}
+# :auth - authentication (as [['--username', etc]])
# :env - environment: source for user and password
# :user, :password - used if env is not present
# :verbose - show command (including credentials) before executing it
@@ -400,10 +413,20 @@ module ASF
# Pick off the options specific to svn_ rather than svn
sysopts = options.delete(:sysopts) || {}
+ auth = options.delete(:auth)
+ if auth
+# override any other auth
+[:env, :user, :password].each do |k|
+ options.delete[k]
+end
+ end
cmd, stdin = self._svn_build_cmd(command, path, options)
sysopts[:stdin] = stdin if stdin
+ if auth
+cmd.insert(1, auth, '--no-auth-cache')
+ end
Wunderbar.warn cmd.inspect if options[:verbose] # includes auth
[whimsy] branch master updated: Link to personal 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 d16fa58 Link to personal pages
d16fa58 is described below
commit d16fa58395d4c65513ad1bad348714360d11cb95
Author: Sebb
AuthorDate: Sun Jun 28 16:30:43 2020 +0100
Link to personal pages
---
www/officers/coi.cgi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index 9ee2cad..568da96 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -120,7 +120,9 @@ _html do
affirmer = ASF::Person.find(id)
_tr do
_td affirmer.cn
-_td affirmer.id
+_td do
+ _a affirmer.id, href: "/roster/committer/#{affirmer.id}"
+end
_td role.join(', ')
_td do
signerfile = SIGNERS[affirmer.id]
[whimsy] branch master updated: Move template.txt to parent dir
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 fb2f383 Move template.txt to parent dir
fb2f383 is described below
commit fb2f383967a423209495fee93d72fa6a2e802db2
Author: Sebb
AuthorDate: Sun Jun 28 15:00:32 2020 +0100
Move template.txt to parent dir
---
www/officers/coi.cgi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index 2b3c26d..9ee2cad 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -9,9 +9,10 @@ require 'date'
require 'tmpdir'
coi_url = ASF::SVN.svnurl('conflict-of-interest')
+COI_CURRENT_TEMPLATE_URL = File.join(coi_url, 'template.txt').untaint
+
YEAR = DateTime.now.strftime "%Y"
COI_CURRENT_URL = File.join(coi_url, YEAR).untaint
-COI_CURRENT_TEMPLATE_URL = File.join(COI_CURRENT_URL, 'template.txt')
user = ASF::Person.find($USER)
USERID = user.id
[whimsy] branch master updated: Tweak
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 dcde78c Tweak dcde78c is described below commit dcde78cc28917b791fab22635ea5b11e52788646 Author: Sebb AuthorDate: Sun Jun 28 12:20:54 2020 +0100 Tweak --- www/officers/coi.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi index 5f46d75..2b3c26d 100755 --- a/www/officers/coi.cgi +++ b/www/officers/coi.cgi @@ -25,7 +25,7 @@ chairs = committees.map do |committee| end end ASF::Service['board'].members.each do |member| - IDS[member.id] << 'Board' + IDS[member.id] << 'Board member' end # Get the list of files in this year's directory
[whimsy] branch master updated: Show qualifying roles
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 6e523d6 Show qualifying roles
6e523d6 is described below
commit 6e523d60c2bd704b132caf9e7ff6694d7cf54807
Author: Sebb
AuthorDate: Sun Jun 28 12:19:18 2020 +0100
Show qualifying roles
---
www/officers/coi.cgi | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index 3336fb1..5f46d75 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -17,11 +17,16 @@ user = ASF::Person.find($USER)
USERID = user.id
USERNAME = user.cn.untaint
USERMAIL = "#{USERID}@apache.org".untaint
+IDS = Hash.new {|h,k| h[k]=Array.new}
committees = ASF::Committee.officers + ASF::Committee.nonpmcs
chairs = committees.map do |committee|
- committee.chairs.map {|chair| chair[:id]}
+ committee.chairs.each do |chair|
+IDS[chair[:id]] << committee.display_name
+ end
+end
+ASF::Service['board'].members.each do |member|
+ IDS[member.id] << 'Board'
end
-IDS = (chairs.flatten + ASF::Service['board'].members.map(&:id)).uniq
# Get the list of files in this year's directory
signerfileslist, err = ASF::SVN.svn('list', COI_CURRENT_URL, {user:
$USER.dup.untaint, password: $PASSWORD.dup.untaint})
@@ -105,15 +110,17 @@ _html do
_tr do
_th 'Name'
_th 'AvailId'
+ _th 'Role(s)'
_th 'Link to affirmation(s)'
end
end
_tbody do
-IDS.each do |id|
+IDS.each do |id, role|
affirmer = ASF::Person.find(id)
_tr do
_td affirmer.cn
_td affirmer.id
+_td role.join(', ')
_td do
signerfile = SIGNERS[affirmer.id]
if signerfile
[whimsy] branch master updated: Clarify
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 0c1e95d Clarify 0c1e95d is described below commit 0c1e95d042f2d277fad7e9f4c7982953a8678f6b Author: Sebb AuthorDate: Sun Jun 28 11:44:29 2020 +0100 Clarify --- www/officers/coi.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi index 428008c..3336fb1 100755 --- a/www/officers/coi.cgi +++ b/www/officers/coi.cgi @@ -96,7 +96,7 @@ _html do _p do _b 'DRAFT DRAFT DRAFT - Feedback is solicited at d...@whimsical.apache.org' _p -_ 'This page allows officers to sign their Conflict of Interest annual affirmation.' +_ 'This page allows Board Members and Officers to sign their Conflict of Interest annual affirmation.' end if _.get? _p 'The following are currently required to affirm the Conflict of Interest:'
