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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc71a524e8870cabf47b5d3d88f474119bb38ed849afc036af51f95475335c37
-  data.tar.gz: 11bf8ae65abe06ff4e0cec9f347a82f613976cbd7378c62fc22fb97d336e05f4
+  metadata.gz: 94caa2aca97f42de2c9ebf6b4924b89af8d39482d49ee2e3d1603cac201e910e
+  data.tar.gz: 6b6f5cfdfa183a6189f9cc796e7acdc49461ce34250a414d3e0d654159cb3840
 SHA512:
-  metadata.gz: a6cd2f1ac3bc0b91d270925ddea294c6c30fe3385061437467fc78c1964bea141ac410212f0358a091e483898bf2d06a4b27931783c444e5176bb184b5ede8c9
-  data.tar.gz: 8a863584cdf4d4bc90ebe62cb289b893fd6082f704f828ab00ba21b67228841ceb774b7d16a03332feebcdd4174364a340124b2796ca6e5acc2b2383050a2b83
+  metadata.gz: 5256f952dc7b3d11762ce57563588e39b94ff0f33c20bfbb1f3587bc43b05b493a9a236d824e4b4a8929fe596e20a4b6f7448d6cc97c4636529ea7282ce39c1d
+  data.tar.gz: 714db0266dcb2b1c6a52598b4913151a17abd4d9a8f31649680879f362d7778f48525d177c826086b69eaf56595346574b432c8f422cab5b826269f75e456412

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.5)
-      lino (>= 1.5)
+    ruby-terraform (0.65.0.pre.10)
+      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'
 
@@ -26,21 +29,65 @@ module RubyTerraform
       clean: RubyTerraform::Commands::Clean,
       destroy: RubyTerraform::Commands::Destroy,
       format: RubyTerraform::Commands::Format,
+      force_unlock: RubyTerraform::Commands::ForceUnlock,
       get: RubyTerraform::Commands::Get,
+      graph: RubyTerraform::Commands::Graph,
       import: RubyTerraform::Commands::Import,
       init: RubyTerraform::Commands::Init,
+      login: RubyTerraform::Commands::Login,
+      logout: RubyTerraform::Commands::Logout,
       output: RubyTerraform::Commands::Output,
       plan: RubyTerraform::Commands::Plan,
+      providers: RubyTerraform::Commands::Providers,
+      providers_lock: RubyTerraform::Commands::ProvidersLock,
+      providers_mirror: RubyTerraform::Commands::ProvidersMirror,
+      providers_schema: RubyTerraform::Commands::ProvidersSchema,
       refresh: RubyTerraform::Commands::Refresh,
       remote_config: RubyTerraform::Commands::RemoteConfig,
       show: RubyTerraform::Commands::Show,
+      state_list: RubyTerraform::Commands::StateList,
+      state_mv: RubyTerraform::Commands::StateMove,
+      state_pull: RubyTerraform::Commands::StatePull,
+      state_push: RubyTerraform::Commands::StatePush,
+      state_replace_provider: RubyTerraform::Commands::StateReplaceProvider,
+      state_rm: RubyTerraform::Commands::StateRemove,
+      state_show: RubyTerraform::Commands::StateShow,
+      taint: RubyTerraform::Commands::Taint,
+      untaint: RubyTerraform::Commands::Untaint,
       validate: RubyTerraform::Commands::Validate,
-      workspace: RubyTerraform::Commands::Workspace
+      workspace_list: RubyTerraform::Commands::WorkspaceList,
+      workspace_select: RubyTerraform::Commands::WorkspaceSelect,
+      workspace_new: RubyTerraform::Commands::WorkspaceNew,
+      workspace_delete: RubyTerraform::Commands::WorkspaceDelete,
+      workspace_show: RubyTerraform::Commands::WorkspaceShow
     }.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
+
+    def workspace(parameters = {}) # rubocop:disable Metrics/MethodLength
+      case parameters[:operation]
+      when nil, 'list'
+        exec(RubyTerraform::Commands::WorkspaceList, parameters)
+      when 'select'
+        exec(RubyTerraform::Commands::WorkspaceSelect, parameters)
+      when 'new'
+        exec(RubyTerraform::Commands::WorkspaceNew, parameters)
+      when 'delete'
+        exec(RubyTerraform::Commands::WorkspaceDelete, parameters)
+      when 'show'
+        exec(RubyTerraform::Commands::WorkspaceShow, parameters)
+      else
+        raise "Invalid operation '#{parameters[:operation]}' supplied to workspace"
       end
     end
+
+    private
+
+    def exec(command_class, parameters)
+      command_class.new.execute(parameters)
+    end
   end
   extend ClassMethods
 

data/lib/ruby_terraform/commands.rb

@@ -1,17 +1,40 @@
-require_relative 'commands/clean'
-require_relative 'commands/init'
-require_relative 'commands/get'
-require_relative 'commands/validate'
-require_relative 'commands/plan'
+# frozen_string_literal: true
+
 require_relative 'commands/apply'
+require_relative 'commands/clean'
 require_relative 'commands/destroy'
+require_relative 'commands/force_unlock'
+require_relative 'commands/format'
+require_relative 'commands/get'
+require_relative 'commands/graph'
+require_relative 'commands/import'
+require_relative 'commands/init'
+require_relative 'commands/login'
+require_relative 'commands/logout'
 require_relative 'commands/output'
+require_relative 'commands/plan'
+require_relative 'commands/providers'
+require_relative 'commands/providers_lock'
+require_relative 'commands/providers_mirror'
+require_relative 'commands/providers_schema'
 require_relative 'commands/refresh'
 require_relative 'commands/remote_config'
 require_relative 'commands/show'
-require_relative 'commands/workspace'
-require_relative 'commands/import'
-require_relative 'commands/format'
+require_relative 'commands/state_list'
+require_relative 'commands/state_move'
+require_relative 'commands/state_pull'
+require_relative 'commands/state_push'
+require_relative 'commands/state_replace_provider'
+require_relative 'commands/state_remove'
+require_relative 'commands/state_show'
+require_relative 'commands/taint'
+require_relative 'commands/untaint'
+require_relative 'commands/validate'
+require_relative 'commands/workspace_delete'
+require_relative 'commands/workspace_list'
+require_relative 'commands/workspace_new'
+require_relative 'commands/workspace_select'
+require_relative 'commands/workspace_show'
 
 module RubyTerraform
   module Commands

data/lib/ruby_terraform/commands/apply.rb

@@ -1,27 +1,46 @@
+# frozen_string_literal: true
+
 require_relative 'base'
+require_relative '../options/common'
 
 module RubyTerraform
   module Commands
     class Apply < Base
-      def sub_commands(_values)
-        'apply'
+      include RubyTerraform::Options::Common
+
+      def subcommands
+        %w[apply]
       end
 
-      def switches
-        %w[-backup -lock -lock-timeout -input -auto-approve -no-color -state
-           -target -var -var-file]
+      def options # rubocop:disable Metrics/MethodLength
+        %w[
+          -backup
+          -compact-warnings
+          -lock
+          -lock-timeout
+          -input
+          -auto-approve
+          -no-color
+          -parallelism
+          -refresh
+          -state
+          -state-out
+          -target
+          -var
+          -var-file
+        ] + super
       end
 
-      def arguments(values)
-        values[:plan] || values[:directory]
+      def arguments(parameters)
+        [parameters[:plan] || parameters[:directory]]
       end
 
-      def option_default_values(_opts)
+      def parameter_defaults(_parameters)
         { vars: {}, var_files: [], targets: [] }
       end
 
-      def option_override_values(opts)
-        { backup: opts[:no_backup] ? '-' : opts[:backup] }
+      def parameter_overrides(parameters)
+        { backup: parameters[:no_backup] ? '-' : parameters[:backup] }
       end
     end
   end

data/lib/ruby_terraform/commands/base.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
+require 'lino'
+
 require_relative '../errors'
-require_relative '../command_line/builder'
-require_relative '../command_line/options_factory'
+require_relative '../options/factory'
 
 module RubyTerraform
   module Commands
@@ -16,10 +19,10 @@ module RubyTerraform
         initialize_command
       end
 
-      def execute(opts = {})
-        do_before(opts)
-        build_and_execute_command(opts)
-        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)
@@ -30,8 +33,8 @@ module RubyTerraform
 
       attr_reader :binary, :logger, :stdin, :stdout, :stderr
 
-      def build_and_execute_command(opts)
-        command = build_command(opts)
+      def build_and_execute_command(parameters)
+        command = build_command(parameters)
         logger.debug("Running '#{command}'.")
         command.execute(
           stdin: stdin,
@@ -44,50 +47,50 @@ module RubyTerraform
         self.class.to_s.split('::')[-1].downcase
       end
 
-      def do_before(_opts); end
+      def do_before(_parameters); end
 
-      def do_after(_opts); end
+      def do_after(_parameters); 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
+      def build_command(parameters)
+        parameters = resolve_parameters(parameters)
+
+        Lino::CommandLineBuilder
+          .for_command(@binary)
+          .with_options_after_subcommands
+          .with_option_separator('=')
+          .with_appliables(Options::Factory.from(options, parameters))
+          .with_subcommands(subcommands)
+          .with_arguments(arguments(parameters))
+          .build
       end
 
-      def apply_option_defaults_and_overrides(opts)
-        option_default_values(opts).merge(opts)
-                                   .merge(option_override_values(opts))
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
       end
 
-      def option_default_values(_values)
+      def parameter_defaults(_parameters)
         {}
       end
 
-      def option_override_values(_values)
+      def parameter_overrides(_parameters)
         {}
       end
 
-      def sub_commands(_values)
+      def subcommands
         []
       end
 
-      def options(values)
-        RubyTerraform::CommandLine::OptionsFactory.from(values, switches)
-      end
-
-      def switches
+      def options
         []
       end
 
-      def arguments(_values)
+      def arguments(_parameters)
         []
       end
     end

data/lib/ruby_terraform/commands/clean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module RubyTerraform
@@ -10,8 +12,8 @@ module RubyTerraform
         @logger = logger || RubyTerraform.configuration.logger
       end
 
-      def execute(opts = {})
-        directory = opts[:directory] || @directory
+      def execute(parameters = {})
+        directory = parameters[:directory] || @directory
         begin
           logger.info "Cleaning terraform directory '#{directory}'."
           FileUtils.rm_r(directory, secure: true)

data/lib/ruby_terraform/commands/destroy.rb

@@ -1,26 +1,46 @@
+# frozen_string_literal: true
+
 require_relative 'base'
+require_relative '../options/common'
 
 module RubyTerraform
   module Commands
     class Destroy < Base
-      def switches
-        %w[-backup -auto-approve -force -no-color -state -target -var -var-file]
+      include RubyTerraform::Options::Common
+
+      def subcommands
+        %w[destroy]
       end
 
-      def sub_commands(_values)
-        'destroy'
+      def options # rubocop:disable Metrics/MethodLength
+        %w[
+          -backup
+          -compact-warnings
+          -lock
+          -lock-timeout
+          -input
+          -auto-approve
+          -no-color
+          -parallelism
+          -refresh
+          -state
+          -state-out
+          -target
+          -var
+          -var-file
+        ] + super
       end
 
-      def arguments(values)
-        values[:directory]
+      def arguments(parameters)
+        [parameters[:directory]]
       end
 
-      def option_default_values(_opts)
+      def parameter_defaults(_parameters)
         { vars: {}, var_files: [], targets: [] }
       end
 
-      def option_override_values(opts)
-        { backup: opts[:no_backup] ? '-' : opts[:backup] }
+      def parameter_overrides(parameters)
+        { backup: parameters[:no_backup] ? '-' : parameters[:backup] }
       end
     end
   end