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 2013/08/13 21:18:44 UTC
[1/7] git commit: [#6458] standardize importer label
Updated Branches:
refs/heads/cj/5177 c68f4eec3 -> 49522e063 (forced update)
[#6458] standardize importer label
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3cd01607
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3cd01607
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3cd01607
Branch: refs/heads/cj/5177
Commit: 3cd01607850993bf2090108ca2ed8eb150b847c0
Parents: ee1c591
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu Aug 8 21:25:40 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Aug 8 21:25:45 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/google/code.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3cd01607/ForgeImporters/forgeimporters/google/code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/code.py b/ForgeImporters/forgeimporters/google/code.py
index c88d42a..2f8d19f 100644
--- a/ForgeImporters/forgeimporters/google/code.py
+++ b/ForgeImporters/forgeimporters/google/code.py
@@ -97,7 +97,7 @@ class GoogleRepoImporter(ToolImporter):
target_app = TARGET_APPS
source = 'Google Code'
controller = GoogleRepoImportController
- tool_label = 'Google Code Source Importer'
+ tool_label = 'Source Code'
tool_description = 'Import your SVN, Git, or Hg repo from Google Code'
def import_tool(self, project, user, project_name=None, mount_point=None,
[7/7] git commit: [#5177] Added test for default source and
target_branch values for merge requests
Posted by jo...@apache.org.
[#5177] Added test for default source and target_branch values for merge requests
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/49522e06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/49522e06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/49522e06
Branch: refs/heads/cj/5177
Commit: 49522e0639a19530f99f63cf6f4949484af2adf8
Parents: 59b16dc
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Aug 13 19:18:32 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Aug 13 19:18:32 2013 +0000
----------------------------------------------------------------------
.../forgegit/tests/functional/test_controllers.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/49522e06/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index d8c3f2c..597c5bb 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -33,6 +33,7 @@ from allura.lib import helpers as h
from alluratest.controller import TestController
from allura.tests.decorators import with_tool
from forgegit.tests import with_git
+from forgegit import model as GM
class _TestCase(TestController):
@@ -517,6 +518,23 @@ class TestFork(_TestCase):
params=dict(status='rejected')).follow()
assert 'Merge Request #%s: (rejected)' % mr_num in r, r
+ def test_merge_request_default_branches(self):
+ _select_val = lambda r, n: r.html.find('select', {'name': n}).find(selected=True).string
+ r = self.app.get('/p/test2/code/request_merge')
+ assert_equal(_select_val(r, 'source_branch'), 'master')
+ assert_equal(_select_val(r, 'target_branch'), 'master')
+ r = self.app.get('/p/test2/code/ci/zz/tree/').click('Request Merge')
+ assert_equal(_select_val(r, 'source_branch'), 'zz')
+ assert_equal(_select_val(r, 'target_branch'), 'master')
+ GM.Repository.query.get(_id=c.app.repo._id).default_branch_name = 'zz'
+ ThreadLocalORMSession.flush_all()
+ r = self.app.get('/p/test2/code/request_merge')
+ assert_equal(_select_val(r, 'source_branch'), 'master')
+ assert_equal(_select_val(r, 'target_branch'), 'zz')
+ r = self.app.get('/p/test2/code/ci/zz/tree/').click('Request Merge')
+ assert_equal(_select_val(r, 'source_branch'), 'zz')
+ assert_equal(_select_val(r, 'target_branch'), 'zz')
+
class TestDiff(TestController):
def setUp(self):
[6/7] git commit: [#5177] Fixed default values for source and
target_branch when creating a merge request
Posted by jo...@apache.org.
[#5177] Fixed default values for source and target_branch when creating a merge request
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/59b16dca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/59b16dca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/59b16dca
Branch: refs/heads/cj/5177
Commit: 59b16dcad60a7c033633ed56e8c10928c55d810e
Parents: d43c254
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Thu Aug 8 14:03:29 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Aug 13 18:38:45 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/repository.py | 14 +++++++++++---
Allura/allura/lib/repository.py | 5 ++++-
Allura/allura/templates/repo/request_merge.html | 2 +-
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/59b16dca/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index aaf9f6a..36b4bdc 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -162,9 +162,16 @@ class RepoRootController(BaseController, FeedController):
def request_merge(self, branch=None, **kw):
security.require(security.has_access(c.app.repo, 'admin'))
c.form = self.mr_widget
- if branch is None:
- source_branch=c.app.default_branch_name
- return dict(source_branch=source_branch)
+ if branch in c.form.source_branches:
+ source_branch = branch
+ else:
+ source_branch = c.app.default_branch_name
+ with c.app.repo.push_upstream_context():
+ target_branch = c.app.default_branch_name
+ return {
+ 'source_branch': source_branch,
+ 'target_branch': target_branch,
+ }
@expose()
@require_post()
@@ -417,6 +424,7 @@ class CommitBrowser(BaseController):
def __init__(self, revision):
self._revision = revision
self._commit = c.app.repo.commit(revision)
+ c.revision = revision
if self._commit is None:
raise exc.HTTPNotFound
self.tree = self.TreeBrowserClass(self._commit, tree=self._commit.tree)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/59b16dca/Allura/allura/lib/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/repository.py b/Allura/allura/lib/repository.py
index 83df6b2..65b68c8 100644
--- a/Allura/allura/lib/repository.py
+++ b/Allura/allura/lib/repository.py
@@ -127,7 +127,10 @@ class RepositoryApp(Application):
self.repo.upstream_repo.name)
]
if not c.app.repo.is_empty() and has_access(c.app.repo, 'admin'):
- links.append(SitemapEntry('Request Merge', c.app.url + 'request_merge',
+ merge_url = c.app.url + 'request_merge'
+ if getattr(c, 'revision', None):
+ merge_url = merge_url + '?branch=' + h.urlquote(c.revision)
+ links.append(SitemapEntry('Request Merge', merge_url,
ui_icon=g.icons['merge'],
))
pending_upstream_merges = self.repo.pending_upstream_merges()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/59b16dca/Allura/allura/templates/repo/request_merge.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/request_merge.html b/Allura/allura/templates/repo/request_merge.html
index 02b9061..a55a67c 100644
--- a/Allura/allura/templates/repo/request_merge.html
+++ b/Allura/allura/templates/repo/request_merge.html
@@ -29,5 +29,5 @@
{% block header %}Request merge of {{c.app.config.options.mount_label}} {% endblock %}
{% block content %}
- {{ c.form.display(action='do_request_merge', value=dict(source_branch=source_branch))}}
+ {{ c.form.display(action='do_request_merge', value=dict(source_branch=source_branch, target_branch=target_branch))}}
{% endblock %}
[2/7] git commit: [#6458] Refactored Google Code project extractor
Posted by jo...@apache.org.
[#6458] Refactored Google Code project extractor
- Introduced a caching get_page() method so that page fetching
is no longer tightly coupled to extractor instantiation. In
other words, you can fetch any page you want, regardless of
the page that you instantiated the extractor with.
- Also removed the wiki-specific stuff and moved that to a
subclass in the googlecodewikiimporter pkg.
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/ee1c5914
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ee1c5914
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ee1c5914
Branch: refs/heads/cj/5177
Commit: ee1c5914a92961fb46326c59c456dbea860b10f1
Parents: 3600da2
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Aug 8 13:33:42 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Aug 8 21:25:45 2013 +0000
----------------------------------------------------------------------
.../forgeimporters/google/__init__.py | 57 ++++++++++++++------
.../tests/google/test_extractor.py | 26 +++++----
ForgeWiki/forgewiki/wiki_main.py | 2 +-
3 files changed, 57 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ee1c5914/ForgeImporters/forgeimporters/google/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/__init__.py b/ForgeImporters/forgeimporters/google/__init__.py
index 8c91fd3..a307bcd 100644
--- a/ForgeImporters/forgeimporters/google/__init__.py
+++ b/ForgeImporters/forgeimporters/google/__init__.py
@@ -40,7 +40,6 @@ class GoogleCodeProjectExtractor(object):
PAGE_MAP = {
'project_info': BASE_URL + '/p/%s/',
'source_browse': BASE_URL + '/p/%s/source/browse/',
- 'wiki_index': BASE_URL + '/p/%s/w/list',
}
LICENSE_MAP = defaultdict(lambda:'Other/Proprietary License', {
@@ -58,17 +57,49 @@ class GoogleCodeProjectExtractor(object):
DEFAULT_ICON = 'http://www.gstatic.com/codesite/ph/images/defaultlogo.png'
- def __init__(self, allura_project, gc_project_name, page):
+ def __init__(self, allura_project, gc_project_name, page=None):
self.project = allura_project
self.gc_project_name = gc_project_name
- self.url = self.PAGE_MAP[page] % urllib.quote(self.gc_project_name)
- self.page = BeautifulSoup(urllib2.urlopen(self.url))
+ self._page_cache = {}
+ self.url = None
+ self.page = None
+ if page:
+ self.get_page(page)
+
+ def get_page(self, page_name_or_url):
+ """Return a Beautiful soup object for the given page name or url.
+
+ If a page name is provided, the associated url is looked up in
+ :attr:`PAGE_MAP`.
+
+ Results are cached so that subsequent calls for the same page name or
+ url will return the cached result rather than making another HTTP
+ request.
+
+ """
+ if page_name_or_url in self._page_cache:
+ return self._page_cache[page_name_or_url]
+ self.url = (self.get_page_url(page_name_or_url) if page_name_or_url in
+ self.PAGE_MAP else page_name_or_url)
+ self.page = self._page_cache[page_name_or_url] = \
+ BeautifulSoup(urllib2.urlopen(self.url))
+ return self.page
+
+ def get_page_url(self, page_name):
+ """Return the url associated with ``page_name``.
+
+ Raises KeyError if ``page_name`` is not in :attr:`PAGE_MAP`.
+
+ """
+ return self.PAGE_MAP[page_name] % urllib.quote(self.gc_project_name)
def get_short_description(self):
- self.project.short_description = self.page.find(itemprop='description').string.strip()
+ page = self.get_page('project_info')
+ self.project.short_description = page.find(itemprop='description').string.strip()
def get_icon(self):
- icon_url = urljoin(self.url, self.page.find(itemprop='image').attrMap['src'])
+ page = self.get_page('project_info')
+ icon_url = urljoin(self.url, page.find(itemprop='image').attrMap['src'])
if icon_url == self.DEFAULT_ICON:
return
icon_name = urllib.unquote(urlparse(icon_url).path).split('/')[-1]
@@ -81,12 +112,14 @@ class GoogleCodeProjectExtractor(object):
thumbnail_meta={'project_id': self.project._id, 'category': 'icon'})
def get_license(self):
- license = self.page.find(text='Code license').findNext().find('a').string.strip()
+ page = self.get_page('project_info')
+ license = page.find(text='Code license').findNext().find('a').string.strip()
trove = M.TroveCategory.query.get(fullname=self.LICENSE_MAP[license])
self.project.trove_license.append(trove._id)
def get_repo_type(self):
- repo_type = self.page.find(id="crumb_root")
+ page = self.get_page('source_browse')
+ repo_type = page.find(id="crumb_root")
if not repo_type:
raise Exception("Couldn't detect repo type: no #crumb_root in "
"{0}".format(self.url))
@@ -95,11 +128,3 @@ class GoogleCodeProjectExtractor(object):
return re_match.group(0)
else:
raise Exception("Unknown repo type: {0}".format(repo_type.text))
-
- def get_wiki_pages(self):
- RE_WIKI_PAGE_URL = r'^/p/{0}/wiki/.*$'.format(self.gc_project_name)
- seen = set()
- for a in self.page.find(id="resultstable").findAll("a"):
- if re.match(RE_WIKI_PAGE_URL, a['href']) and a['href'] not in seen:
- yield (a.text, self.BASE_URL + a['href'])
- seen.add(a['href'])
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ee1c5914/ForgeImporters/forgeimporters/tests/google/test_extractor.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/test_extractor.py b/ForgeImporters/forgeimporters/tests/google/test_extractor.py
index 250759f..b4e64c0 100644
--- a/ForgeImporters/forgeimporters/tests/google/test_extractor.py
+++ b/ForgeImporters/forgeimporters/tests/google/test_extractor.py
@@ -43,6 +43,18 @@ class TestGoogleCodeProjectExtractor(TestCase):
self.soup.assert_called_once_with(self.urlopen.return_value)
self.assertEqual(extractor.page, self.soup.return_value)
+ def test_get_page(self):
+ extractor = google.GoogleCodeProjectExtractor(self.project, 'my-project', 'project_info')
+ self.assertEqual(1, self.urlopen.call_count)
+ page = extractor.get_page('project_info')
+ self.assertEqual(1, self.urlopen.call_count)
+ self.assertEqual(page, extractor._page_cache['project_info'])
+
+ def test_get_page_url(self):
+ extractor = google.GoogleCodeProjectExtractor(self.project, 'my-project')
+ self.assertEqual(extractor.get_page_url('project_info'),
+ 'http://code.google.com/p/my-project/')
+
def test_get_short_description(self):
extractor = google.GoogleCodeProjectExtractor(self.project, 'my-project', 'project_info')
extractor.page.find.return_value.string = 'My Super Project'
@@ -93,9 +105,10 @@ class TestGoogleCodeProjectExtractor(TestCase):
def _make_extractor(self, html):
from BeautifulSoup import BeautifulSoup
- with mock.patch.object(google, 'urllib2') as urllib2:
- extractor = google.GoogleCodeProjectExtractor(self.project, 'my-project', 'project_info')
+ with mock.patch.object(google, 'urllib2'):
+ extractor = google.GoogleCodeProjectExtractor(self.project, 'my-project')
extractor.page = BeautifulSoup(html)
+ extractor.get_page = lambda pagename: extractor.page
extractor.url="http://test/source/browse"
return extractor
@@ -118,12 +131,3 @@ class TestGoogleCodeProjectExtractor(TestCase):
with self.assertRaises(Exception) as cm:
extractor.get_repo_type()
self.assertEqual(str(cm.exception), "Unknown repo type: cvs")
-
- def test_get_wiki_pages(self):
- extractor = self._make_extractor('''
- <div id="resultstable">
- <a href="#">Link that's not a wiki page</a>
- <a href="/p/my-project/wiki/PageOne">PageOne</a>
- </div>''')
- self.assertEqual(list(extractor.get_wiki_pages()), [
- ('PageOne', 'http://code.google.com/p/my-project/wiki/PageOne')])
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ee1c5914/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 064a9cd..816db78 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -139,7 +139,7 @@ class ForgeWikiApp(Application):
elif new_root_page_name != self.default_root_page_name:
globals = WM.Globals(app_config_id=self.config._id, root=new_root_page_name)
if globals is not None:
- session(globals).flush()
+ session(globals).flush(globals)
@Property
def show_discussion():
[5/7] git commit: [#6554] let ProjectConflict be constructed with a
single string, like it did before adding Invalid as a parent
Posted by jo...@apache.org.
[#6554] let ProjectConflict be constructed with a single string, like it did before adding Invalid as a parent
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d43c2544
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d43c2544
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d43c2544
Branch: refs/heads/cj/5177
Commit: d43c25447577c512a991b6c70b703fc8438c4cc3
Parents: 9e3e394
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon Aug 12 21:34:43 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Aug 12 21:34:43 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/exceptions.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d43c2544/Allura/allura/lib/exceptions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/exceptions.py b/Allura/allura/lib/exceptions.py
index 4c33991..7611dd7 100644
--- a/Allura/allura/lib/exceptions.py
+++ b/Allura/allura/lib/exceptions.py
@@ -18,7 +18,14 @@
from formencode import Invalid
class ForgeError(Exception): pass
-class ProjectConflict(ForgeError, Invalid): pass
+
+class ProjectConflict(ForgeError, Invalid):
+
+ # support the single string constructor in addition to full set of params that Invalid.__init__ requires
+ def __init__(self, msg, value=None, state=None, error_list=None, error_dict=None):
+ super(ProjectConflict, self).__init__(msg, value, state, error_list, error_dict)
+
+
class ProjectShortnameInvalid(ForgeError, Invalid): pass
class ProjectOverlimitError(ForgeError): pass
class ProjectRatelimitError(ForgeError): pass
@@ -45,4 +52,3 @@ class CompoundError(ForgeError):
parts.append(' ' + line)
parts.append('</%s>\n' % self.__class__.__name__ )
return ''.join(parts)
-
[4/7] git commit: [#6554] Fixed incorrect uses of h.re_project_name
causing 404 in REST
Posted by jo...@apache.org.
[#6554] Fixed incorrect uses of h.re_project_name causing 404 in REST
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/9e3e3941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/9e3e3941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/9e3e3941
Branch: refs/heads/cj/5177
Commit: 9e3e39413fc2879b6a52ffdd5b6b45e142cf1f72
Parents: 3cd0160
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Mon Aug 12 19:47:18 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Mon Aug 12 19:47:18 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/rest.py | 7 ++++++-
Allura/allura/model/project.py | 6 ++++--
Allura/allura/tests/functional/test_rest.py | 9 +++++++++
Allura/allura/tests/model/test_project.py | 10 ++++++----
4 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9e3e3941/Allura/allura/controllers/rest.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/rest.py b/Allura/allura/controllers/rest.py
index c976c21..6a41be3 100644
--- a/Allura/allura/controllers/rest.py
+++ b/Allura/allura/controllers/rest.py
@@ -32,6 +32,8 @@ from ming.utils import LazyProperty
from allura import model as M
from allura.lib import helpers as h
from allura.lib import security
+from allura.lib import plugin
+from allura.lib.exceptions import Invalid
log = logging.getLogger(__name__)
action_logger = h.log_action(log, 'API:')
@@ -243,7 +245,10 @@ class NeighborhoodRestController(object):
@expose()
def _lookup(self, name, *remainder):
- if not h.re_project_name.match(name):
+ provider = plugin.ProjectRegistrationProvider.get()
+ try:
+ provider.shortname_validator.to_python(name, check_allowed=False, neighborhood=self._neighborhood)
+ except Invalid as e:
raise exc.HTTPNotFound, name
name = self._neighborhood.shortname_prefix + name
project = M.Project.query.get(shortname=name, neighborhood_id=self._neighborhood._id, deleted=False)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9e3e3941/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 435cbbb..db7da13 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -638,9 +638,11 @@ class Project(MappedClass, ActivityNode, ActivityObject):
return ac
def new_subproject(self, name, install_apps=True, user=None, project_name=None):
- if not h.re_project_name.match(name):
- raise exceptions.ToolError, 'Mount point "%s" is invalid' % name
provider = plugin.ProjectRegistrationProvider.get()
+ try:
+ provider.shortname_validator.to_python(name, check_allowed=False, neighborhood=self.neighborhood)
+ except exceptions.Invalid as e:
+ raise exceptions.ToolError, 'Mount point "%s" is invalid' % name
return provider.register_subproject(self, name, user or c.user, install_apps, project_name=project_name)
def ordered_mounts(self, include_hidden=False):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9e3e3941/Allura/allura/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_rest.py b/Allura/allura/tests/functional/test_rest.py
index fcfb373..d5ed769 100644
--- a/Allura/allura/tests/functional/test_rest.py
+++ b/Allura/allura/tests/functional/test_rest.py
@@ -27,6 +27,7 @@ from nose.tools import assert_equal, assert_in, assert_not_in
from allura.tests import decorators as td
from alluratest.controller import TestRestApiBase
from allura.lib import helpers as h
+from allura.lib.exceptions import Invalid
from allura import model as M
class TestRestHome(TestRestApiBase):
@@ -141,3 +142,11 @@ class TestRestHome(TestRestApiBase):
'qux_24hr': 0,
},
})
+
+ def test_name_validation(self):
+ r = self.api_get('/rest/p/test/')
+ assert r.status_int == 200
+ with mock.patch('allura.lib.plugin.ProjectRegistrationProvider') as Provider:
+ Provider.get().shortname_validator.to_python.side_effect = Invalid('name', 'value', {})
+ r = self.api_get('/rest/p/test/')
+ assert r.status_int == 404
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9e3e3941/Allura/allura/tests/model/test_project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py
index 33791f4..2cd7892 100644
--- a/Allura/allura/tests/model/test_project.py
+++ b/Allura/allura/tests/model/test_project.py
@@ -28,8 +28,8 @@ from allura import model as M
from allura.lib import helpers as h
from allura.tests import decorators as td
from alluratest.controller import setup_basic_test, setup_global_objects
-from allura.lib.exceptions import ToolError
-from mock import MagicMock
+from allura.lib.exceptions import ToolError, Invalid
+from mock import MagicMock, patch
def setUp():
@@ -93,8 +93,10 @@ def test_project():
def test_subproject():
project = M.Project.query.get(shortname='test')
with td.raises(ToolError):
- # name exceeds 15 chars
- sp = project.new_subproject('test-project-nose')
+ with patch('allura.lib.plugin.ProjectRegistrationProvider') as Provider:
+ Provider.get().shortname_validator.to_python.side_effect = Invalid('name', 'value', {})
+ # name doesn't validate
+ sp = project.new_subproject('test-proj-nose')
sp = project.new_subproject('test-proj-nose')
spp = sp.new_subproject('spp')
ThreadLocalORMSession.flush_all()
[3/7] git commit: [#6458] Add google-code wiki page extraction
Posted by jo...@apache.org.
[#6458] Add google-code wiki page extraction
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/3600da20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3600da20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3600da20
Branch: refs/heads/cj/5177
Commit: 3600da202a8895a2fbf206f4bed17506a65ff4ef
Parents: 6711c10
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Jul 30 14:39:04 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Aug 8 21:25:45 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/google/__init__.py | 17 ++++++++++++++---
.../forgeimporters/tests/google/test_extractor.py | 9 +++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3600da20/ForgeImporters/forgeimporters/google/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/__init__.py b/ForgeImporters/forgeimporters/google/__init__.py
index 57e384b..8c91fd3 100644
--- a/ForgeImporters/forgeimporters/google/__init__.py
+++ b/ForgeImporters/forgeimporters/google/__init__.py
@@ -34,11 +34,13 @@ from allura import model as M
log = logging.getLogger(__name__)
class GoogleCodeProjectExtractor(object):
+ BASE_URL = 'http://code.google.com'
RE_REPO_TYPE = re.compile(r'(svn|hg|git)')
PAGE_MAP = {
- 'project_info': 'http://code.google.com/p/%s/',
- 'source_browse': 'http://code.google.com/p/%s/source/browse/',
+ 'project_info': BASE_URL + '/p/%s/',
+ 'source_browse': BASE_URL + '/p/%s/source/browse/',
+ 'wiki_index': BASE_URL + '/p/%s/w/list',
}
LICENSE_MAP = defaultdict(lambda:'Other/Proprietary License', {
@@ -58,7 +60,8 @@ class GoogleCodeProjectExtractor(object):
def __init__(self, allura_project, gc_project_name, page):
self.project = allura_project
- self.url = self.PAGE_MAP[page] % urllib.quote(gc_project_name)
+ self.gc_project_name = gc_project_name
+ self.url = self.PAGE_MAP[page] % urllib.quote(self.gc_project_name)
self.page = BeautifulSoup(urllib2.urlopen(self.url))
def get_short_description(self):
@@ -92,3 +95,11 @@ class GoogleCodeProjectExtractor(object):
return re_match.group(0)
else:
raise Exception("Unknown repo type: {0}".format(repo_type.text))
+
+ def get_wiki_pages(self):
+ RE_WIKI_PAGE_URL = r'^/p/{0}/wiki/.*$'.format(self.gc_project_name)
+ seen = set()
+ for a in self.page.find(id="resultstable").findAll("a"):
+ if re.match(RE_WIKI_PAGE_URL, a['href']) and a['href'] not in seen:
+ yield (a.text, self.BASE_URL + a['href'])
+ seen.add(a['href'])
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3600da20/ForgeImporters/forgeimporters/tests/google/test_extractor.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/test_extractor.py b/ForgeImporters/forgeimporters/tests/google/test_extractor.py
index 1a3a87c..250759f 100644
--- a/ForgeImporters/forgeimporters/tests/google/test_extractor.py
+++ b/ForgeImporters/forgeimporters/tests/google/test_extractor.py
@@ -118,3 +118,12 @@ class TestGoogleCodeProjectExtractor(TestCase):
with self.assertRaises(Exception) as cm:
extractor.get_repo_type()
self.assertEqual(str(cm.exception), "Unknown repo type: cvs")
+
+ def test_get_wiki_pages(self):
+ extractor = self._make_extractor('''
+ <div id="resultstable">
+ <a href="#">Link that's not a wiki page</a>
+ <a href="/p/my-project/wiki/PageOne">PageOne</a>
+ </div>''')
+ self.assertEqual(list(extractor.get_wiki_pages()), [
+ ('PageOne', 'http://code.google.com/p/my-project/wiki/PageOne')])