diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-11-20 18:54:44 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-11-20 18:54:44 +0000 |
commit | ba2e3783917ca1768b0ef0e5b4c03c2ea4151385 (patch) | |
tree | 4aa5d737b4276788387e14e9b43ab225fbb1ee7f /baserockimport/app.py | |
parent | 7aef49ca7a7888a42ba7bef97a681912cf01e4f2 (diff) | |
parent | 9b73d0d77c65aeb8f529e1289276c90cf6944d9d (diff) | |
download | import-ba2e3783917ca1768b0ef0e5b4c03c2ea4151385.tar.gz |
Merge branch 'sam/final-fixes'
Diffstat (limited to 'baserockimport/app.py')
-rw-r--r-- | baserockimport/app.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/baserockimport/app.py b/baserockimport/app.py index 6ae3424..6f4d7c3 100644 --- a/baserockimport/app.py +++ b/baserockimport/app.py @@ -44,6 +44,11 @@ class BaserockImportApplication(cliapp.Application): metavar="PATH", default=os.path.abspath('./lorry-working-dir')) + self.settings.boolean(['force-stratum-generation', 'force-stratum'], + "always create a stratum, overwriting any " + "existing stratum morphology, and ignoring any " + "components where errors occurred during import", + default=False) self.settings.boolean(['update-existing'], "update all the checked-out Git trees and " "generated definitions", @@ -76,7 +81,7 @@ class BaserockImportApplication(cliapp.Application): self.add_subcommand('omnibus', self.import_omnibus, arg_synopsis='REPO PROJECT_NAME SOFTWARE_NAME') self.add_subcommand('rubygems', self.import_rubygems, - arg_synopsis='GEM_NAME') + arg_synopsis='GEM_NAME [GEM_VERSION]') self.stdout_has_colours = self._stream_has_colours(sys.stdout) @@ -165,12 +170,16 @@ class BaserockImportApplication(cliapp.Application): def import_rubygems(self, args): '''Import one or more RubyGems.''' - if len(args) != 1: + if len(args) not in [1, 2]: raise cliapp.AppException( - 'Please pass the name of a RubyGem on the commandline.') + 'Please pass the name and version of a RubyGem on the ' + 'commandline.') + + goal_name = args[0] + goal_version = args[1] if len(args) == 2 else 'master' loop = baserockimport.mainloop.ImportLoop( app=self, - goal_kind='rubygems', goal_name=args[0], goal_version='master') + goal_kind='rubygems', goal_name=goal_name, goal_version=goal_version) loop.enable_importer('rubygems') loop.run() |