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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f188a94d3b8b59c9a65a87d151a239bc96c3b3c7612718991d84ee482eede4
-  data.tar.gz: dfdb9d0fac5a258cd823a441c8b70fbf05715129c6d4bd32ddeb128d5447f1e8
+  metadata.gz: fc71a524e8870cabf47b5d3d88f474119bb38ed849afc036af51f95475335c37
+  data.tar.gz: 11bf8ae65abe06ff4e0cec9f347a82f613976cbd7378c62fc22fb97d336e05f4
 SHA512:
-  metadata.gz: d0bd171c22777b63821ba3bab4d2a4d600e2fd3352c92c8c31e7758dd8732a7d89c060459012f4d63361373cce9e1d0ff0ab7092c6d2710fa52287790289c262
-  data.tar.gz: bfbd26e7b628847187de85f8ef2753d2f84ebeaaad739f1c9b129a4db1f201bc09fb7c854d8b338a48df0d7288188a3ea510bb124abe5366cbb311671d538b9a
+  metadata.gz: a6cd2f1ac3bc0b91d270925ddea294c6c30fe3385061437467fc78c1964bea141ac410212f0358a091e483898bf2d06a4b27931783c444e5176bb184b5ede8c9
+  data.tar.gz: 8a863584cdf4d4bc90ebe62cb289b893fd6082f704f828ab00ba21b67228841ceb774b7d16a03332feebcdd4174364a340124b2796ca6e5acc2b2383050a2b83

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.4)
+    ruby-terraform (0.65.0.pre.5)
       lino (>= 1.5)
 
 GEM

data/lib/ruby_terraform/command_line/builder.rb

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,16 @@
+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/boolean_value.rb

@@ -0,0 +1,29 @@
+module RubyTerraform
+  module CommandLine
+    module Option
+      module BooleanValue
+        def coerce_value(value)
+          @value = boolean_val(value)
+        end
+
+        private
+
+        def boolean_val(value)
+          return nil if value.nil?
+          return value if a_boolean?(value)
+          return true if true_as_string?(value)
+
+          false
+        end
+
+        def a_boolean?(value)
+          value.is_a?(TrueClass) || value.is_a?(FalseClass)
+        end
+
+        def true_as_string?(value)
+          value.respond_to?(:downcase) && value.downcase == 'true'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,79 @@
+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

data/lib/ruby_terraform/commands/apply.rb

@@ -1,49 +1,27 @@
-require 'json'
 require_relative 'base'
 
 module RubyTerraform
   module Commands
     class Apply < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory]
-        plan = opts[:plan]
-        vars = opts[:vars] || {}
-        var_file = opts[:var_file]
-        var_files = opts[:var_files] || []
-        target = opts[:target]
-        targets = opts[:targets] || []
-        state = opts[:state]
-        input = opts[:input]
-        auto_approve = opts[:auto_approve]
-        no_backup = opts[:no_backup]
-        backup = no_backup ? '-' : opts[:backup]
-        no_color = opts[:no_color]
+      def sub_commands(_values)
+        'apply'
+      end
+
+      def switches
+        %w[-backup -lock -lock-timeout -input -auto-approve -no-color -state
+           -target -var -var-file]
+      end
+
+      def arguments(values)
+        values[:plan] || values[:directory]
+      end
+
+      def option_default_values(_opts)
+        { vars: {}, var_files: [], targets: [] }
+      end
 
-        builder
-          .with_subcommand('apply') do |sub|
-          vars.each do |key, value|
-            var_value = value.is_a?(String) ? value : JSON.generate(value)
-            sub = sub.with_option(
-              '-var', "'#{key}=#{var_value}'", separator: ' '
-            )
-          end
-          sub = sub.with_option('-var-file', var_file) if var_file
-          var_files.each do |file|
-            sub = sub.with_option('-var-file', file)
-          end
-          sub = sub.with_option('-target', target) if target
-          targets.each do |file|
-            sub = sub.with_option('-target', file)
-          end
-          sub = sub.with_option('-state', state) if state
-          sub = sub.with_option('-input', input) if input
-          sub = sub.with_option('-auto-approve', auto_approve) unless
-              auto_approve.nil?
-          sub = sub.with_option('-backup', backup) if backup
-          sub = sub.with_flag('-no-color') if no_color
-          sub
-        end
-          .with_argument(plan || directory)
+      def option_override_values(opts)
+        { backup: opts[:no_backup] ? '-' : opts[:backup] }
       end
     end
   end

data/lib/ruby_terraform/commands/base.rb

@@ -1,5 +1,6 @@
-require 'lino'
 require_relative '../errors'
+require_relative '../command_line/builder'
+require_relative '../command_line/options_factory'
 
 module RubyTerraform
   module Commands
@@ -12,20 +13,12 @@ module RubyTerraform
         @stdin = stdin || RubyTerraform.configuration.stdin
         @stdout = stdout || RubyTerraform.configuration.stdout
         @stderr = stderr || RubyTerraform.configuration.stderr
+        initialize_command
       end
 
       def execute(opts = {})
-        builder = instantiate_builder
-
         do_before(opts)
-        command = configure_command(builder, opts).build
-        logger.debug("Running '#{command}'.")
-
-        command.execute(
-          stdin: stdin,
-          stdout: stdout,
-          stderr: stderr
-        )
+        build_and_execute_command(opts)
         do_after(opts)
       rescue Open4::SpawnError
         message = "Failed while running '#{command_name}'."
@@ -37,21 +30,66 @@ module RubyTerraform
 
       attr_reader :binary, :logger, :stdin, :stdout, :stderr
 
+      def build_and_execute_command(opts)
+        command = build_command(opts)
+        logger.debug("Running '#{command}'.")
+        command.execute(
+          stdin: stdin,
+          stdout: stdout,
+          stderr: stderr
+        )
+      end
+
       def command_name
         self.class.to_s.split('::')[-1].downcase
       end
 
-      def instantiate_builder
-        Lino::CommandLineBuilder
-          .for_command(binary)
-          .with_option_separator('=')
+      def do_before(_opts); end
+
+      def do_after(_opts); end
+
+      private
+
+      def initialize_command; end
+
+      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
       end
 
-      def do_before(opts); end
+      def apply_option_defaults_and_overrides(opts)
+        option_default_values(opts).merge(opts)
+                                   .merge(option_override_values(opts))
+      end
+
+      def option_default_values(_values)
+        {}
+      end
 
-      def configure_command(builder, opts); end
+      def option_override_values(_values)
+        {}
+      end
 
-      def do_after(opts); end
+      def sub_commands(_values)
+        []
+      end
+
+      def options(values)
+        RubyTerraform::CommandLine::OptionsFactory.from(values, switches)
+      end
+
+      def switches
+        []
+      end
+
+      def arguments(_values)
+        []
+      end
     end
   end
 end

data/lib/ruby_terraform/commands/destroy.rb

@@ -3,45 +3,24 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Destroy < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory]
-        vars = opts[:vars] || {}
-        var_file = opts[:var_file]
-        var_files = opts[:var_files] || []
-        target = opts[:target]
-        targets = opts[:targets] || []
-        state = opts[:state]
-        force = opts[:force]
-        no_backup = opts[:no_backup]
-        backup = no_backup ? '-' : opts[:backup]
-        no_color = opts[:no_color]
-        auto_approve = opts[:auto_approve]
+      def switches
+        %w[-backup -auto-approve -force -no-color -state -target -var -var-file]
+      end
+
+      def sub_commands(_values)
+        'destroy'
+      end
+
+      def arguments(values)
+        values[:directory]
+      end
+
+      def option_default_values(_opts)
+        { vars: {}, var_files: [], targets: [] }
+      end
 
-        builder
-          .with_subcommand('destroy') do |sub|
-          vars.each do |key, value|
-            var_value = value.is_a?(String) ? value : JSON.generate(value)
-            sub = sub.with_option(
-              '-var', "'#{key}=#{var_value}'", separator: ' '
-            )
-          end
-          sub = sub.with_option('-var-file', var_file) if var_file
-          var_files.each do |file|
-            sub = sub.with_option('-var-file', file)
-          end
-          sub = sub.with_option('-target', target) if target
-          targets.each do |target_name|
-            sub = sub.with_option('-target', target_name)
-          end
-          sub = sub.with_option('-state', state) if state
-          sub = sub.with_option('-auto-approve', auto_approve) unless
-              auto_approve.nil?
-          sub = sub.with_option('-backup', backup) if backup
-          sub = sub.with_flag('-no-color') if no_color
-          sub = sub.with_flag('-force') if force
-          sub
-        end
-          .with_argument(directory)
+      def option_override_values(opts)
+        { backup: opts[:no_backup] ? '-' : opts[:backup] }
       end
     end
   end

data/lib/ruby_terraform/commands/format.rb

@@ -1,29 +1,18 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module RubyTerraform
   module Commands
     class Format < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory]
-        check = opts[:check]
-        diff = opts[:diff]
-        list = opts[:list]
-        no_color = opts[:no_color]
-        recursive = opts[:recursive]
-        write = opts[:write]
+      def switches
+        %w[-list -write -diff -check -recursive -no-color]
+      end
 
-        builder.with_subcommand('fmt') do |sub|
-          sub = sub.with_option('-list', list) if list
-          sub = sub.with_option('-write', write) if write
+      def sub_commands(_values)
+        'fmt'
+      end
 
-          sub = sub.with_flag('-check') if check
-          sub = sub.with_flag('-diff') if diff
-          sub = sub.with_flag('-no-color') if no_color
-          sub = sub.with_flag('-recursive') if recursive
-          sub
-        end.with_argument(directory)
+      def arguments(values)
+        values[:directory]
       end
     end
   end

data/lib/ruby_terraform/commands/get.rb

@@ -3,14 +3,16 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Get < Base
-      def configure_command(builder, opts)
-        builder
-          .with_subcommand('get') do |sub|
-          sub = sub.with_option('-update', true) if opts[:update]
-          sub = sub.with_flag('-no-color') if opts[:no_color]
-          sub
-        end
-          .with_argument(opts[:directory])
+      def switches
+        %w[-update -no-color]
+      end
+
+      def sub_commands(_values)
+        'get'
+      end
+
+      def arguments(values)
+        values[:directory]
       end
     end
   end

data/lib/ruby_terraform/commands/import.rb

@@ -1,45 +1,26 @@
-# frozen_string_literal: true
-
-require 'json'
 require_relative 'base'
 
 module RubyTerraform
   module Commands
     class Import < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory]
-        vars = opts[:vars] || {}
-        var_file = opts[:var_file]
-        var_files = opts[:var_files] || []
-        no_color = opts[:no_color]
-        no_backup = opts[:no_backup]
-        backup = no_backup ? '-' : opts[:backup]
-        state = opts[:state]
-        input = opts[:input]
-        address = opts[:address]
-        id = opts[:id]
+      def switches
+        %w[-config -backup -input -no-color -state -var -var-file]
+      end
+
+      def sub_commands(_values)
+        'import'
+      end
+
+      def arguments(values)
+        [values[:address], values[:id]]
+      end
+
+      def option_default_values(_opts)
+        { vars: {}, var_files: [] }
+      end
 
-        builder
-          .with_subcommand('import') do |sub|
-            sub = sub.with_option('-config', directory)
-            vars.each do |key, value|
-              var_value = value.is_a?(String) ? value : JSON.generate(value)
-              sub = sub.with_option(
-                '-var', "'#{key}=#{var_value}'", separator: ' '
-              )
-            end
-            sub = sub.with_option('-var-file', var_file) if var_file
-            var_files.each do |file|
-              sub = sub.with_option('-var-file', file)
-            end
-            sub = sub.with_option('-state', state) if state
-            sub = sub.with_option('-input', input) if input
-            sub = sub.with_option('-backup', backup) if backup
-            sub = sub.with_flag('-no-color') if no_color
-            sub
-          end
-          .with_argument(address)
-          .with_argument(id)
+      def option_override_values(opts)
+        { backup: opts[:no_backup] ? '-' : opts[:backup] }
       end
     end
   end

data/lib/ruby_terraform/commands/init.rb

@@ -3,43 +3,21 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Init < Base
-      def configure_command(builder, opts)
-        no_color = opts[:no_color]
-        backend = opts[:backend]
-        get = opts[:get]
-        backend_config = opts[:backend_config] || {}
-        source = opts[:from_module]
-        path = opts[:path]
-        plugin_dir = opts[:plugin_dir]
-        force_copy = opts[:force_copy]
+      def switches
+        %w[-backend -backend-config -from-module -get -no-color -plugin-dir
+           -force-copy]
+      end
 
-        builder = builder
-                  .with_subcommand('init') do |sub|
-          sub = sub.with_option('-backend', backend) unless backend.nil?
-          unless force_copy.nil?
-            sub = sub.with_option('-force-copy',
-                                  force_copy)
-          end
-          sub = sub.with_option('-get', get) unless get.nil?
-          sub = sub.with_option('-from-module', source) if source
-          sub = sub.with_flag('-no-color') if no_color
-          unless plugin_dir.nil?
-            sub = sub.with_option('-plugin-dir',
-                                  plugin_dir)
-          end
-          backend_config.each do |key, value|
-            sub = sub.with_option(
-              '-backend-config',
-              "'#{key}=#{value}'",
-              separator: ' '
-            )
-          end
-          sub
-        end
+      def sub_commands(_values)
+        'init'
+      end
 
-        builder = builder.with_argument(path) if path
+      def arguments(values)
+        values[:path]
+      end
 
-        builder
+      def option_default_values(_opts)
+        { backend_config: {} }
       end
     end
   end

data/lib/ruby_terraform/commands/output.rb

@@ -4,29 +4,22 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Output < Base
-      def initialize(**kwargs)
-        super(**kwargs)
-        @stdout = StringIO.new unless
-            defined?(@stdout) && @stdout.respond_to?(:string)
+      def initialize_command
+        return if defined?(@stdout) && @stdout.respond_to?(:string)
+
+        @stdout = StringIO.new
+      end
+
+      def switches
+        %w[-json -raw -no-color -state -module]
       end
 
-      def configure_command(builder, opts)
-        name = opts[:name]
-        state = opts[:state]
-        no_color = opts[:no_color]
-        json = opts[:json]
-        mod = opts[:module]
+      def sub_commands(_values)
+        'output'
+      end
 
-        builder = builder
-                  .with_subcommand('output') do |sub|
-          sub = sub.with_flag('-no-color') if no_color
-          sub = sub.with_flag('-json') if json
-          sub = sub.with_option('-state', state) if state
-          sub = sub.with_option('-module', mod) if mod
-          sub
-        end
-        builder = builder.with_argument(name) if name
-        builder
+      def arguments(values)
+        values[:name]
       end
 
       def do_after(opts)

data/lib/ruby_terraform/commands/plan.rb

@@ -1,46 +1,22 @@
-require 'json'
 require_relative 'base'
 
 module RubyTerraform
   module Commands
     class Plan < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory]
-        vars = opts[:vars] || {}
-        var_file = opts[:var_file]
-        var_files = opts[:var_files] || []
-        target = opts[:target]
-        targets = opts[:targets] || []
-        state = opts[:state]
-        plan = opts[:plan]
-        input = opts[:input]
-        destroy = opts[:destroy]
-        no_color = opts[:no_color]
+      def switches
+        %w[-destroy -input -no-color -out -state -target -var -var-file]
+      end
+
+      def sub_commands(_values)
+        'plan'
+      end
+
+      def option_default_values(_opts)
+        { vars: {}, var_files: [], targets: [] }
+      end
 
-        builder
-          .with_subcommand('plan') do |sub|
-          vars.each do |key, value|
-            var_value = value.is_a?(String) ? value : JSON.generate(value)
-            sub = sub.with_option(
-              '-var', "'#{key}=#{var_value}'", separator: ' '
-            )
-          end
-          sub = sub.with_option('-var-file', var_file) if var_file
-          var_files.each do |file|
-            sub = sub.with_option('-var-file', file)
-          end
-          sub = sub.with_option('-target', target) if target
-          targets.each do |file|
-            sub = sub.with_option('-target', file)
-          end
-          sub = sub.with_option('-state', state) if state
-          sub = sub.with_option('-out', plan) if plan
-          sub = sub.with_option('-input', input) if input
-          sub = sub.with_flag('-destroy') if destroy
-          sub = sub.with_flag('-no-color') if no_color
-          sub
-        end
-          .with_argument(directory)
+      def arguments(values)
+        values[:directory]
       end
     end
   end

data/lib/ruby_terraform/commands/refresh.rb

@@ -1,42 +1,22 @@
-require 'json'
 require_relative 'base'
 
 module RubyTerraform
   module Commands
     class Refresh < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory]
-        vars = opts[:vars] || {}
-        var_file = opts[:var_file]
-        var_files = opts[:var_files] || []
-        state = opts[:state]
-        input = opts[:input]
-        target = opts[:target]
-        targets = opts[:targets] || []
-        no_color = opts[:no_color]
+      def switches
+        %w[-input -no-color -state -target -var -var-file] + super
+      end
+
+      def sub_commands(_values)
+        'refresh'
+      end
+
+      def arguments(values)
+        values[:directory]
+      end
 
-        builder
-          .with_subcommand('refresh') do |sub|
-          vars.each do |key, value|
-            var_value = value.is_a?(String) ? value : JSON.generate(value)
-            sub = sub.with_option(
-              '-var', "'#{key}=#{var_value}'", separator: ' '
-            )
-          end
-          sub = sub.with_option('-var-file', var_file) if var_file
-          var_files.each do |file|
-            sub = sub.with_option('-var-file', file)
-          end
-          sub = sub.with_option('-state', state) if state
-          sub = sub.with_option('-input', input) if input
-          sub = sub.with_option('-target', target) if target
-          targets.each do |target_name|
-            sub = sub.with_option('-target', target_name)
-          end
-          sub = sub.with_flag('-no-color') if no_color
-          sub
-        end
-          .with_argument(directory)
+      def option_default_values(_opts)
+        { vars: {}, var_files: [], targets: [] }
       end
     end
   end

data/lib/ruby_terraform/commands/remote_config.rb

@@ -3,24 +3,16 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class RemoteConfig < Base
-      def configure_command(builder, opts)
-        backend = opts[:backend]
-        no_color = opts[:no_color]
-        backend_config = opts[:backend_config] || {}
+      def switches
+        %w[-backend -backend-config -no-color]
+      end
 
-        builder
-          .with_subcommand('remote')
-          .with_subcommand('config') do |sub|
-          sub = sub.with_option('-backend', backend) if backend
-          backend_config.each do |key, value|
-            sub = sub.with_option(
-              '-backend-config', "'#{key}=#{value}'", separator: ' '
-            )
-          end
+      def sub_commands(_values)
+        %w[remote config]
+      end
 
-          sub = sub.with_flag('-no-color') if no_color
-          sub
-        end
+      def option_default_values(_opts)
+        { backend_config: {} }
       end
     end
   end

data/lib/ruby_terraform/commands/show.rb

@@ -1,24 +1,18 @@
-# frozen_string_literal: true
-
 require_relative 'base'
 
 module RubyTerraform
   module Commands
     class Show < Base
-      def configure_command(builder, opts)
-        path = opts[:path] || opts[:directory]
-        json_format = opts[:json]
-        no_color = opts[:no_color]
-        module_depth = opts[:module_depth]
+      def switches
+        %w[-json -no-color -module-depth] + super
+      end
+
+      def sub_commands(_values)
+        'show'
+      end
 
-        builder
-          .with_subcommand('show') do |sub|
-          sub = sub.with_option('-module-depth', module_depth) if module_depth
-          sub = sub.with_flag('-no-color') if no_color
-          sub = sub.with_flag('-json') if json_format
-          sub
-        end
-          .with_argument(path)
+      def arguments(values)
+        values[:path] || values[:directory]
       end
     end
   end

data/lib/ruby_terraform/commands/validate.rb

@@ -1,39 +1,22 @@
-require 'json'
 require_relative 'base'
 
 module RubyTerraform
   module Commands
     class Validate < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory]
-        vars = opts[:vars] || {}
-        var_file = opts[:var_file]
-        var_files = opts[:var_files] || []
-        state = opts[:state]
-        check_variables = opts[:check_variables]
-        no_color = opts[:no_color]
-        json_format = opts[:json]
+      def switches
+        %w[-json -no-color -var -var-file -state -check-variables] + super
+      end
+
+      def sub_commands(_values)
+        'validate'
+      end
+
+      def arguments(values)
+        values[:directory]
+      end
 
-        builder
-          .with_subcommand('validate') do |sub|
-          vars.each do |key, value|
-            var_value = value.is_a?(String) ? value : JSON.generate(value)
-            sub = sub.with_option(
-              '-var', "'#{key}=#{var_value}'", separator: ' '
-            )
-          end
-          sub = sub.with_option('-var-file', var_file) if var_file
-          var_files.each do |file|
-            sub = sub.with_option('-var-file', file)
-          end
-          sub = sub.with_option('-state', state) if state
-          sub = sub.with_option('-check-variables', check_variables) unless
-              check_variables.nil?
-          sub = sub.with_flag('-no-color') if no_color
-          sub = sub.with_flag('-json') if json_format
-          sub
-        end
-          .with_argument(directory)
+      def option_default_values(_opts)
+        { vars: {}, var_files: [] }
       end
     end
   end

data/lib/ruby_terraform/commands/workspace.rb

@@ -3,18 +3,21 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Workspace < Base
-      def configure_command(builder, opts)
-        directory = opts[:directory] || nil
-        operation = opts[:operation] || 'list'
-        workspace = opts[:workspace] || nil
+      def sub_commands(values)
+        commands = ['workspace', values[:operation]]
+        if values[:workspace] && values[:operation] != 'list'
+          commands << values[:workspace]
+        else
+          commands
+        end
+      end
 
-        builder = builder
-                  .with_subcommand('workspace')
-                  .with_subcommand(operation)
+      def arguments(values)
+        values[:directory]
+      end
 
-        builder = builder.with_subcommand(workspace) if
-            workspace && operation != 'list'
-        builder.with_argument(directory)
+      def option_default_values(_opts)
+        { directory: nil, operation: 'list', workspace: nil }
       end
     end
   end

data/lib/ruby_terraform/output.rb

@@ -1,20 +1,23 @@
 module RubyTerraform
   class Output
-    def self.for(opts)
-      name = opts[:name]
-      backend_config = opts[:backend_config]
-
-      source_directory = opts[:source_directory]
-      work_directory = opts[:work_directory]
+    class << self
+      def for(opts)
+        Dir.chdir(create_config_directory(opts)) do
+          RubyTerraform.init(backend_config: opts[:backend_config])
+          RubyTerraform.output(name: opts[:name])
+        end
+      end
 
-      configuration_directory = File.join(work_directory, source_directory)
+      private
 
-      FileUtils.mkdir_p File.dirname(configuration_directory)
-      FileUtils.cp_r source_directory, configuration_directory
+      def create_config_directory(opts)
+        source_directory = opts[:source_directory]
+        work_directory = opts[:work_directory]
 
-      Dir.chdir(configuration_directory) do
-        RubyTerraform.init(backend_config: backend_config)
-        RubyTerraform.output(name: name)
+        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
   end

data/lib/ruby_terraform/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.65.0.pre.4
+  version: 0.65.0.pre.5
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -238,6 +238,14 @@ 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