ruby-terraform 0.65.0.pre.3 → 0.65.0.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8134ce739c38d0dc08a0ecdb0737d6227b8408809258c8eada6d95591182194d
-  data.tar.gz: bb5e4eeeaa9c3817ab67da0d2d2bb1b974aedb9b380934cbdc7ac633039e61c3
+  metadata.gz: 7bf0ddc673685c898ae6d2eada53730debf6f88b641fa14a6c9607ba7fecdb30
+  data.tar.gz: f8514023bc5442bfa6d9c5148030dcba0bf6d926c3af2031b439bb179df1b15c
 SHA512:
-  metadata.gz: e7b1373932d2c2ff94456bad7e8a96daab3a84500a509bfd3ae557193a54e00310d773fd3d99996459bf5859434b385df609a863db7e4844536a64d98c24af53
-  data.tar.gz: c80e73a02de20a50a8feec447b826b5a63a1a8f62b8d7e40ec89c3e4266ef8a3b2a836257bb5a005d9676d6ec0ab6238e9db15709a3b5f9d844781782b1bb796
+  metadata.gz: f7db215e6820ddfde9c5362a27063413469a8d62ca57be6d2f68c0f6e47b9b02c8a32ce5f8e9471de41d8baca7dbf07c46d62e284d750e1da76584786f56ce65
+  data.tar.gz: b5d3bbe7617c24bdf233c81a298d3a78df93e30f7d9a61145e05afe009e3fad49b840e4fcdbf082dbc9afd92be11147401cc691fab5a376c93a009fd9f34bf67

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.3)
-      lino (>= 1.5)
+    ruby-terraform (0.65.0.pre.8)
+      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.rb

@@ -1,5 +1,6 @@
 require 'ruby_terraform/version'
 require 'ruby_terraform/errors'
+require 'ruby_terraform/options'
 require 'ruby_terraform/commands'
 require 'logger'
 
@@ -21,60 +22,25 @@ module RubyTerraform
   end
 
   module ClassMethods
-    def clean(opts = {})
-      Commands::Clean.new.execute(opts)
-    end
-
-    def init(opts = {})
-      Commands::Init.new.execute(opts)
-    end
-
-    def get(opts = {})
-      Commands::Get.new.execute(opts)
-    end
-
-    def validate(opts = {})
-      Commands::Validate.new.execute(opts)
-    end
-
-    def plan(opts = {})
-      Commands::Plan.new.execute(opts)
-    end
-
-    def apply(opts = {})
-      Commands::Apply.new.execute(opts)
-    end
-
-    def destroy(opts = {})
-      Commands::Destroy.new.execute(opts)
-    end
-
-    def remote_config(opts = {})
-      Commands::RemoteConfig.new.execute(opts)
-    end
-
-    def refresh(opts = {})
-      Commands::Refresh.new.execute(opts)
-    end
-
-    def output(opts = {})
-      Commands::Output.new.execute(opts)
-    end
-
-    def show(opts = {})
-      Commands::Show.new.execute(opts)
-    end
-
-    def workspace(opts = {})
-      Commands::Workspace.new.execute(opts)
-    end
-
-    def import(opts = {})
-      Commands::Import.new.execute(opts)
-    end
-
-    def format(opts = {})
-      Commands::Format.new.execute(opts)
+    {
+      apply: RubyTerraform::Commands::Apply,
+      clean: RubyTerraform::Commands::Clean,
+      destroy: RubyTerraform::Commands::Destroy,
+      format: RubyTerraform::Commands::Format,
+      get: RubyTerraform::Commands::Get,
+      import: RubyTerraform::Commands::Import,
+      init: RubyTerraform::Commands::Init,
+      output: RubyTerraform::Commands::Output,
+      plan: RubyTerraform::Commands::Plan,
+      refresh: RubyTerraform::Commands::Refresh,
+      remote_config: RubyTerraform::Commands::RemoteConfig,
+      show: RubyTerraform::Commands::Show,
+      validate: RubyTerraform::Commands::Validate,
+      workspace: RubyTerraform::Commands::Workspace
+    }.each do |method, command_class|
+      define_method(method) do |opts = {}|
+        command_class.new.execute(opts)
+      end
     end
   end
   extend ClassMethods

data/lib/ruby_terraform/commands/apply.rb

@@ -1,49 +1,39 @@
-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 subcommands(_values)
+        %w[apply]
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def switches
+        %w[
+          -auto-approve
+          -backup
+          -input
+          -lock
+          -lock-timeout
+          -no-color
+          -state
+          -target
+          -var
+          -var-file
+        ]
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      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,7 @@
 require 'lino'
+
 require_relative '../errors'
+require_relative '../options/factory'
 
 module RubyTerraform
   module Commands
@@ -12,20 +14,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 +31,70 @@ 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
+      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)
+
         Lino::CommandLineBuilder
-          .for_command(binary)
+          .for_command(@binary)
+          .with_options_after_subcommands
           .with_option_separator('=')
+          .with_appliables(options(values))
+          .with_subcommands(subcommands(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))
+      end
+
+      def option_default_values(_values)
+        {}
+      end
+
+      def option_override_values(_values)
+        {}
+      end
+
+      def subcommands(_values)
+        []
       end
 
-      def do_before(opts); end
+      def options(values)
+        RubyTerraform::Options::Factory.from(values, switches)
+      end
 
-      def configure_command(builder, opts); end
+      def switches
+        []
+      end
 
-      def do_after(opts); end
+      def arguments(_values)
+        []
+      end
     end
   end
 end

data/lib/ruby_terraform/commands/destroy.rb

@@ -3,45 +3,33 @@ 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[
+          -auto-approve
+          -backup
+          -force
+          -no-color
+          -state
+          -target
+          -var
+          -var-file
+        ]
+      end
+
+      def subcommands(_values)
+        %w[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,25 @@
-# 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[
+          -check
+          -diff
+          -list
+          -no-color
+          -recursive
+          -write
+        ]
+      end
 
-        builder.with_subcommand('fmt') do |sub|
-          sub = sub.with_option('-list', list) if list
-          sub = sub.with_option('-write', write) if write
+      def subcommands(_values)
+        %w[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,19 @@ 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[
+          -no-color
+          -update
+        ]
+      end
+
+      def subcommands(_values)
+        %w[get]
+      end
+
+      def arguments(values)
+        [values[:directory]]
       end
     end
   end