ruby-terraform 0.65.0.pre.2 → 0.65.0.pre.7

data/lib/ruby_terraform/commands/validate.rb

@@ -1,38 +1,29 @@
-require 'json'
 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[
+          -check-variables
+          -json
+          -no-color
+          -state
+          -var
+          -var-file
+        ]
+      end
+
+      def subcommands(_values)
+        %w[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

@@ -3,20 +3,21 @@ 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 subcommands(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

data/lib/ruby_terraform/options.rb

@@ -0,0 +1,5 @@
+require_relative 'options/name'
+require_relative 'options/types/flag'
+require_relative 'options/types/boolean'
+require_relative 'options/types/standard'
+require_relative 'options/factory'

data/lib/ruby_terraform/options/factory.rb

@@ -0,0 +1,116 @@
+require_relative 'name'
+require_relative 'types/boolean'
+require_relative 'types/flag'
+require_relative 'types/standard'
+
+module RubyTerraform
+  module Options
+    class Factory
+      PLURAL_OPTIONS =
+        Set.new(
+          %w[
+            -var
+            -target
+            -var-file
+          ]
+        ).freeze
+
+      BOOLEAN_OPTIONS =
+        Set.new(
+          %w[
+            -auto-approve
+            -backend
+            -get
+            -get-plugins
+            -input
+            -list
+            -lock
+            -refresh
+            -upgrade
+            -verify-plugins
+            -write
+          ]
+        ).freeze
+
+      FLAG_OPTIONS =
+        Set.new(
+          %w[
+            -allow-missing
+            -allow-missing-config
+            -check
+            -compact-warnings
+            -destroy
+            -detailed-exitcode
+            -diff
+            -draw-cycles
+            -force
+            -force-copy
+            -ignore-remote-version
+            -json
+            -no-color
+            -raw
+            -reconfigure
+            -recursive
+            -update
+          ]
+        ).freeze
+
+      OVERRIDE_OPTIONS =
+        {
+          config: :directory,
+          out: :plan
+        }.freeze
+
+      def self.from(values, switches)
+        new(values, switches).from
+      end
+
+      private_class_method :new
+
+      def initialize(values, names)
+        @names = names.map { |switch| Name.new(switch) }
+        @values = values
+      end
+
+      def from
+        names.each_with_object([]) do |name, options|
+          options.append(*options_from_name(name))
+        end
+      end
+
+      private
+
+      attr_reader :names, :values
+
+      def options_from_name(name)
+        return plural_options(name) if PLURAL_OPTIONS.include?(name)
+        return boolean_option(name) if BOOLEAN_OPTIONS.include?(name)
+        return flag_option(name) if FLAG_OPTIONS.include?(name)
+        return override_option(name) if OVERRIDE_OPTIONS.key?(name.as_key)
+
+        standard_option(name, name.as_key)
+      end
+
+      def boolean_option(name)
+        [Types::Boolean.new(name.to_s, values[name.as_key])]
+      end
+
+      def flag_option(name)
+        [Types::Flag.new(name.to_s, values[name.as_key])]
+      end
+
+      def standard_option(name, hash_key)
+        [Types::Standard.new(name.to_s, values[hash_key])]
+      end
+
+      def override_option(name)
+        standard_option(name, OVERRIDE_OPTIONS[name.as_key])
+      end
+
+      def plural_options(name)
+        standard_option(name.to_s, name.as_key) +
+          standard_option(name.to_s, name.as_plural_key)
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/name.rb

@@ -0,0 +1,43 @@
+module RubyTerraform
+  module Options
+    class Name
+      def initialize(name)
+        @name = name
+      end
+
+      def without_prefix
+        @name[0] == '-' ? @name[1..] : @name
+      end
+
+      def to_s
+        "-#{without_prefix}"
+      end
+
+      def as_key
+        snake_case.to_sym
+      end
+
+      def as_plural_key
+        "#{snake_case}s".to_sym
+      end
+
+      def ==(other)
+        to_s == other
+      end
+
+      def eql?(other)
+        to_s == other
+      end
+
+      def hash
+        to_s.hash
+      end
+
+      private
+
+      def snake_case
+        without_prefix.gsub('-', '_')
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/types/base.rb

@@ -0,0 +1,24 @@
+module RubyTerraform
+  module Options
+    module Types
+      class Base
+        def initialize(name, value)
+          @name = name
+          coerce_value(value)
+        end
+
+        def apply(_builder)
+          raise 'not implemented'
+        end
+
+        private
+
+        attr_reader :name, :value
+
+        def coerce_value(value)
+          @value = value
+        end
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/types/boolean.rb

@@ -0,0 +1,16 @@
+require_relative 'base'
+require_relative '../values/boolean'
+
+module RubyTerraform
+  module Options
+    module Types
+      class Boolean < Base
+        include Values::Boolean
+
+        def apply(builder)
+          builder.with_option(name, value)
+        end
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/types/flag.rb

@@ -0,0 +1,16 @@
+require_relative 'base'
+require_relative '../values/boolean'
+
+module RubyTerraform
+  module Options
+    module Types
+      class Flag < Base
+        include Values::Boolean
+
+        def apply(builder)
+          value ? builder.with_flag(name) : builder
+        end
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/types/standard.rb

@@ -0,0 +1,41 @@
+require 'json'
+
+require_relative 'base'
+
+module RubyTerraform
+  module Options
+    module Types
+      class Standard < Base
+        def apply(builder)
+          if value.respond_to?(:keys)
+            apply_hash(builder)
+          elsif value.respond_to?(:each)
+            apply_array(builder)
+          else
+            builder.with_option(name, value)
+          end
+        end
+
+        private
+
+        def apply_hash(builder)
+          builder.with_repeated_option(
+            name,
+            value.map do |hash_key, hash_value|
+              "'#{hash_key}=#{as_string(hash_value)}'"
+            end,
+            separator: ' '
+          )
+        end
+
+        def apply_array(builder)
+          builder.with_repeated_option(name, value)
+        end
+
+        def as_string(value)
+          value.is_a?(String) ? value : JSON.generate(value)
+        end
+      end
+    end
+  end
+end

data/lib/ruby_terraform/options/values/boolean.rb

@@ -0,0 +1,29 @@
+module RubyTerraform
+  module Options
+    module Values
+      module Boolean
+        def coerce_value(value)
+          @value = to_boolean(value)
+        end
+
+        private
+
+        def to_boolean(value)
+          return nil if value.nil?
+          return value if a_boolean?(value)
+          return true if true_as_string?(value)
+
+          false
+        end
+
+        def a_boolean?(value)
+          value.is_a?(TrueClass) || value.is_a?(FalseClass)
+        end
+
+        def true_as_string?(value)
+          value.respond_to?(:downcase) && value.downcase == 'true'
+        end
+      end
+    end
+  end
+end

data/lib/ruby_terraform/output.rb

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

data/lib/ruby_terraform/version.rb

@@ -1,3 +1,3 @@
 module RubyTerraform
-  VERSION = '0.65.0.pre.2'.freeze
+  VERSION = '0.65.0.pre.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.65.0.pre.2
+  version: 0.65.0.pre.7
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,30 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -182,44 +182,44 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 description: Wraps the Terraform CLI so that Terraform can be invoked from a Ruby
   script or Rakefile.
 email:
@@ -256,6 +256,14 @@ files:
 - lib/ruby_terraform/commands/workspace.rb
 - lib/ruby_terraform/errors.rb
 - lib/ruby_terraform/errors/execution_error.rb
+- lib/ruby_terraform/options.rb
+- lib/ruby_terraform/options/factory.rb
+- lib/ruby_terraform/options/name.rb
+- lib/ruby_terraform/options/types/base.rb
+- lib/ruby_terraform/options/types/boolean.rb
+- lib/ruby_terraform/options/types/flag.rb
+- lib/ruby_terraform/options/types/standard.rb
+- lib/ruby_terraform/options/values/boolean.rb
 - lib/ruby_terraform/output.rb
 - lib/ruby_terraform/version.rb
 homepage: https://github.com/infrablocks/ruby_terraform