ruby-terraform 0.64.0 → 0.65.0.pre.5

data/lib/ruby_terraform/commands/clean.rb

@@ -6,7 +6,7 @@ module RubyTerraform
       attr_reader :logger
 
       def initialize(directory: nil, logger: nil)
-        @directory = directory ? directory : '.terraform'
+        @directory = directory || '.terraform'
         @logger = logger || RubyTerraform.configuration.logger
       end
 
@@ -14,7 +14,7 @@ module RubyTerraform
         directory = opts[:directory] || @directory
         begin
           logger.info "Cleaning terraform directory '#{directory}'."
-          FileUtils.rm_r(directory, :secure => true)
+          FileUtils.rm_r(directory, secure: true)
         rescue Errno::ENOENT => e
           logger.error "Couldn't clean '#{directory}': #{e.message}"
         end

data/lib/ruby_terraform/commands/destroy.rb

@@ -1,47 +1,26 @@
-require 'lino'
 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,30 +1,18 @@
-# frozen_string_literal: true
-
-require 'lino'
 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

@@ -1,18 +1,19 @@
-require 'lino'
 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
-end
+end

data/lib/ruby_terraform/commands/import.rb

@@ -1,45 +1,26 @@
-# frozen_string_literal: true
-
-require 'lino'
 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

@@ -1,39 +1,23 @@
-require 'lino'
 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?
-              sub = sub.with_option('-force-copy', force_copy) unless force_copy.nil?
-              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
-              sub = sub.with_option('-plugin-dir', plugin_dir) unless plugin_dir.nil?
-              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

@@ -1,33 +1,25 @@
-require 'lino'
 require 'stringio'
 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,45 +1,22 @@
-require 'lino'
 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,41 +1,22 @@
-require 'lino'
 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

@@ -1,27 +1,19 @@
-require 'lino'
 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