You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/02/06 21:20:56 UTC
[1/5] git commit: [#7042] Add tags to create_activity assertion
Updated Branches:
refs/heads/master 72eff6792 -> 3b25e9645
[#7042] Add tags to create_activity assertion
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/06afe406
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/06afe406
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/06afe406
Branch: refs/heads/master
Commit: 06afe406b58dce1b799c77398c3462d75e76ac0e
Parents: 64ebf57
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Feb 6 02:38:43 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Feb 6 16:58:44 2014 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/tests/test_base.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/06afe406/ForgeImporters/forgeimporters/tests/test_base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/test_base.py b/ForgeImporters/forgeimporters/tests/test_base.py
index d52f417..b2556a6 100644
--- a/ForgeImporters/forgeimporters/tests/test_base.py
+++ b/ForgeImporters/forgeimporters/tests/test_base.py
@@ -69,7 +69,7 @@ def test_import_tool(g, c, object_from_path, M, _datetime):
{'$set': {'last_updated': _datetime.utcnow()}})
g.director.create_activity.assert_called_once_with(
c.user, "imported",
- app.config, related_nodes=[c.project])
+ app.config, related_nodes=[c.project], tags=['import'])
g.post_event.assert_called_once_with(
'import_tool_task_succeeded',
'source',
[2/5] git commit: [#7042] Fix test
Posted by jo...@apache.org.
[#7042] Fix test
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/64ebf57b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/64ebf57b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/64ebf57b
Branch: refs/heads/master
Commit: 64ebf57b995798adb366335294f7903e9f01c716
Parents: b327c9a
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Feb 6 02:38:12 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Feb 6 16:58:44 2014 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_user_profile.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/64ebf57b/Allura/allura/tests/functional/test_user_profile.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_user_profile.py b/Allura/allura/tests/functional/test_user_profile.py
index 6f01e6a..0dbbe77 100644
--- a/Allura/allura/tests/functional/test_user_profile.py
+++ b/Allura/allura/tests/functional/test_user_profile.py
@@ -164,7 +164,8 @@ class TestUserProfile(TestController):
return m
eps = map(ep, ['a', 'b', 'c', 'd'])
order = {'user_profile_sections.order': 'b, d,c , f '}
- delattr(type(app), '_sections')
+ if hasattr(type(app), '_sections'):
+ delattr(type(app), '_sections')
with mock.patch('allura.lib.helpers.iter_entry_points') as iep:
with mock.patch.dict(tg.config, order):
iep.return_value = eps
[4/5] git commit: [#7042] Add tags to json feed
Posted by jo...@apache.org.
[#7042] Add tags to json feed
Cleaned up inconsistency in use of related_nodes vs target
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b327c9ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b327c9ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b327c9ac
Branch: refs/heads/master
Commit: b327c9ac52291af6888a2d6198380e77eacebcbb
Parents: d041b56
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Feb 5 22:36:21 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Feb 6 16:58:44 2014 +0000
----------------------------------------------------------------------
ForgeActivity/forgeactivity/main.py | 1 +
ForgeBlog/forgeblog/model/blog.py | 2 +-
ForgeWiki/forgewiki/wiki_main.py | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b327c9ac/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 08c0283..8a34732 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -215,6 +215,7 @@ class ForgeActivityRestController(BaseController):
'verb': a.verb,
'obj': a.obj._deinstrument(),
'target': a.target._deinstrument(),
+ 'tags': a.tags._deinstrument(),
} for a in data['timeline']],
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b327c9ac/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 1c363c9..f5c6bfc 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -230,7 +230,7 @@ class BlogPost(M.VersionedArtifact, ActivityObject):
def commit(self):
activity = functools.partial(g.director.create_activity, c.user,
- target=c.project, tags=['blog'])
+ related_nodes=[c.project], tags=['blog'])
self.subscribe()
super(BlogPost, self).commit()
if self.version > 1:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b327c9ac/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 9231106..51d5f13 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -655,7 +655,7 @@ class PageController(BaseController, FeedController):
g.spam_checker.check(text, artifact=self.page,
user=c.user, content_type='wiki')
g.director.create_activity(c.user, activity_verb, self.page,
- target=c.project, tags=['wiki'])
+ related_nodes=[c.project], tags=['wiki'])
if new_viewable_by:
if new_viewable_by == 'all':
self.page.viewable_by.append('all')
[3/5] git commit: [#7042] Add activity tags
Posted by jo...@apache.org.
[#7042] Add activity tags
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d041b563
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d041b563
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d041b563
Branch: refs/heads/master
Commit: d041b563e388e6298c00e9f769ee9e4ee18cbd6b
Parents: 72eff67
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Feb 5 20:32:15 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Feb 6 16:58:44 2014 +0000
----------------------------------------------------------------------
Allura/allura/controllers/discuss.py | 3 ++-
Allura/allura/model/discuss.py | 3 ++-
Allura/allura/model/repo_refresh.py | 3 ++-
Allura/allura/model/timeline.py | 6 ++++--
ForgeBlog/forgeblog/model/blog.py | 2 +-
ForgeImporters/forgeimporters/base.py | 2 +-
ForgeTracker/forgetracker/tracker_main.py | 4 ++--
ForgeWiki/forgewiki/wiki_main.py | 2 +-
8 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/Allura/allura/controllers/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index aefd472..cd4e8a1 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -303,7 +303,8 @@ class PostController(BaseController):
self.post.commit()
g.director.create_activity(c.user, 'modified', self.post,
target=self.post.thread.artifact or self.post.thread,
- related_nodes=[self.post.app_config.project])
+ related_nodes=[self.post.app_config.project],
+ tags=['comment'])
redirect(request.referer)
elif request.method == 'GET':
if version is not None:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 2741d03..c5762a9 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -685,7 +685,8 @@ class Post(Message, VersionedArtifact, ActivityObject):
artifact.update_stats()
if self.text and not self.is_meta:
g.director.create_activity(author, 'posted', self, target=artifact,
- related_nodes=[self.app_config.project])
+ related_nodes=[self.app_config.project],
+ tags=['comment'])
def notify(self, file_info=None, check_dup=False):
if self.project.notifications_disabled:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/Allura/allura/model/repo_refresh.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index d364d2c..a2dc628 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -144,7 +144,8 @@ def refresh_repo(repo, all_commits=False, notify=True, new_clone=False):
actor = user or TransientActor(
activity_name=new.committed.name or new.committed.emai)
g.director.create_activity(actor, 'committed', new,
- related_nodes=[repo.app_config.project])
+ related_nodes=[repo.app_config.project],
+ tags=['commit', repo.tool.lower()])
log.info('Refresh complete for %s', repo.full_fs_path)
g.post_event('repo_refreshed', len(commit_ids), all_commits, new_clone)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/Allura/allura/model/timeline.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/timeline.py b/Allura/allura/model/timeline.py
index 63cbd83..ed059a9 100644
--- a/Allura/allura/model/timeline.py
+++ b/Allura/allura/model/timeline.py
@@ -39,13 +39,15 @@ class Director(ActivityDirector):
"""
def create_activity(self, actor, verb, obj, target=None,
- related_nodes=None):
+ related_nodes=None, tags=None):
if c.project and c.project.notifications_disabled:
return
from allura.model.project import Project
super(Director, self).create_activity(actor, verb, obj,
- target=target, related_nodes=related_nodes)
+ target=target,
+ related_nodes=related_nodes,
+ tags=tags)
# aggregate actor and follower's timelines
if actor.node_id:
create_timelines.post(actor.node_id)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index f520265..1c363c9 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -230,7 +230,7 @@ class BlogPost(M.VersionedArtifact, ActivityObject):
def commit(self):
activity = functools.partial(g.director.create_activity, c.user,
- target=c.project)
+ target=c.project, tags=['blog'])
self.subscribe()
super(BlogPost, self).commit()
if self.version > 1:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index d03e838..996edb5 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -142,7 +142,7 @@ def import_tool(importer_path, project_name=None,
if app:
with h.notifications_disabled(c.project, disabled=False):
g.director.create_activity(c.user, "imported", app.config,
- related_nodes=[c.project])
+ related_nodes=[c.project], tags=['import'])
handler.success(app)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 0ae0cad..f60df6d 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -856,7 +856,7 @@ class RootController(BaseController, FeedController):
ticket.update(ticket_form)
c.app.globals.invalidate_bin_counts()
g.director.create_activity(c.user, 'created', ticket,
- related_nodes=[c.project])
+ related_nodes=[c.project], tags=['ticket'])
redirect(str(ticket.ticket_num) + '/')
@with_trailing_slash
@@ -1435,7 +1435,7 @@ class TicketController(BaseController, FeedController):
if comment:
self.ticket.discussion_thread.post(text=comment)
g.director.create_activity(c.user, 'modified', self.ticket,
- related_nodes=[c.project])
+ related_nodes=[c.project], tags=['ticket'])
c.app.globals.invalidate_bin_counts()
redirect('.')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d041b563/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 01a6008..9231106 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -655,7 +655,7 @@ class PageController(BaseController, FeedController):
g.spam_checker.check(text, artifact=self.page,
user=c.user, content_type='wiki')
g.director.create_activity(c.user, activity_verb, self.page,
- target=c.project)
+ target=c.project, tags=['wiki'])
if new_viewable_by:
if new_viewable_by == 'all':
self.page.viewable_by.append('all')
[5/5] git commit: [#7042] Bump ActivityStream to version 0.2.0 for
tag feature
Posted by jo...@apache.org.
[#7042] Bump ActivityStream to version 0.2.0 for tag feature
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3b25e964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3b25e964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3b25e964
Branch: refs/heads/master
Commit: 3b25e9645ab6705cbdeee18f560c9c3a992aebfa
Parents: 06afe40
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Thu Feb 6 19:58:16 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Feb 6 19:58:16 2014 +0000
----------------------------------------------------------------------
requirements-common.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3b25e964/requirements-common.txt
----------------------------------------------------------------------
diff --git a/requirements-common.txt b/requirements-common.txt
index 659b67c..aea8ea1 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -1,7 +1,7 @@
# requirements for all deployment environments
pytz==2012j
-ActivityStream==0.1.8
+ActivityStream==0.2.0
BeautifulSoup==3.2.0
chardet==1.0.1
colander==0.9.3