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

data/lib/ruby_terraform/commands/plan.rb

@@ -1,45 +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)
+        %w[plan]
+      end
+
+      def arguments(values)
+        [values[:directory]]
+      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 option_default_values(_opts)
+        { vars: {}, var_files: [], targets: [] }
       end
     end
   end

data/lib/ruby_terraform/commands/refresh.rb

@@ -1,41 +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]
+      end
+
+      def sub_commands(_values)
+        %w[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,17 @@ 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
-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]
+      end
+
+      def sub_commands(_values)
+        %w[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,38 +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)
+        %w[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,21 +3,22 @@ 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
-
-        builder = builder
-            .with_subcommand('workspace')
-            .with_subcommand(operation)
+      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) if
-            workspace && operation != 'list'
-        builder = builder.with_argument(directory)
+      def arguments(values)
+        [values[:directory]]
+      end
 
-        builder
+      def option_default_values(_opts)
+        { directory: nil, operation: 'list', workspace: nil }
       end
     end
   end
-end
+end

data/lib/ruby_terraform/errors/execution_error.rb

@@ -3,4 +3,4 @@ module RubyTerraform
     class ExecutionError < StandardError
     end
   end
-end
+end

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