ruby-terraform 0.64.0 → 0.65.0.pre.5

data/lib/ruby_terraform/commands/show.rb

@@ -1,25 +1,18 @@
-# frozen_string_literal: true
-
-require 'lino'
 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] + super
+      end
+
+      def sub_commands(_values)
+        '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 'lino'
 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)
+        '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

@@ -1,24 +1,24 @@
-require 'lino'
 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/output.rb

@@ -1,20 +1,23 @@
 module RubyTerraform
   class Output
-    def self.for(opts)
-      name = opts[:name]
-      backend_config = opts[:backend_config]
-
-      source_directory = opts[:source_directory]
-      work_directory = opts[:work_directory]
+    class << self
+      def for(opts)
+        Dir.chdir(create_config_directory(opts)) do
+          RubyTerraform.init(backend_config: opts[:backend_config])
+          RubyTerraform.output(name: opts[:name])
+        end
+      end
 
-      configuration_directory = File.join(work_directory, source_directory)
+      private
 
-      FileUtils.mkdir_p File.dirname(configuration_directory)
-      FileUtils.cp_r source_directory, configuration_directory
+      def create_config_directory(opts)
+        source_directory = opts[:source_directory]
+        work_directory = opts[:work_directory]
 
-      Dir.chdir(configuration_directory) do
-        RubyTerraform.init(backend_config: backend_config)
-        RubyTerraform.output(name: name)
+        configuration_directory = File.join(work_directory, source_directory)
+        FileUtils.mkdir_p File.dirname(configuration_directory)
+        FileUtils.cp_r source_directory, configuration_directory
+        configuration_directory
       end
     end
   end

data/lib/ruby_terraform/version.rb

@@ -1,3 +1,3 @@
 module RubyTerraform
-  VERSION = "0.64.0"
+  VERSION = '0.65.0.pre.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.65.0.pre.5
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -38,6 +38,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.17'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.16'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +179,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 description: Wraps the Terraform CLI so that Terraform can be invoked from a Ruby
   script or Rakefile.
 email:
@@ -154,6 +238,14 @@ files:
 - bin/setup
 - lib/ruby-terraform.rb
 - lib/ruby_terraform.rb
+- lib/ruby_terraform/command_line/builder.rb
+- lib/ruby_terraform/command_line/option/base.rb
+- lib/ruby_terraform/command_line/option/boolean.rb
+- lib/ruby_terraform/command_line/option/boolean_value.rb
+- lib/ruby_terraform/command_line/option/flag.rb
+- lib/ruby_terraform/command_line/option/standard.rb
+- lib/ruby_terraform/command_line/option/switch.rb
+- lib/ruby_terraform/command_line/options_factory.rb
 - lib/ruby_terraform/commands.rb
 - lib/ruby_terraform/commands/apply.rb
 - lib/ruby_terraform/commands/base.rb
@@ -189,9 +281,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: