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/11/05 18:08:43 UTC
[1/2] git commit: [#6843] Fixed error handling for project metadata
import
Updated Branches:
refs/heads/cj/6843 [created] 49f2e8d7c
[#6843] Fixed error handling for project metadata import
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/0944d135
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0944d135
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0944d135
Branch: refs/heads/cj/6843
Commit: 0944d135cf45c2ef151f49045d6bb579c0395d3e
Parents: 586c77e
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Nov 5 16:28:24 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Nov 5 17:07:42 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/base.py | 4 +++-
ForgeImporters/forgeimporters/github/tasks.py | 16 ++++++++++------
ForgeImporters/forgeimporters/google/tasks.py | 18 +++++++++++-------
3 files changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0944d135/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 49d49a1..97f7c92 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -85,7 +85,8 @@ class ImportErrorHandler(object):
return self
def __exit__(self, exc_type, exc_val, exc_tb):
- self.importer.clear_pending(self.project)
+ if hasattr(self.importer, 'clear_pending'):
+ self.importer.clear_pending(self.project)
if exc_type:
g.post_event('import_tool_task_failed',
error=str(exc_val),
@@ -209,6 +210,7 @@ class ProjectImporter(BaseController):
"""
source = None
+ tool_label = 'Project Info'
process_validator = None
index_template = None
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0944d135/ForgeImporters/forgeimporters/github/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tasks.py b/ForgeImporters/forgeimporters/github/tasks.py
index 588c5a6..9abdb3d 100644
--- a/ForgeImporters/forgeimporters/github/tasks.py
+++ b/ForgeImporters/forgeimporters/github/tasks.py
@@ -22,13 +22,17 @@ from ming.orm import ThreadLocalORMSession
from allura.lib.decorators import task
-from . import GitHubProjectExtractor
+from forgeimporters.base import ImportErrorHandler
+from forgeimporters.github import GitHubProjectExtractor
@task
def import_project_info(project_name):
- extractor = GitHubProjectExtractor(project_name)
- c.project.summary = extractor.get_summary()
- c.project.external_homepage = extractor.get_homepage()
- ThreadLocalORMSession.flush_all()
- g.post_event('project_updated')
+ from forgeimporters.github.project import GitHubProjectImporter
+ importer = GitHubProjectImporter(None)
+ with ImportErrorHandler(importer, project_name, c.project) as handler:
+ extractor = GitHubProjectExtractor(project_name)
+ c.project.summary = extractor.get_summary()
+ c.project.external_homepage = extractor.get_homepage()
+ ThreadLocalORMSession.flush_all()
+ g.post_event('project_updated')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0944d135/ForgeImporters/forgeimporters/google/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/tasks.py b/ForgeImporters/forgeimporters/google/tasks.py
index 69e7556..b0cb76f 100644
--- a/ForgeImporters/forgeimporters/google/tasks.py
+++ b/ForgeImporters/forgeimporters/google/tasks.py
@@ -22,14 +22,18 @@ from ming.orm import ThreadLocalORMSession
from allura.lib.decorators import task
-from . import GoogleCodeProjectExtractor
+from forgeimporters.base import ImportErrorHandler
+from forgeimporters.google import GoogleCodeProjectExtractor
@task
def import_project_info(project_name):
- extractor = GoogleCodeProjectExtractor(project_name, 'project_info')
- extractor.get_short_description(c.project)
- extractor.get_icon(c.project)
- extractor.get_license(c.project)
- ThreadLocalORMSession.flush_all()
- g.post_event('project_updated')
+ from forgeimporters.google.project import GoogleCodeProjectImporter
+ importer = GoogleCodeProjectImporter(None)
+ with ImportErrorHandler(importer, project_name, c.project) as handler:
+ extractor = GoogleCodeProjectExtractor(project_name, 'project_info')
+ extractor.get_short_description(c.project)
+ extractor.get_icon(c.project)
+ extractor.get_license(c.project)
+ ThreadLocalORMSession.flush_all()
+ g.post_event('project_updated')
[2/2] git commit: [#6843] Updated license map for GC importer
Posted by jo...@apache.org.
[#6843] Updated license map for GC importer
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/49f2e8d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/49f2e8d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/49f2e8d7
Branch: refs/heads/cj/6843
Commit: 49f2e8d7c0a59ad85fffa28b22d04f008d3061af
Parents: 0944d13
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Nov 5 17:08:20 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Nov 5 17:08:20 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/google/__init__.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/49f2e8d7/ForgeImporters/forgeimporters/google/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/__init__.py b/ForgeImporters/forgeimporters/google/__init__.py
index f7c00e5..ae595e8 100644
--- a/ForgeImporters/forgeimporters/google/__init__.py
+++ b/ForgeImporters/forgeimporters/google/__init__.py
@@ -94,16 +94,16 @@ class GoogleCodeProjectExtractor(ProjectExtractor):
}
LICENSE_MAP = defaultdict(lambda:'Other/Proprietary License', {
- 'Apache License 2.0': 'Apache Software License',
+ 'Apache License 2.0': 'Apache License V2.0',
'Artistic License/GPL': 'Artistic License',
'Eclipse Public License 1.0': 'Eclipse Public License',
- 'GNU GPL v2': 'GNU General Public License (GPL)',
- 'GNU GPL v3': 'GNU General Public License (GPL)',
- 'GNU Lesser GPL': 'GNU Library or Lesser General Public License (LGPL)',
+ 'GNU GPL v2': 'GNU General Public License version 2.0 (GPLv2)',
+ 'GNU GPL v3': 'GNU General Public License version 3.0 (GPLv3)',
+ 'GNU Lesser GPL': 'GNU Library or Lesser General Public License version 2.0 (LGPLv2)',
'MIT License': 'MIT License',
'Mozilla Public License 1.1': 'Mozilla Public License 1.1 (MPL 1.1)',
'New BSD License': 'BSD License',
- 'Other Open Source': 'Other/Proprietary License',
+ 'Other Open Source': 'Open Software License',
})
DEFAULT_ICON = 'http://www.gstatic.com/codesite/ph/images/defaultlogo.png'