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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5cfd39cb3e8dbe09c0589280ac5b3879e913a9588574420bb285d89a8507217
-  data.tar.gz: 0e87b3b820aff40c28c38073735c4da17c14f95081b6a57f861df034a326bfa1
+  metadata.gz: 9addf5887a0f81258238fceea9f31f92f8653b4593c0684e3511723e5d7ee969
+  data.tar.gz: 660b6fb332e8b93e4ca3f7bb8dc1b48052a2116130273968d148d983b9ee0f4f
 SHA512:
-  metadata.gz: 86d696b30097ac1248ae4f421c591307bad5002ce91fb0352e30334d1c5861ec8abd43c734e6fb1eb0c6efefb07d7f9b09706684bd97b616a6f556e2e6fb9064
-  data.tar.gz: c55bd0a0a10da6bf852b097c17e11890c26ddbeb123edff321a31d5c89fa09404145299c69cda3b403979a0f88d6eca7d9ebf676b5e570933cd4e14f63b36483
+  metadata.gz: 444f51e2e53816404a78770d21873b060b2b117fe36a34516c1c1748db60d87ed10a1fa07bd75e0d7ff010617b1ce7ed3618ede7bc80263539be6454a703b962
+  data.tar.gz: cbb17a6a9b74be5a809b3d68058f383634482fdc3aa06151fc70b165195f230dd692da4b8494a20ffbe09bb7075acd15d9238b07a8a5dc53c3d4590990369000

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.6)
+    ruby-terraform (0.65.0.pre.7)
       lino (>= 2.3)
 
 GEM

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'
 

data/lib/ruby_terraform/commands/apply.rb

@@ -3,14 +3,26 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Apply < Base
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[apply]
       end
 
+      # rubocop:disable Metrics/MethodLength
       def switches
-        %w[-backup -lock -lock-timeout -input -auto-approve -no-color -state
-           -target -var -var-file]
+        %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]]

data/lib/ruby_terraform/commands/base.rb

@@ -61,7 +61,7 @@ module RubyTerraform
           .with_options_after_subcommands
           .with_option_separator('=')
           .with_appliables(options(values))
-          .with_subcommands(sub_commands(values))
+          .with_subcommands(subcommands(values))
           .with_arguments(arguments(values))
           .build
       end
@@ -80,7 +80,7 @@ module RubyTerraform
         {}
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         []
       end
 

data/lib/ruby_terraform/commands/destroy.rb

@@ -4,10 +4,19 @@ module RubyTerraform
   module Commands
     class Destroy < Base
       def switches
-        %w[-backup -auto-approve -force -no-color -state -target -var -var-file]
+        %w[
+          -auto-approve
+          -backup
+          -force
+          -no-color
+          -state
+          -target
+          -var
+          -var-file
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[destroy]
       end
 

data/lib/ruby_terraform/commands/format.rb

@@ -4,10 +4,17 @@ module RubyTerraform
   module Commands
     class Format < Base
       def switches
-        %w[-list -write -diff -check -recursive -no-color]
+        %w[
+          -check
+          -diff
+          -list
+          -no-color
+          -recursive
+          -write
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[fmt]
       end
 

data/lib/ruby_terraform/commands/get.rb

@@ -4,10 +4,13 @@ module RubyTerraform
   module Commands
     class Get < Base
       def switches
-        %w[-update -no-color]
+        %w[
+          -no-color
+          -update
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[get]
       end
 

data/lib/ruby_terraform/commands/import.rb

@@ -4,10 +4,18 @@ module RubyTerraform
   module Commands
     class Import < Base
       def switches
-        %w[-config -backup -input -no-color -state -var -var-file]
+        %w[
+          -config
+          -backup
+          -input
+          -no-color
+          -state
+          -var
+          -var-file
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[import]
       end
 

data/lib/ruby_terraform/commands/init.rb

@@ -4,11 +4,18 @@ module RubyTerraform
   module Commands
     class Init < Base
       def switches
-        %w[-backend -backend-config -from-module -get -no-color -plugin-dir
-           -force-copy]
+        %w[
+          -backend
+          -backend-config
+          -force-copy
+          -from-module
+          -get
+          -no-color
+          -plugin-dir
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[init]
       end
 

data/lib/ruby_terraform/commands/output.rb

@@ -11,10 +11,16 @@ module RubyTerraform
       end
 
       def switches
-        %w[-json -raw -no-color -state -module]
+        %w[
+          -json
+          -module
+          -no-color
+          -raw
+          -state
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[output]
       end
 

data/lib/ruby_terraform/commands/plan.rb

@@ -4,10 +4,19 @@ module RubyTerraform
   module Commands
     class Plan < Base
       def switches
-        %w[-destroy -input -no-color -out -state -target -var -var-file]
+        %w[
+          -destroy
+          -input
+          -no-color
+          -out
+          -state
+          -target
+          -var
+          -var-file
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[plan]
       end
 

data/lib/ruby_terraform/commands/refresh.rb

@@ -4,10 +4,17 @@ module RubyTerraform
   module Commands
     class Refresh < Base
       def switches
-        %w[-input -no-color -state -target -var -var-file]
+        %w[
+          -input
+          -no-color
+          -state
+          -target
+          -var
+          -var-file
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[refresh]
       end
 

data/lib/ruby_terraform/commands/remote_config.rb

@@ -4,10 +4,14 @@ module RubyTerraform
   module Commands
     class RemoteConfig < Base
       def switches
-        %w[-backend -backend-config -no-color]
+        %w[
+          -backend
+          -backend-config
+          -no-color
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[remote config]
       end
 

data/lib/ruby_terraform/commands/show.rb

@@ -4,10 +4,14 @@ module RubyTerraform
   module Commands
     class Show < Base
       def switches
-        %w[-json -no-color -module-depth]
+        %w[
+          -json
+          -module-depth
+          -no-color
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[show]
       end
 

data/lib/ruby_terraform/commands/validate.rb

@@ -4,10 +4,17 @@ module RubyTerraform
   module Commands
     class Validate < Base
       def switches
-        %w[-json -no-color -var -var-file -state -check-variables] + super
+        %w[
+          -check-variables
+          -json
+          -no-color
+          -state
+          -var
+          -var-file
+        ]
       end
 
-      def sub_commands(_values)
+      def subcommands(_values)
         %w[validate]
       end
 

data/lib/ruby_terraform/commands/workspace.rb

@@ -3,7 +3,7 @@ require_relative 'base'
 module RubyTerraform
   module Commands
     class Workspace < Base
-      def sub_commands(values)
+      def subcommands(values)
         commands = ['workspace', values[:operation]]
         if values[:workspace] && values[:operation] != 'list'
           commands << values[:workspace]

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

@@ -1,61 +1,61 @@
-require_relative 'switch'
-require_relative 'boolean'
-require_relative 'flag'
-require_relative 'standard'
+require_relative 'name'
+require_relative 'types/boolean'
+require_relative 'types/flag'
+require_relative 'types/standard'
 
 module RubyTerraform
   module Options
     class Factory
-      PLURAL_SWITCHES =
+      PLURAL_OPTIONS =
         Set.new(
           %w[
-              -var
-              -target
-              -var-file
-            ]
+            -var
+            -target
+            -var-file
+          ]
         ).freeze
 
-      BOOLEAN_SWITCHES =
+      BOOLEAN_OPTIONS =
         Set.new(
           %w[
-              -auto-approve
-              -backend
-              -get
-              -get-plugins
-              -input
-              -list
-              -lock
-              -refresh
-              -upgrade
-              -verify-plugins
-              -write
-            ]
+            -auto-approve
+            -backend
+            -get
+            -get-plugins
+            -input
+            -list
+            -lock
+            -refresh
+            -upgrade
+            -verify-plugins
+            -write
+          ]
         ).freeze
 
-      FLAG_SWITCHES =
+      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
-            ]
+            -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_SWITCHES =
+      OVERRIDE_OPTIONS =
         {
           config: :directory,
           out: :plan
@@ -67,49 +67,49 @@ module RubyTerraform
 
       private_class_method :new
 
-      def initialize(values, switches)
-        @switches = switches.map { |switch| Switch.new(switch) }
+      def initialize(values, names)
+        @names = names.map { |switch| Name.new(switch) }
         @values = values
       end
 
       def from
-        switches.each_with_object([]) do |switch, options|
-          options.append(*options_from_switch(switch))
+        names.each_with_object([]) do |name, options|
+          options.append(*options_from_name(name))
         end
       end
 
       private
 
-      attr_reader :switches, :values
+      attr_reader :names, :values
 
-      def options_from_switch(switch)
-        return plural_options(switch) if PLURAL_SWITCHES.include?(switch)
-        return boolean_option(switch) if BOOLEAN_SWITCHES.include?(switch)
-        return flag_option(switch) if FLAG_SWITCHES.include?(switch)
-        return override_option(switch) if OVERRIDE_SWITCHES.key?(switch.as_key)
+      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(switch, switch.as_key)
+        standard_option(name, name.as_key)
       end
 
-      def boolean_option(switch)
-        [Boolean.new(switch.to_s, values[switch.as_key])]
+      def boolean_option(name)
+        [Types::Boolean.new(name.to_s, values[name.as_key])]
       end
 
-      def flag_option(switch)
-        [Flag.new(switch.to_s, values[switch.as_key])]
+      def flag_option(name)
+        [Types::Flag.new(name.to_s, values[name.as_key])]
       end
 
-      def standard_option(switch, hash_key)
-        [Standard.new(switch.to_s, values[hash_key])]
+      def standard_option(name, hash_key)
+        [Types::Standard.new(name.to_s, values[hash_key])]
       end
 
-      def override_option(switch)
-        standard_option(switch, OVERRIDE_SWITCHES[switch.as_key])
+      def override_option(name)
+        standard_option(name, OVERRIDE_OPTIONS[name.as_key])
       end
 
-      def plural_options(switch)
-        standard_option(switch.to_s, switch.as_key) +
-          standard_option(switch.to_s, switch.as_plural_key)
+      def plural_options(name)
+        standard_option(name.to_s, name.as_key) +
+          standard_option(name.to_s, name.as_plural_key)
       end
     end
   end

data/lib/ruby_terraform/options/{switch.rb → name.rb}

@@ -1,12 +1,16 @@
 module RubyTerraform
   module Options
-    class Switch
-      def initialize(switch)
-        @switch_without_prefix = switch[0] == '-' ? switch[1..] : switch
+    class Name
+      def initialize(name)
+        @name = name
+      end
+
+      def without_prefix
+        @name[0] == '-' ? @name[1..] : @name
       end
 
       def to_s
-        "-#{switch_without_prefix}"
+        "-#{without_prefix}"
       end
 
       def as_key
@@ -31,10 +35,8 @@ module RubyTerraform
 
       private
 
-      attr_reader :switch_without_prefix
-
       def snake_case
-        switch_without_prefix.gsub('-', '_')
+        without_prefix.gsub('-', '_')
       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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.65.0.pre.6
+  version: 0.65.0.pre.7
 platform: ruby
 authors:
 - Toby Clemson
@@ -256,12 +256,13 @@ files:
 - lib/ruby_terraform/commands/workspace.rb
 - lib/ruby_terraform/errors.rb
 - lib/ruby_terraform/errors/execution_error.rb
-- lib/ruby_terraform/options/base.rb
-- lib/ruby_terraform/options/boolean.rb
+- lib/ruby_terraform/options.rb
 - lib/ruby_terraform/options/factory.rb
-- lib/ruby_terraform/options/flag.rb
-- lib/ruby_terraform/options/standard.rb
-- lib/ruby_terraform/options/switch.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

data/lib/ruby_terraform/options/base.rb

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

data/lib/ruby_terraform/options/boolean.rb

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

data/lib/ruby_terraform/options/flag.rb

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

data/lib/ruby_terraform/options/standard.rb

@@ -1,39 +0,0 @@
-require 'json'
-
-require_relative 'base'
-
-module RubyTerraform
-  module Options
-    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(switch, value)
-        end
-      end
-
-      private
-
-      def apply_hash(builder)
-        builder.with_repeated_option(
-          switch,
-          value.map do |hash_key, hash_value|
-            "'#{hash_key}=#{as_string(hash_value)}'"
-          end,
-          separator: ' '
-        )
-      end
-
-      def apply_array(builder)
-        builder.with_repeated_option(switch, value)
-      end
-
-      def as_string(value)
-        value.is_a?(String) ? value : JSON.generate(value)
-      end
-    end
-  end
-end