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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f188a94d3b8b59c9a65a87d151a239bc96c3b3c7612718991d84ee482eede4
-  data.tar.gz: dfdb9d0fac5a258cd823a441c8b70fbf05715129c6d4bd32ddeb128d5447f1e8
+  metadata.gz: d49c234d709a37f69ac311de2f0beb7123e88a70053af2a30955d28ffa712b54
+  data.tar.gz: 5cc7e8f312bc8217e4fc3e0fdcb28a44911580c93893ccb82b1e11d6e999f026
 SHA512:
-  metadata.gz: d0bd171c22777b63821ba3bab4d2a4d600e2fd3352c92c8c31e7758dd8732a7d89c060459012f4d63361373cce9e1d0ff0ab7092c6d2710fa52287790289c262
-  data.tar.gz: bfbd26e7b628847187de85f8ef2753d2f84ebeaaad739f1c9b129a4db1f201bc09fb7c854d8b338a48df0d7288188a3ea510bb124abe5366cbb311671d538b9a
+  metadata.gz: 6abdb8f924a32c688c32b56e7908debfb9ebf1dd089b1ecab345239e15dca795d1cf722e3b0c66b2d8014f32e3a55acea945ff8fb6d52b2e0bb57fd5f64b0282
+  data.tar.gz: 543a406f62b65901a6b62479b919784774c7ced3bf1a4d1bae1c5f218367ecae8fc0bd4a16470a73addbc0e69033fd833c85fa41ae774448147aa62839adf809

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ruby_terraform.gemspec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.4)
-      lino (>= 1.5)
+    ruby-terraform (0.65.0.pre.9)
+      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)
@@ -126,6 +126,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
+    rubocop-rake (0.5.1)
+      rubocop
     rubocop-rspec (2.2.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
@@ -166,6 +168,7 @@ DEPENDENCIES
   rake_ssh (~> 0.4)
   rspec (~> 3.9)
   rubocop (~> 1.12)
+  rubocop-rake (~> 0.5)
   rubocop-rspec (~> 2.2)
   ruby-terraform!
   simplecov (~> 0.21)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -7,13 +9,14 @@ require 'securerandom'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-task default: [
-  #:'library:fix',
-  :'test:unit'
+task default: %i[
+  library:fix
+  test:unit
 ]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
       File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
         f.write(SecureRandom.base64(36))
@@ -94,6 +97,7 @@ RakeGithub.define_repository_tasks(
 end
 
 namespace :pipeline do
+  desc 'Prepare CircleCI Pipeline'
   task prepare: %i[
     circle_ci:project:follow
     circle_ci:env_vars:ensure

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'ruby_terraform'

data/lib/ruby-terraform.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Enable `require 'ruby-terraform'`, to match the gem name
 
 require_relative 'ruby_terraform'

data/lib/ruby_terraform.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'ruby_terraform/version'
 require 'ruby_terraform/errors'
+require 'ruby_terraform/options'
 require 'ruby_terraform/commands'
 require 'logger'
 
@@ -37,8 +40,8 @@ module RubyTerraform
       validate: RubyTerraform::Commands::Validate,
       workspace: RubyTerraform::Commands::Workspace
     }.each do |method, command_class|
-      define_method(method) do |opts = {}|
-        command_class.new.execute(opts)
+      define_method(method) do |parameters = {}|
+        command_class.new.execute(parameters)
       end
     end
   end

data/lib/ruby_terraform/commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'commands/clean'
 require_relative 'commands/init'
 require_relative 'commands/get'

data/lib/ruby_terraform/commands/apply.rb

@@ -1,49 +1,41 @@
-require 'json'
+# frozen_string_literal: true
+
 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 options
+        %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 parameter_defaults(_parameters)
+        { 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 parameter_overrides(parameters)
+        { backup: parameters[:no_backup] ? '-' : parameters[:backup] }
       end
     end
   end

data/lib/ruby_terraform/commands/base.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 require 'lino'
+
 require_relative '../errors'
+require_relative '../options/factory'
 
 module RubyTerraform
   module Commands
@@ -12,21 +16,13 @@ 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
-        )
-        do_after(opts)
+      def execute(parameters = {})
+        do_before(parameters)
+        build_and_execute_command(parameters)
+        do_after(parameters)
       rescue Open4::SpawnError
         message = "Failed while running '#{command_name}'."
         logger.error(message)
@@ -37,21 +33,66 @@ module RubyTerraform
 
       attr_reader :binary, :logger, :stdin, :stdout, :stderr
 
+      def build_and_execute_command(parameters)
+        command = build_command(parameters)
+        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(_parameters); end
+
+      def do_after(_parameters); end
+
+      private
+
+      def initialize_command; end
+
+      def build_command(parameters)
+        parameters = resolve_parameters(parameters)
+
         Lino::CommandLineBuilder
-          .for_command(binary)
+          .for_command(@binary)
+          .with_options_after_subcommands
           .with_option_separator('=')
+          .with_appliables(Options::Factory.from(options, parameters))
+          .with_subcommands(subcommands(parameters))
+          .with_arguments(arguments(parameters))
+          .build
+      end
+
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
+      end
+
+      def parameter_defaults(_parameters)
+        {}
+      end
+
+      def parameter_overrides(_parameters)
+        {}
       end
 
-      def do_before(opts); end
+      def subcommands(_values)
+        []
+      end
 
-      def configure_command(builder, opts); end
+      def options
+        []
+      end
 
-      def do_after(opts); end
+      def arguments(_values)
+        []
+      end
     end
   end
 end

data/lib/ruby_terraform/commands/clean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module RubyTerraform

data/lib/ruby_terraform/commands/destroy.rb

@@ -1,47 +1,37 @@
+# frozen_string_literal: true
+
 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 options
+        %w[
+          -auto-approve
+          -backup
+          -force
+          -no-color
+          -state
+          -target
+          -var
+          -var-file
+        ]
+      end
+
+      def subcommands(_parameters)
+        %w[destroy]
+      end
+
+      def arguments(parameters)
+        [parameters[:directory]]
+      end
+
+      def parameter_defaults(_parameters)
+        { 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 parameter_overrides(parameters)
+        { backup: parameters[:no_backup] ? '-' : parameters[:backup] }
       end
     end
   end

data/lib/ruby_terraform/commands/format.rb

@@ -5,25 +5,23 @@ 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 options
+        %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(_parameters)
+        %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(parameters)
+        [parameters[:directory]]
       end
     end
   end