ruby-terraform 0.65.0.pre.11 → 1.0.0.pre.1

data/lib/ruby_terraform/options/{common.rb → global.rb}

@@ -2,7 +2,8 @@
 
 module RubyTerraform
   module Options
-    module Common
+    module Global
+      # @!visibility private
       def options
         %w[-chdir]
       end

data/lib/ruby_terraform/options/name.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
+require 'immutable-struct'
+
 module RubyTerraform
   module Options
-    class Name
+    class Name < ImmutableStruct.new(:name)
       def initialize(name)
-        @name = name
-      end
-
-      def without_prefix
-        @name[0] == '-' ? @name[1..] : @name
+        super(name: name.to_s)
       end
 
-      def to_s
+      def name
         "-#{without_prefix}"
       end
 
-      def as_key
+      alias to_s name
+
+      def as_singular_key
         snake_case.to_sym
       end
 
@@ -23,20 +23,12 @@ module RubyTerraform
         "#{snake_case}s".to_sym
       end
 
-      def ==(other)
-        to_s == other
-      end
-
-      def eql?(other)
-        to_s == other
-      end
+      private
 
-      def hash
-        to_s.hash
+      def without_prefix
+        @name.sub(/^-+/, '')
       end
 
-      private
-
       def snake_case
         without_prefix.gsub('-', '_')
       end

data/lib/ruby_terraform/options/types.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative 'types/standard'
+require_relative 'types/flag'
+
+module RubyTerraform
+  module Options
+    module Types
+      def self.standard(name, value, **opts)
+        Standard.new(name, value, **opts)
+      end
+
+      def self.flag(name, value)
+        Flag.new(name, value)
+      end
+
+      def self.resolve(type)
+        case type
+        when :standard then Types::Standard
+        when :flag then Types::Flag
+        else type
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-require_relative '../values/boolean'
-
 module RubyTerraform
   module Options
     module Types
-      class Flag < Base
-        include Values::Boolean
+      class Flag < ImmutableStruct.new(
+        :name,
+        :value
+      )
+        def initialize(name, value, **_opts)
+          super(name: name, value: value)
+        end
 
         def apply(builder)
-          value ? builder.with_flag(name) : builder
+          value.resolve ? builder.with_flag(name) : builder
         end
       end
     end

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

@@ -1,42 +1,30 @@
 # frozen_string_literal: true
 
-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
+      class Standard < ImmutableStruct.new(
+        :name,
+        :value,
+        :separator,
+        :placement
+      )
+        def initialize(name, value, **opts)
+          super(
+            name: name, value: value,
+            separator: opts[:separator],
+            placement: opts[:placement]
+          )
         end
 
-        private
-
-        def apply_hash(builder)
-          builder.with_repeated_option(
+        def apply(builder)
+          builder.with_option(
             name,
-            value.map do |hash_key, hash_value|
-              "'#{hash_key}=#{as_string(hash_value)}'"
-            end,
-            separator: ' '
+            value.render,
+            separator: separator,
+            placement: placement
           )
         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

data/lib/ruby_terraform/options/values.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative 'values/boolean'
+require_relative 'values/string'
+require_relative 'values/complex'
+require_relative 'values/key_value'
+
+module RubyTerraform
+  module Options
+    module Values
+      def self.boolean(value)
+        Boolean.new(value)
+      end
+
+      def self.string(value)
+        String.new(value)
+      end
+
+      def self.complex(value)
+        Complex.new(value)
+      end
+
+      def self.key_value(key, value)
+        KeyValue.new(key, value)
+      end
+
+      def self.resolve(type)
+        case type
+        when :string then Values::String
+        when :boolean then Values::Boolean
+        when :complex then Values::Complex
+        when :key_value then Values::KeyValue
+        else type
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'immutable-struct'
+
+module RubyTerraform
+  module Options
+    module Values
+      class Base < ImmutableStruct.new(:value)
+        def initialize(value)
+          super(value: value)
+        end
+      end
+    end
+  end
+end

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

@@ -1,23 +1,25 @@
 # frozen_string_literal: true
 
+require_relative 'base'
+
 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)
+      class Boolean < Base
+        def resolve
+          return nil if @value.nil?
+          return @value if a_boolean?(@value)
+          return true if true_as_string?(@value)
 
           false
         end
 
+        def render
+          resolve.nil? ? nil : resolve.to_s
+        end
+
+        private
+
         def a_boolean?(value)
           value.is_a?(TrueClass) || value.is_a?(FalseClass)
         end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module RubyTerraform
+  module Options
+    module Values
+      class Complex < Base
+        def resolve
+          @value
+        end
+
+        def render
+          @value.is_a?(::String) ? @value : JSON.generate(value)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RubyTerraform
+  module Options
+    module Values
+      class KeyValue < ImmutableStruct.new(:key, :value)
+        def initialize(key, value)
+          super(key: key, value: value)
+        end
+
+        def resolve
+          { key => value.resolve }
+        end
+
+        def render
+          "'#{key}=#{value.render}'"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module RubyTerraform
+  module Options
+    module Values
+      class String < Base
+        def resolve
+          @value.to_s
+        end
+
+        alias render resolve
+      end
+    end
+  end
+end

data/lib/ruby_terraform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyTerraform
-  VERSION = '0.65.0.pre.11'
+  VERSION = '1.0.0.pre.1'
 end

data/ruby_terraform.gemspec

@@ -38,7 +38,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'lino', '>= 2.3'
+  spec.add_dependency 'immutable-struct', '~> 2.4'
+  spec.add_dependency 'lino', '~> 2.7'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'faker', '~> 2.17'
@@ -55,4 +56,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rake', '~> 0.5'
   spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
   spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.add_development_dependency 'yard', '~> 0.9'
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.65.0.pre.11
+  version: 1.0.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: immutable-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: lino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Wraps the Terraform CLI so that Terraform can be invoked from a Ruby
   script or Rakefile.
 email:
@@ -255,7 +283,6 @@ files:
 - lib/ruby_terraform/commands.rb
 - lib/ruby_terraform/commands/apply.rb
 - lib/ruby_terraform/commands/base.rb
-- lib/ruby_terraform/commands/clean.rb
 - lib/ruby_terraform/commands/destroy.rb
 - lib/ruby_terraform/commands/force_unlock.rb
 - lib/ruby_terraform/commands/format.rb
@@ -272,7 +299,6 @@ files:
 - lib/ruby_terraform/commands/providers_mirror.rb
 - lib/ruby_terraform/commands/providers_schema.rb
 - lib/ruby_terraform/commands/refresh.rb
-- lib/ruby_terraform/commands/remote_config.rb
 - lib/ruby_terraform/commands/show.rb
 - lib/ruby_terraform/commands/state_list.rb
 - lib/ruby_terraform/commands/state_move.rb
@@ -292,14 +318,20 @@ files:
 - lib/ruby_terraform/errors.rb
 - lib/ruby_terraform/errors/execution_error.rb
 - lib/ruby_terraform/options.rb
-- lib/ruby_terraform/options/common.rb
+- lib/ruby_terraform/options/definition.rb
+- lib/ruby_terraform/options/definitions.rb
 - lib/ruby_terraform/options/factory.rb
+- lib/ruby_terraform/options/global.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.rb
 - lib/ruby_terraform/options/types/flag.rb
 - lib/ruby_terraform/options/types/standard.rb
+- lib/ruby_terraform/options/values.rb
+- lib/ruby_terraform/options/values/base.rb
 - lib/ruby_terraform/options/values/boolean.rb
+- lib/ruby_terraform/options/values/complex.rb
+- lib/ruby_terraform/options/values/key_value.rb
+- lib/ruby_terraform/options/values/string.rb
 - lib/ruby_terraform/output.rb
 - lib/ruby_terraform/version.rb
 - ruby_terraform.gemspec