You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/07/15 23:04:22 UTC
[26/50] [abbrv] git commit: [#4213] ticket:347 Import from trac:
ScriptTask to run import
[#4213] ticket:347 Import from trac: ScriptTask to run import
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/98cec904
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/98cec904
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/98cec904
Branch: refs/heads/tv/6355
Commit: 98cec9044dbed1fa4db3aac256110feecfaed136
Parents: 964c3d1
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Mon Jun 10 14:55:24 2013 +0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Sun Jul 7 06:09:58 2013 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/import_support.py | 1 -
ForgeTracker/forgetracker/scripts/__init__.py | 16 +++
.../forgetracker/scripts/import_tracker.py | 120 +++++++++++++++++++
scripts/allura_import.py | 50 +-------
4 files changed, 138 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/98cec904/ForgeTracker/forgetracker/import_support.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py
index d23cf94..a94e70c 100644
--- a/ForgeTracker/forgetracker/import_support.py
+++ b/ForgeTracker/forgetracker/import_support.py
@@ -316,7 +316,6 @@ option user_map to avoid losing username information. Unknown users: %s''' % unk
for a in artifacts:
comments = a.pop('comments', [])
attachments = a.pop('attachments', [])
-# log.info(a)
t = self.make_artifact(a)
for c_entry in comments:
self.make_comment(t.discussion_thread, c_entry)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/98cec904/ForgeTracker/forgetracker/scripts/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/scripts/__init__.py b/ForgeTracker/forgetracker/scripts/__init__.py
new file mode 100644
index 0000000..144e298
--- /dev/null
+++ b/ForgeTracker/forgetracker/scripts/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/98cec904/ForgeTracker/forgetracker/scripts/import_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/scripts/import_tracker.py b/ForgeTracker/forgetracker/scripts/import_tracker.py
new file mode 100644
index 0000000..a84bede
--- /dev/null
+++ b/ForgeTracker/forgetracker/scripts/import_tracker.py
@@ -0,0 +1,120 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+import argparse
+import json
+import logging
+
+from allura.scripts import ScriptTask
+from allura.lib.import_api import AlluraImportApiClient
+
+log = logging.getLogger(__name__)
+
+def import_tracker(cli, project, tool, import_options, options, doc_txt, validate=True, verbose=False):
+ url = '/rest/p/' + project + '/' + tool
+ if validate:
+ url += '/validate_import'
+ else:
+ url += '/perform_import'
+
+ existing_map = {}
+ if options.cont:
+ existing_tickets = cli.call('/rest/p/' + options.project + '/' + options.tracker + '/')['tickets']
+ for t in existing_tickets:
+ existing_map[t['ticket_num']] = t['summary']
+
+ doc = json.loads(doc_txt)
+
+ if 'trackers' in doc and 'default' in doc['trackers'] and 'artifacts' in doc['trackers']['default']:
+ tickets_in = doc['trackers']['default']['artifacts']
+ doc['trackers']['default']['artifacts'] = []
+ else:
+ tickets_in = doc
+
+ if options.verbose:
+ print "Processing %d tickets" % len(tickets_in)
+
+ for cnt, ticket_in in enumerate(tickets_in):
+ if ticket_in['id'] in existing_map:
+ if options.verbose:
+ print 'Ticket id %d already exists, skipping' % ticket_in['id']
+ continue
+ doc_import={}
+ doc_import['trackers'] = {}
+ doc_import['trackers']['default'] = {}
+ doc_import['trackers']['default']['artifacts'] = [ticket_in]
+ res = cli.call(url, doc=json.dumps(doc_import), options=json.dumps(import_options))
+ assert res['status'] and not res['errors']
+ if options.validate:
+ if res['warnings']:
+ print "Ticket id %s warnings: %s" % (ticket_in['id'], res['warnings'])
+ else:
+ print "Imported ticket id %s" % (ticket_in['id'])
+
+class ImportTracker(ScriptTask):
+ @classmethod
+ def execute(cls, options):
+ user_map = {}
+ import_options = {}
+ for s in options.import_opts:
+ k, v = s.split('=', 1)
+ if v == 'false':
+ v = False
+ import_options[k] = v
+
+ if options.user_map_file:
+ f = open(options.user_map_file)
+ try:
+ user_map = json.load(f)
+ if type(user_map) is not type({}):
+ raise ValueError
+ for k, v in user_map.iteritems():
+ if not isinstance(k, basestring) or not isinstance(v, basestring):
+ raise ValueError
+ except ValueError:
+ raise '--user-map should specify JSON file with format {"original_user": "sf_user", ...}'
+ finally:
+ f.close()
+ import_options['user_map'] = user_map
+ cli = AlluraImportApiClient(options.base_url, options.api_key, options.secret_key, options.verbose)
+ doc_txt = open(options.file_data).read()
+ import_tracker(cli, options.project, options.tracker, import_options, options, doc_txt,
+ validate=options.validate,
+ verbose=options.verbose)
+
+ @classmethod
+ def parser(cls):
+ parser = argparse.ArgumentParser(description='import tickets from json')
+ parser.add_argument('--nbhd', action='store', default='', dest='nbhd',
+ help='Restrict update to a particular neighborhood, e.g. /p/.')
+ parser.add_argument('-a', '--api-ticket', action='store', dest='api_key', help='API ticket')
+ parser.add_argument('-s', '--secret-key', action='store', dest='secret_key', help='Secret key')
+ parser.add_argument('-p', '--project', action='store', dest='project', help='Project to import to')
+ parser.add_argument('-t', '--tracker', action='store', dest='tracker', help='Tracker to import to')
+ parser.add_argument('-u', '--base-url', dest='base_url', default='https://sourceforge.net', help='Base Allura URL (%default)')
+ parser.add_argument('-o', dest='import_opts', default=[], action='store', help='Specify import option(s)', metavar='opt=val')
+ parser.add_argument('--user-map', dest='user_map_file', help='Map original users to SF.net users', metavar='JSON_FILE')
+ parser.add_argument('--file_data', dest='file_data', help='json file', metavar='JSON_FILE')
+ parser.add_argument('--validate', dest='validate', action='store_true', help='Validate import data')
+ parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', help='Verbose operation')
+ parser.add_argument('-c', '--continue', dest='cont', action='store_true', help='Continue import into existing tracker')
+ return parser
+
+
+if __name__ == '__main__':
+ ImportTracker.main()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/98cec904/scripts/allura_import.py
----------------------------------------------------------------------
diff --git a/scripts/allura_import.py b/scripts/allura_import.py
index ba250e3..ddcd588 100644
--- a/scripts/allura_import.py
+++ b/scripts/allura_import.py
@@ -15,19 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-import os
-import sys
-import urllib
-import urllib2
-import urlparse
-import hmac
-import hashlib
import json
from optparse import OptionParser
-from pprint import pprint
from datetime import datetime
from allura.lib.import_api import AlluraImportApiClient
+from forgetracker.scripts.import_tracker import import_tracker
def main():
@@ -69,46 +62,6 @@ def main():
elif options.forum:
import_forum(cli, options.project, options.forum, user_map, doc_txt, validate=options.validate)
-def import_tracker(cli, project, tool, import_options, options, doc_txt, validate=True, verbose=False):
- url = '/rest/p/' + project + '/' + tool
- if validate:
- url += '/validate_import'
- else:
- url += '/perform_import'
-
- existing_map = {}
- if options.cont:
- existing_tickets = cli.call('/rest/p/' + options.project + '/' + options.tracker + '/')['tickets']
- for t in existing_tickets:
- existing_map[t['ticket_num']] = t['summary']
-
- doc = json.loads(doc_txt)
-
- if 'trackers' in doc and 'default' in doc['trackers'] and 'artifacts' in doc['trackers']['default']:
- tickets_in = doc['trackers']['default']['artifacts']
- doc['trackers']['default']['artifacts'] = []
- else:
- tickets_in = doc
-
- if options.verbose:
- print "Processing %d tickets" % len(tickets_in)
-
- for cnt, ticket_in in enumerate(tickets_in):
- if ticket_in['id'] in existing_map:
- if options.verbose:
- print 'Ticket id %d already exists, skipping' % ticket_in['id']
- continue
- doc_import={}
- doc_import['trackers'] = {}
- doc_import['trackers']['default'] = {}
- doc_import['trackers']['default']['artifacts'] = [ticket_in]
- res = cli.call(url, doc=json.dumps(doc_import), options=json.dumps(import_options))
- assert res['status'] and not res['errors']
- if options.validate:
- if res['warnings']:
- print "Ticket id %s warnings: %s" % (ticket_in['id'], res['warnings'])
- else:
- print "Imported ticket id %s" % (ticket_in['id'])
def import_forum(cli, project, tool, user_map, doc_txt, validate=True):
url = '/rest/p/' + project + '/' + tool
@@ -119,6 +72,7 @@ def import_forum(cli, project, tool, user_map, doc_txt, validate=True):
url += '/perform_import'
print cli.call(url, doc=doc_txt, user_map=json.dumps(user_map))
+
def parse_options():
optparser = OptionParser(usage='''%prog [options] <JSON dump>