name -> service name in plan

Author: mullermp

gems/smithy/lib/smithy/command.rb

@@ -21,9 +21,9 @@ class Smith < Base
       class_option :quiet, type: :boolean, default: false, desc: 'Suppress all output.'
 
       def self.gem_options!
-        method_option :name, type: :string,
-                             desc: 'The name of the service to generate code for.' \
-                                   'Defaults to the name of the first service shape found in the model.'
+        method_option :service_name, type: :string,
+                                     desc: 'The name of the service to generate code for.' \
+                                           'Defaults to the name of the first service shape found in the model.'
         method_option :module_name, type: :string,
                                     desc: 'The module name to generate, e.g. `Organization::Weather`. ' \
                                           'Defaults to the name of the service.'

gems/smithy/lib/smithy/plan.rb

@@ -6,7 +6,7 @@ class Plan
     # @param [Hash] model The API model as a JSON hash.
     # @param [Symbol] type The type of code to generate, either :client, :server, or :schema.
     # @param [Hash] options
-    # @option options [String] :name The name of the service to generate code for.
+    # @option options [String] :service_name The name of the service to generate code for.
     # @option options [String] :module_name The module name for clients and schemas.
     #  Defaults to the name of the service.
     # @option options [String] :gem_name The gem name for clients and schemas.
@@ -20,8 +20,8 @@ def initialize(model, type, options = {})
       @type = type
       @service = find_service(model['shapes'])
 
-      @name = options.fetch(:name, default_name(@service))
-      @module_name = options.fetch(:module_name, @name)
+      @service_name = options.fetch(:service_name, default_service_name(@service))
+      @module_name = options.fetch(:module_name, @service_name)
       @gem_name = options.fetch(:gem_name, default_gem_name(@module_name, @type))
       @gem_version = options.fetch(:gem_version)
 
@@ -42,7 +42,7 @@ def initialize(model, type, options = {})
     attr_reader :service
 
     # @return [String] The name of the service.
-    attr_reader :name
+    attr_reader :service_name
 
     # @return [String] The module name for clients and schemas.
     attr_reader :module_name
@@ -72,7 +72,7 @@ def find_service(shapes)
       service
     end
 
-    def default_name(service)
+    def default_service_name(service)
       Model::Shape.name(service.keys.first)
     end
 

gems/smithy/spec/smithy/plan_spec.rb

@@ -57,15 +57,15 @@ module Smithy
       end
     end
 
-    describe '#name' do
+    describe '#service_name' do
       it 'defaults to the name of the service' do
-        expect(subject.name).to eq('Weather')
+        expect(subject.service_name).to eq('Weather')
       end
     end
 
     describe '#module_name' do
-      it 'defaults to the name' do
-        expect(subject.module_name).to eq(subject.name)
+      it 'defaults to the service name' do
+        expect(subject.module_name).to eq(subject.service_name)
       end
     end