You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/07/21 14:55:51 UTC
[whimsy] branch master updated (3218fcc -> a5bf22b)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 3218fcc prep for dual maintenance
new acc206f establish/sync ou=project
new a5bf22b guineapigs += madlib streams fluo
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:
lib/whimsy/asf/ldap.rb | 3 ++-
www/board/agenda/views/actions/todos.json.rb | 23 +++++++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 02/02: guineapigs += madlib streams fluo
Posted by ru...@apache.org.
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
commit a5bf22b8cdeacf2150d3ed66ee71602d45a427b6
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Jul 21 08:55:34 2017 -0600
guineapigs += madlib streams fluo
---
lib/whimsy/asf/ldap.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 87ad57a..93da4ed 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -1070,7 +1070,8 @@ module ASF
end
# temp list of projects that have moved over to new project LDAP schema
- GUINEAPIGS = %w(incubator whimsy jmeter axis mynewt atlas accumulo geronimo)
+ GUINEAPIGS = %w(incubator whimsy jmeter axis mynewt atlas accumulo geronimo
+ madlib streams fluo)
# List of owners for this committee, i.e. people who are members of the
# committee and have update access. Data is obtained from LDAP.
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
Re: [whimsy] 01/02: establish/sync ou=project
Posted by sebb <se...@gmail.com>.
On 21 July 2017 at 15:55, <ru...@apache.org> wrote:
> 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
>
> commit acc206f54dbe3c62861b284a5a209c2040433d69
> Author: Sam Ruby <ru...@intertwingly.net>
> AuthorDate: Fri Jul 21 08:54:32 2017 -0600
>
> establish/sync ou=project
> ---
> www/board/agenda/views/actions/todos.json.rb | 23 +++++++++++++++++++----
> 1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/www/board/agenda/views/actions/todos.json.rb b/www/board/agenda/views/actions/todos.json.rb
> index 87d889f..25d5c25 100644
> --- a/www/board/agenda/views/actions/todos.json.rb
> +++ b/www/board/agenda/views/actions/todos.json.rb
> @@ -120,13 +120,28 @@ if @establish and env.password
>
> ASF::LDAP.bind(env.user, env.password) do
> chairs.add [chair] unless chairs.members.include? chair
> + guineapig = ASF::Committee::GUINEAPIGS.include?(pmc.id)
Seems to me that Guineapig logic belongs in the ASF library, and
should not be repeated elsewhere.
> - if ASF::Group.find(pmc.downcase).members.empty?
> - ASF::Group.add(pmc.downcase, members)
> + # old style definitions
> + unless guineapig
> + if ASF::Group.find(pmc.downcase).members.empty?
> + ASF::Group.add(pmc.downcase, members)
> + end
> +
> + if ASF::Committee.find(pmc.downcase).members.empty?
> + ASF::Committee.add(pmc.downcase, members)
> + end
> end
>
> - if ASF::Committee.find(pmc.downcase).members.empty?
> - ASF::Committee.add(pmc.downcase, members)
> + # new style definitions
> + project = ASF::Project.find(pmc.downcase)
> + if not project
> + project.create(members, members)
> + elsif not guineapig
> + # sync project owners with new PMC list
> + project.add_owners(members)
> + project.remove_owners(project.owners - members)
> + project.add_members(members)
> end
> end
> end
>
> --
> To stop receiving notification emails like this one, please contact
> "commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 01/02: establish/sync ou=project
Posted by ru...@apache.org.
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
commit acc206f54dbe3c62861b284a5a209c2040433d69
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Jul 21 08:54:32 2017 -0600
establish/sync ou=project
---
www/board/agenda/views/actions/todos.json.rb | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/www/board/agenda/views/actions/todos.json.rb b/www/board/agenda/views/actions/todos.json.rb
index 87d889f..25d5c25 100644
--- a/www/board/agenda/views/actions/todos.json.rb
+++ b/www/board/agenda/views/actions/todos.json.rb
@@ -120,13 +120,28 @@ if @establish and env.password
ASF::LDAP.bind(env.user, env.password) do
chairs.add [chair] unless chairs.members.include? chair
+ guineapig = ASF::Committee::GUINEAPIGS.include?(pmc.id)
- if ASF::Group.find(pmc.downcase).members.empty?
- ASF::Group.add(pmc.downcase, members)
+ # old style definitions
+ unless guineapig
+ if ASF::Group.find(pmc.downcase).members.empty?
+ ASF::Group.add(pmc.downcase, members)
+ end
+
+ if ASF::Committee.find(pmc.downcase).members.empty?
+ ASF::Committee.add(pmc.downcase, members)
+ end
end
- if ASF::Committee.find(pmc.downcase).members.empty?
- ASF::Committee.add(pmc.downcase, members)
+ # new style definitions
+ project = ASF::Project.find(pmc.downcase)
+ if not project
+ project.create(members, members)
+ elsif not guineapig
+ # sync project owners with new PMC list
+ project.add_owners(members)
+ project.remove_owners(project.owners - members)
+ project.add_members(members)
end
end
end
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.