import: Say 'rubygems' not 'rubygem' everywhere

3 files changed, 13 insertions, 13 deletions

diff --git a/import/main.py b/import/main.py
index 1d168eba..1728ae26 100644
--- a/import/main.py
+++ b/import/main.py
@@ -164,8 +164,8 @@ class LorrySet(object):
 # bit more code than this, I think).
 class MorphologyLoader(morphlib.morphloader.MorphologyLoader):
     pass
-MorphologyLoader._static_defaults['chunk']['x-build-dependencies-rubygem'] = []
-MorphologyLoader._static_defaults['chunk']['x-runtime-dependencies-rubygem'] = []
+MorphologyLoader._static_defaults['chunk']['x-build-dependencies-rubygems'] = []
+MorphologyLoader._static_defaults['chunk']['x-runtime-dependencies-rubygems'] = []
 
 
 class MorphologySet(morphlib.morphset.MorphologySet):
@@ -290,7 +290,7 @@ class BaserockImportApplication(cliapp.Application):
                              default=os.path.abspath('./checkouts'))
 
     def setup(self):
-        self.add_subcommand('rubygem', self.import_rubygem,
+        self.add_subcommand('rubygems', self.import_rubygems,
                             arg_synopsis='GEM_NAME')
 
     def setup_logging_formatter_for_file(self):
@@ -337,13 +337,13 @@ class BaserockImportApplication(cliapp.Application):
 
         #cliapp.runcmd(
 
-    def import_rubygem(self, args):
-        '''Import a RubyGem.'''
+    def import_rubygems(self, args):
+        '''Import one or more RubyGems.'''
         if len(args) != 1:
             raise cliapp.AppException(
                 'Please pass the name of a RubyGem on the commandline.')
 
-        self.import_package_and_all_dependencies('rubygem', args[0])
+        self.import_package_and_all_dependencies('rubygems', args[0])
 
     def process_dependency_list(self, current_item, deps, to_process,
                                 processed, these_are_build_deps):
@@ -588,7 +588,7 @@ class BaserockImportApplication(cliapp.Application):
 
             build_depends = [
                 format_build_dep(name, version) for name, version in
-                m['x-build-dependencies-rubygem'].iteritems()
+                m['x-build-dependencies-rubygems'].iteritems()
             ]
 
             entry = {
diff --git a/import/rubygem.to_chunk b/import/rubygems.to_chunk
index fdb44273..0c1ed124 100755
--- a/import/rubygem.to_chunk
+++ b/import/rubygems.to_chunk
@@ -49,7 +49,7 @@ Log.level = case ENV['BASEROCK_IMPORT_LOG_LEVEL']
                 end
 
 Log.formatter = proc do |severity, datetime, progname, msg|
-    "rubygem.to_chunk: #{severity}: #{msg}\n"
+    "rubygems.to_chunk: #{severity}: #{msg}\n"
 end
 
 class << Bundler
@@ -69,7 +69,7 @@ class RubyGemChunkMorphologyGenerator
     # No options so far ..
     opts = OptionParser.new
 
-    opts.banner = "Usage: rubygem.import SOURCE_DIR GEM_NAME"
+    opts.banner = "Usage: rubygems.to_chunk SOURCE_DIR GEM_NAME"
     opts.separator ""
     opts.separator "This tool reads the Gemfile and optionally the " +
              "Gemfile.lock from a Ruby project "
@@ -135,7 +135,7 @@ class RubyGemChunkMorphologyGenerator
   end
 
   def generate_chunk_morph_for_gem(spec)
-    description = 'Automatically generated by rubygem.import'
+    description = 'Automatically generated by rubygems.to_chunk'
 
     bin_dir = "\"$DESTDIR/$PREFIX/bin\""
     gem_dir = "\"$DESTDIR/$PREFIX/lib/ruby/gems/#{BASEROCK_RUBY_VERSION}\""
@@ -256,8 +256,8 @@ class RubyGemChunkMorphologyGenerator
     runtime_deps = format_deps_for_morphology(
       resolved_specs, runtime_deps_for_gem(spec))
 
-    morph['x-build-dependencies-rubygem'] = build_deps
-    morph['x-runtime-dependencies-rubygem'] = runtime_deps
+    morph['x-build-dependencies-rubygems'] = build_deps
+    morph['x-runtime-dependencies-rubygems'] = runtime_deps
 
     write_morph(STDOUT, morph)
   end
diff --git a/import/rubygem.to_lorry b/import/rubygems.to_lorry
index f8f646ff..e345461c 100755
--- a/import/rubygem.to_lorry
+++ b/import/rubygems.to_lorry
@@ -132,7 +132,7 @@ class RubyGemLorryGenerator(object):
             project_name: {
                 'type': 'git',
                 'url': gem_source_url,
-                'x-products-rubygem': [gem_name]
+                'x-products-rubygems': [gem_name]
             }
         }