ruby-terraform 0.65.0.pre.5 → 0.65.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc71a524e8870cabf47b5d3d88f474119bb38ed849afc036af51f95475335c37
-  data.tar.gz: 11bf8ae65abe06ff4e0cec9f347a82f613976cbd7378c62fc22fb97d336e05f4
+  metadata.gz: c5cfd39cb3e8dbe09c0589280ac5b3879e913a9588574420bb285d89a8507217
+  data.tar.gz: 0e87b3b820aff40c28c38073735c4da17c14f95081b6a57f861df034a326bfa1
 SHA512:
-  metadata.gz: a6cd2f1ac3bc0b91d270925ddea294c6c30fe3385061437467fc78c1964bea141ac410212f0358a091e483898bf2d06a4b27931783c444e5176bb184b5ede8c9
-  data.tar.gz: 8a863584cdf4d4bc90ebe62cb289b893fd6082f704f828ab00ba21b67228841ceb774b7d16a03332feebcdd4174364a340124b2796ca6e5acc2b2383050a2b83
+  metadata.gz: 86d696b30097ac1248ae4f421c591307bad5002ce91fb0352e30334d1c5861ec8abd43c734e6fb1eb0c6efefb07d7f9b09706684bd97b616a6f556e2e6fb9064
+  data.tar.gz: c55bd0a0a10da6bf852b097c17e11890c26ddbeb123edff321a31d5c89fa09404145299c69cda3b403979a0f88d6eca7d9ebf676b5e570933cd4e14f63b36483

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.5)
-      lino (>= 1.5)
+    ruby-terraform (0.65.0.pre.6)
+      lino (>= 2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -50,7 +50,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    lino (1.9.0)
+    lino (2.3.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
     listen (3.5.1)
@@ -101,7 +101,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -115,7 +115,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.12.0)
+    rubocop (1.12.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)

data/lib/ruby_terraform/commands/apply.rb

@@ -4,7 +4,7 @@ module RubyTerraform
   module Commands
     class Apply < Base
       def sub_commands(_values)
-        'apply'
+        %w[apply]
       end
 
       def switches
@@ -13,7 +13,7 @@ module RubyTerraform
       end
 
       def arguments(values)
-        values[:plan] || values[:directory]
+        [values[:plan] || values[:directory]]
       end
 
       def option_default_values(_opts)

data/lib/ruby_terraform/commands/base.rb

@@ -1,6 +1,7 @@
+require 'lino'
+
 require_relative '../errors'
-require_relative '../command_line/builder'
-require_relative '../command_line/options_factory'
+require_relative '../options/factory'
 
 module RubyTerraform
   module Commands
@@ -54,17 +55,21 @@ module RubyTerraform
 
       def build_command(opts)
         values = apply_option_defaults_and_overrides(opts)
-        RubyTerraform::CommandLine::Builder.new(
-          binary: @binary,
-          sub_commands: sub_commands(values),
-          options: options(values),
-          arguments: arguments(values)
-        ).build
+
+        Lino::CommandLineBuilder
+          .for_command(@binary)
+          .with_options_after_subcommands
+          .with_option_separator('=')
+          .with_appliables(options(values))
+          .with_subcommands(sub_commands(values))
+          .with_arguments(arguments(values))
+          .build
       end
 
       def apply_option_defaults_and_overrides(opts)
-        option_default_values(opts).merge(opts)
-                                   .merge(option_override_values(opts))
+        option_default_values(opts)
+          .merge(opts)
+          .merge(option_override_values(opts))
       end
 
       def option_default_values(_values)
@@ -80,7 +85,7 @@ module RubyTerraform
       end
 
       def options(values)
-        RubyTerraform::CommandLine::OptionsFactory.from(values, switches)
+        RubyTerraform::Options::Factory.from(values, switches)
       end
 
       def switches

data/lib/ruby_terraform/commands/destroy.rb

@@ -8,11 +8,11 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'destroy'
+        %w[destroy]
       end
 
       def arguments(values)
-        values[:directory]
+        [values[:directory]]
       end
 
       def option_default_values(_opts)

data/lib/ruby_terraform/commands/format.rb

@@ -8,11 +8,11 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'fmt'
+        %w[fmt]
       end
 
       def arguments(values)
-        values[:directory]
+        [values[:directory]]
       end
     end
   end

data/lib/ruby_terraform/commands/get.rb

@@ -8,11 +8,11 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'get'
+        %w[get]
       end
 
       def arguments(values)
-        values[:directory]
+        [values[:directory]]
       end
     end
   end

data/lib/ruby_terraform/commands/import.rb

@@ -8,7 +8,7 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'import'
+        %w[import]
       end
 
       def arguments(values)

data/lib/ruby_terraform/commands/init.rb

@@ -9,11 +9,11 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'init'
+        %w[init]
       end
 
       def arguments(values)
-        values[:path]
+        [values[:path]]
       end
 
       def option_default_values(_opts)

data/lib/ruby_terraform/commands/output.rb

@@ -15,11 +15,11 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'output'
+        %w[output]
       end
 
       def arguments(values)
-        values[:name]
+        [values[:name]]
       end
 
       def do_after(opts)

data/lib/ruby_terraform/commands/plan.rb

@@ -8,15 +8,15 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'plan'
+        %w[plan]
       end
 
-      def option_default_values(_opts)
-        { vars: {}, var_files: [], targets: [] }
+      def arguments(values)
+        [values[:directory]]
       end
 
-      def arguments(values)
-        values[:directory]
+      def option_default_values(_opts)
+        { vars: {}, var_files: [], targets: [] }
       end
     end
   end

data/lib/ruby_terraform/commands/refresh.rb

@@ -4,15 +4,15 @@ module RubyTerraform
   module Commands
     class Refresh < Base
       def switches
-        %w[-input -no-color -state -target -var -var-file] + super
+        %w[-input -no-color -state -target -var -var-file]
       end
 
       def sub_commands(_values)
-        'refresh'
+        %w[refresh]
       end
 
       def arguments(values)
-        values[:directory]
+        [values[:directory]]
       end
 
       def option_default_values(_opts)

data/lib/ruby_terraform/commands/show.rb

@@ -4,15 +4,15 @@ module RubyTerraform
   module Commands
     class Show < Base
       def switches
-        %w[-json -no-color -module-depth] + super
+        %w[-json -no-color -module-depth]
       end
 
       def sub_commands(_values)
-        'show'
+        %w[show]
       end
 
       def arguments(values)
-        values[:path] || values[:directory]
+        [values[:path] || values[:directory]]
       end
     end
   end

data/lib/ruby_terraform/commands/validate.rb

@@ -8,11 +8,11 @@ module RubyTerraform
       end
 
       def sub_commands(_values)
-        'validate'
+        %w[validate]
       end
 
       def arguments(values)
-        values[:directory]
+        [values[:directory]]
       end
 
       def option_default_values(_opts)

data/lib/ruby_terraform/commands/workspace.rb

@@ -13,7 +13,7 @@ module RubyTerraform
       end
 
       def arguments(values)
-        values[:directory]
+        [values[:directory]]
       end
 
       def option_default_values(_opts)

data/lib/ruby_terraform/options/base.rb

@@ -0,0 +1,22 @@
+module RubyTerraform
+  module Options
+    class Base
+      def initialize(switch, value)
+        @switch = switch
+        coerce_value(value)
+      end
+
+      def apply(_builder)
+        raise 'not implemented'
+      end
+
+      private
+
+      attr_reader :switch, :value
+
+      def coerce_value(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/boolean.rb

@@ -0,0 +1,14 @@
+require_relative 'base'
+require_relative 'values/boolean'
+
+module RubyTerraform
+  module Options
+    class Boolean < Base
+      include Values::Boolean
+
+      def apply(builder)
+        builder.with_option(switch, value)
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/factory.rb

@@ -0,0 +1,116 @@
+require_relative 'switch'
+require_relative 'boolean'
+require_relative 'flag'
+require_relative 'standard'
+
+module RubyTerraform
+  module Options
+    class Factory
+      PLURAL_SWITCHES =
+        Set.new(
+          %w[
+              -var
+              -target
+              -var-file
+            ]
+        ).freeze
+
+      BOOLEAN_SWITCHES =
+        Set.new(
+          %w[
+              -auto-approve
+              -backend
+              -get
+              -get-plugins
+              -input
+              -list
+              -lock
+              -refresh
+              -upgrade
+              -verify-plugins
+              -write
+            ]
+        ).freeze
+
+      FLAG_SWITCHES =
+        Set.new(
+          %w[
+              -allow-missing
+              -allow-missing-config
+              -check
+              -compact-warnings
+              -destroy
+              -detailed-exitcode
+              -diff
+              -draw-cycles
+              -force
+              -force-copy
+              -ignore-remote-version
+              -json
+              -no-color
+              -raw
+              -reconfigure
+              -recursive
+              -update
+            ]
+        ).freeze
+
+      OVERRIDE_SWITCHES =
+        {
+          config: :directory,
+          out: :plan
+        }.freeze
+
+      def self.from(values, switches)
+        new(values, switches).from
+      end
+
+      private_class_method :new
+
+      def initialize(values, switches)
+        @switches = switches.map { |switch| Switch.new(switch) }
+        @values = values
+      end
+
+      def from
+        switches.each_with_object([]) do |switch, options|
+          options.append(*options_from_switch(switch))
+        end
+      end
+
+      private
+
+      attr_reader :switches, :values
+
+      def options_from_switch(switch)
+        return plural_options(switch) if PLURAL_SWITCHES.include?(switch)
+        return boolean_option(switch) if BOOLEAN_SWITCHES.include?(switch)
+        return flag_option(switch) if FLAG_SWITCHES.include?(switch)
+        return override_option(switch) if OVERRIDE_SWITCHES.key?(switch.as_key)
+
+        standard_option(switch, switch.as_key)
+      end
+
+      def boolean_option(switch)
+        [Boolean.new(switch.to_s, values[switch.as_key])]
+      end
+
+      def flag_option(switch)
+        [Flag.new(switch.to_s, values[switch.as_key])]
+      end
+
+      def standard_option(switch, hash_key)
+        [Standard.new(switch.to_s, values[hash_key])]
+      end
+
+      def override_option(switch)
+        standard_option(switch, OVERRIDE_SWITCHES[switch.as_key])
+      end
+
+      def plural_options(switch)
+        standard_option(switch.to_s, switch.as_key) +
+          standard_option(switch.to_s, switch.as_plural_key)
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/flag.rb

@@ -0,0 +1,14 @@
+require_relative 'base'
+require_relative 'values/boolean'
+
+module RubyTerraform
+  module Options
+    class Flag < Base
+      include Values::Boolean
+
+      def apply(builder)
+        value ? builder.with_flag(switch) : builder
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/standard.rb

@@ -0,0 +1,39 @@
+require 'json'
+
+require_relative 'base'
+
+module RubyTerraform
+  module Options
+    class Standard < Base
+      def apply(builder)
+        if value.respond_to?(:keys)
+          apply_hash(builder)
+        elsif value.respond_to?(:each)
+          apply_array(builder)
+        else
+          builder.with_option(switch, value)
+        end
+      end
+
+      private
+
+      def apply_hash(builder)
+        builder.with_repeated_option(
+          switch,
+          value.map do |hash_key, hash_value|
+            "'#{hash_key}=#{as_string(hash_value)}'"
+          end,
+          separator: ' '
+        )
+      end
+
+      def apply_array(builder)
+        builder.with_repeated_option(switch, value)
+      end
+
+      def as_string(value)
+        value.is_a?(String) ? value : JSON.generate(value)
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/switch.rb

@@ -0,0 +1,41 @@
+module RubyTerraform
+  module Options
+    class Switch
+      def initialize(switch)
+        @switch_without_prefix = switch[0] == '-' ? switch[1..] : switch
+      end
+
+      def to_s
+        "-#{switch_without_prefix}"
+      end
+
+      def as_key
+        snake_case.to_sym
+      end
+
+      def as_plural_key
+        "#{snake_case}s".to_sym
+      end
+
+      def ==(other)
+        to_s == other
+      end
+
+      def eql?(other)
+        to_s == other
+      end
+
+      def hash
+        to_s.hash
+      end
+
+      private
+
+      attr_reader :switch_without_prefix
+
+      def snake_case
+        switch_without_prefix.gsub('-', '_')
+      end
+    end
+  end
+end

data/lib/ruby_terraform/{command_line/option/boolean_value.rb → options/values/boolean.rb}

@@ -1,14 +1,14 @@
 module RubyTerraform
-  module CommandLine
-    module Option
-      module BooleanValue
+  module Options
+    module Values
+      module Boolean
         def coerce_value(value)
-          @value = boolean_val(value)
+          @value = to_boolean(value)
         end
 
         private
 
-        def boolean_val(value)
+        def to_boolean(value)
           return nil if value.nil?
           return value if a_boolean?(value)
           return true if true_as_string?(value)

data/lib/ruby_terraform/output.rb

@@ -17,6 +17,7 @@ module RubyTerraform
         configuration_directory = File.join(work_directory, source_directory)
         FileUtils.mkdir_p File.dirname(configuration_directory)
         FileUtils.cp_r source_directory, configuration_directory
+
         configuration_directory
       end
     end

data/lib/ruby_terraform/version.rb

@@ -1,3 +1,3 @@
 module RubyTerraform
-  VERSION = '0.65.0.pre.5'.freeze
+  VERSION = '0.65.0.pre.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.65.0.pre.5
+  version: 0.65.0.pre.6
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -238,14 +238,6 @@ files:
 - bin/setup
 - lib/ruby-terraform.rb
 - lib/ruby_terraform.rb
-- lib/ruby_terraform/command_line/builder.rb
-- lib/ruby_terraform/command_line/option/base.rb
-- lib/ruby_terraform/command_line/option/boolean.rb
-- lib/ruby_terraform/command_line/option/boolean_value.rb
-- lib/ruby_terraform/command_line/option/flag.rb
-- lib/ruby_terraform/command_line/option/standard.rb
-- lib/ruby_terraform/command_line/option/switch.rb
-- lib/ruby_terraform/command_line/options_factory.rb
 - lib/ruby_terraform/commands.rb
 - lib/ruby_terraform/commands/apply.rb
 - lib/ruby_terraform/commands/base.rb
@@ -264,6 +256,13 @@ files:
 - lib/ruby_terraform/commands/workspace.rb
 - lib/ruby_terraform/errors.rb
 - lib/ruby_terraform/errors/execution_error.rb
+- lib/ruby_terraform/options/base.rb
+- lib/ruby_terraform/options/boolean.rb
+- lib/ruby_terraform/options/factory.rb
+- lib/ruby_terraform/options/flag.rb
+- lib/ruby_terraform/options/standard.rb
+- lib/ruby_terraform/options/switch.rb
+- lib/ruby_terraform/options/values/boolean.rb
 - lib/ruby_terraform/output.rb
 - lib/ruby_terraform/version.rb
 homepage: https://github.com/infrablocks/ruby_terraform

data/lib/ruby_terraform/command_line/builder.rb

@@ -1,55 +0,0 @@
-require 'lino'
-
-module RubyTerraform
-  module CommandLine
-    class Builder
-      def initialize(binary:, sub_commands:, options:, arguments:)
-        @builder = instantiate_builder(binary)
-        @sub_commands = array_of(sub_commands)
-        @options = array_of(options)
-        @arguments = array_of(arguments)
-      end
-
-      def build
-        configure_builder
-        builder.build
-      end
-
-      private
-
-      attr_reader :builder, :sub_commands, :options, :arguments
-
-      def configure_builder
-        add_subcommands_and_options
-        add_arguments
-      end
-
-      def add_subcommands_and_options
-        sub_commands[0...-1].each do |command|
-          @builder = builder.with_subcommand(command)
-        end
-        @builder = builder.with_subcommand(sub_commands.last) do |sub|
-          options.inject(sub) do |sub_command, option|
-            option.add_to_subcommand(sub_command)
-          end
-        end
-      end
-
-      def add_arguments
-        @builder = builder.with_arguments(arguments)
-      end
-
-      def instantiate_builder(binary)
-        Lino::CommandLineBuilder
-          .for_command(binary)
-          .with_option_separator('=')
-      end
-
-      def array_of(value)
-        return value if value.respond_to?(:each)
-
-        value.nil? ? [] : [value]
-      end
-    end
-  end
-end

data/lib/ruby_terraform/command_line/option/base.rb

@@ -1,24 +0,0 @@
-module RubyTerraform
-  module CommandLine
-    module Option
-      class Base
-        def initialize(switch, value)
-          @switch = switch
-          coerce_value(value)
-        end
-
-        def add_to_subcommand(_sub)
-          raise 'not implemented'
-        end
-
-        private
-
-        attr_reader :switch, :value
-
-        def coerce_value(value)
-          @value = value
-        end
-      end
-    end
-  end
-end

data/lib/ruby_terraform/command_line/option/boolean.rb

@@ -1,16 +0,0 @@
-require_relative 'boolean_value'
-require_relative 'base'
-
-module RubyTerraform
-  module CommandLine
-    module Option
-      class Boolean < Base
-        include BooleanValue
-
-        def add_to_subcommand(sub)
-          sub.with_option(switch, value)
-        end
-      end
-    end
-  end
-end

data/lib/ruby_terraform/command_line/option/flag.rb

@@ -1,16 +0,0 @@
-require_relative 'boolean_value'
-require_relative 'base'
-
-module RubyTerraform
-  module CommandLine
-    module Option
-      class Flag < Base
-        include BooleanValue
-
-        def add_to_subcommand(sub)
-          value ? sub.with_flag(switch) : sub
-        end
-      end
-    end
-  end
-end

data/lib/ruby_terraform/command_line/option/standard.rb

@@ -1,40 +0,0 @@
-require 'json'
-require_relative 'base'
-
-module RubyTerraform
-  module CommandLine
-    module Option
-      class Standard < Base
-        def add_to_subcommand(sub)
-          if value.respond_to?(:keys)
-            add_hash_to_subcommand(sub)
-          elsif value.respond_to?(:each)
-            add_array_to_subcommand(sub)
-          else
-            sub.with_option(switch, value)
-          end
-        end
-
-        private
-
-        def add_hash_to_subcommand(sub)
-          sub.with_repeated_option(
-            switch,
-            value.map do |hash_key, hash_value|
-              "'#{hash_key}=#{as_string(hash_value)}'"
-            end,
-            separator: ' '
-          )
-        end
-
-        def add_array_to_subcommand(sub)
-          sub.with_repeated_option(switch, value)
-        end
-
-        def as_string(value)
-          value.is_a?(String) ? value : JSON.generate(value)
-        end
-      end
-    end
-  end
-end

data/lib/ruby_terraform/command_line/option/switch.rb

@@ -1,43 +0,0 @@
-module RubyTerraform
-  module CommandLine
-    module Option
-      class Switch
-        def initialize(switch)
-          @switch_without_prefix = switch[0] == '-' ? switch[1..] : switch
-        end
-
-        def to_s
-          "-#{switch_without_prefix}"
-        end
-
-        def as_key
-          snake_case.to_sym
-        end
-
-        def as_plural_key
-          "#{snake_case}s".to_sym
-        end
-
-        def ==(other)
-          to_s == other
-        end
-
-        def eql?(other)
-          to_s == other
-        end
-
-        def hash
-          to_s.hash
-        end
-
-        private
-
-        attr_reader :switch_without_prefix
-
-        def snake_case
-          switch_without_prefix.gsub('-', '_')
-        end
-      end
-    end
-  end
-end

data/lib/ruby_terraform/command_line/options_factory.rb

@@ -1,79 +0,0 @@
-require_relative 'option/standard'
-require_relative 'option/flag'
-require_relative 'option/boolean'
-require_relative 'option/switch'
-
-module RubyTerraform
-  module CommandLine
-    class OptionsFactory
-      PLURAL_SWITCHES = Set.new(
-        %w[-var -target -var-file]
-      ).freeze
-      BOOLEAN_SWITCHES = Set.new(
-        %w[-auto-approve -backend -get -get-plugins -input -list -lock
-           -refresh -upgrade -verify-plugins -write]
-      ).freeze
-      FLAG_SWITCHES = Set.new(
-        %w[-allow-missing -allow-missing-config -check -compact-warnings
-           -destroy -detailed-exitcode -diff -draw-cycles -force -force-copy
-           -ignore-remote-version -json -no-color -raw -reconfigure -recursive
-           -update]
-      ).freeze
-      OVERRIDE_SWITCHES = {
-        config: :directory,
-        out: :plan
-      }.freeze
-
-      def self.from(values, switches)
-        new(values, switches).from
-      end
-
-      private_class_method :new
-
-      def initialize(values, switches)
-        @switches = switches.map { |switch| Option::Switch.new(switch) }
-        @values = values
-      end
-
-      def from
-        switches.each_with_object([]) do |switch, options|
-          options.append(*options_from_switch(switch))
-        end
-      end
-
-      private
-
-      attr_reader :switches, :values
-
-      def options_from_switch(switch)
-        return plural_options(switch) if PLURAL_SWITCHES.include?(switch)
-        return boolean_option(switch) if BOOLEAN_SWITCHES.include?(switch)
-        return flag_option(switch) if FLAG_SWITCHES.include?(switch)
-        return override_option(switch) if OVERRIDE_SWITCHES.key?(switch.as_key)
-
-        standard_option(switch, switch.as_key)
-      end
-
-      def boolean_option(switch)
-        [Option::Boolean.new(switch.to_s, values[switch.as_key])]
-      end
-
-      def flag_option(switch)
-        [Option::Flag.new(switch.to_s, values[switch.as_key])]
-      end
-
-      def standard_option(switch, hash_key)
-        [Option::Standard.new(switch.to_s, values[hash_key])]
-      end
-
-      def override_option(switch)
-        standard_option(switch, OVERRIDE_SWITCHES[switch.as_key])
-      end
-
-      def plural_options(switch)
-        standard_option(switch.to_s, switch.as_key) +
-          standard_option(switch.to_s, switch.as_plural_key)
-      end
-    end
-  end
-end