kitchen-terraform 0.5.1 → 0.6.0

data/lib/terraform/version.rb

@@ -14,6 +14,60 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'rubygems/version'
+require 'terraform/deprecated_version'
+require 'terraform/unsupported_version'
+
 module Terraform
-  VERSION = '0.5.1'
+  # Version of Terraform
+  class Version
+    def self.create(value:)
+      new(value: value).tap do |version|
+        supported.find(&version.method(:==)) or
+          return ::Terraform::UnsupportedVersion.new version
+        deprecated.find(&version.method(:==)) and
+          return ::Terraform::DeprecatedVersion.new version
+      end
+    end
+
+    def self.deprecated
+      [new(value: '0.6')]
+    end
+
+    def self.latest
+      new value: '0.8'
+    end
+
+    def self.supported
+      [latest, new(value: '0.7'), *deprecated]
+    end
+
+    def ==(other)
+      major_minor == other.major_minor
+    end
+
+    alias eql? ==
+
+    def if_deprecated; end
+
+    def if_json_not_supported; end
+
+    def if_not_supported; end
+
+    def major_minor
+      value.approximate_recommendation
+    end
+
+    def to_s
+      "Terraform v#{value}"
+    end
+
+    private
+
+    attr_accessor :value, :version
+
+    def initialize(value:)
+      self.value = ::Gem::Version.create value.slice(/v?(\d+(\.\d+)*)/, 1)
+    end
+  end
 end

data/lib/terraform/version_command.rb

@@ -14,17 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative 'command'
+require 'terraform/command'
 
 module Terraform
-  # Command to obtain the version
-  class VersionCommand < Command
-    def name
-      'version'
-    end
-
-    def options
-      ''
-    end
+  # A command to obtain the version
+  class VersionCommand < ::Terraform::Command
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-terraform
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Aaron Lane
@@ -10,6 +10,7 @@ authors:
 - Ewa Czechowska
 - Kevin Dickerson
 - Kyle Sexton
+- Matt Long
 - Michael Glenney
 - Nell Shamrell-Harrington
 - Nick Willever
@@ -40,7 +41,7 @@ cert_chain:
   KucGZX3OeACVUSpmCOCQyma6sDHYWQZM/IgWi7tbLtG5b2GslkauPm4S3wadHi6W
   LOU=
   -----END CERTIFICATE-----
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -278,6 +279,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: inspec
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +347,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.6
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -365,30 +394,50 @@ files:
 - lib/kitchen/verifier/terraform.rb
 - lib/terraform/apply_command.rb
 - lib/terraform/apply_timeout_config.rb
+- lib/terraform/cli_config.rb
 - lib/terraform/client.rb
+- lib/terraform/color_coercer.rb
 - lib/terraform/color_config.rb
-- lib/terraform/color_switch.rb
 - lib/terraform/command.rb
-- lib/terraform/command_executor.rb
-- lib/terraform/command_extender.rb
+- lib/terraform/command_factory.rb
+- lib/terraform/command_option.rb
+- lib/terraform/command_options.rb
 - lib/terraform/configurable.rb
+- lib/terraform/debug_logger.rb
+- lib/terraform/deprecated_output_parser.rb
+- lib/terraform/deprecated_variables_coercer.rb
+- lib/terraform/deprecated_version.rb
+- lib/terraform/destructive_plan_command.rb
 - lib/terraform/directory_config.rb
+- lib/terraform/file_configs.rb
 - lib/terraform/get_command.rb
 - lib/terraform/group.rb
+- lib/terraform/group_attributes.rb
+- lib/terraform/group_hostnames.rb
+- lib/terraform/groups_coercer.rb
 - lib/terraform/groups_config.rb
+- lib/terraform/integer_coercer.rb
+- lib/terraform/no_output_parser.rb
 - lib/terraform/output_command.rb
+- lib/terraform/output_parser.rb
 - lib/terraform/parallelism_config.rb
+- lib/terraform/pathname_coercer.rb
 - lib/terraform/plan_command.rb
-- lib/terraform/plan_config.rb
+- lib/terraform/prepare_input_file.rb
+- lib/terraform/prepare_output_file.rb
+- lib/terraform/project_version.rb
+- lib/terraform/shell_out.rb
 - lib/terraform/show_command.rb
-- lib/terraform/state_config.rb
+- lib/terraform/simple_coercer.rb
+- lib/terraform/simple_config.rb
+- lib/terraform/unsupported_version.rb
 - lib/terraform/validate_command.rb
+- lib/terraform/variable_files_coercer.rb
 - lib/terraform/variable_files_config.rb
+- lib/terraform/variables_coercer.rb
 - lib/terraform/variables_config.rb
 - lib/terraform/version.rb
 - lib/terraform/version_command.rb
-- lib/terraform/zero_seven_output.rb
-- lib/terraform/zero_six_output.rb
 homepage: https://github.com/newcontext-oss/kitchen-terraform
 licenses:
 - Apache-2.0

data/lib/terraform/command_executor.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright 2016 New Context Services, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'kitchen'
-require 'mixlib/shellout'
-
-module Terraform
-  # Behaviour for executing commands
-  module CommandExecutor
-    def execute(command:, timeout: Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
-      command.run logger: logger, timeout: timeout
-      yield command.output if block_given?
-    rescue Errno::EACCES, Errno::ENOENT => error
-      command_error command: command, error: error,
-                    type: Kitchen::InstanceFailure
-    rescue Mixlib::ShellOut::CommandTimeout,
-           Mixlib::ShellOut::ShellCommandFailed => error
-      command_error command: command, error: error,
-                    type: Kitchen::TransientFailure
-    end
-
-    private
-
-    def command_error(command:, error:, type:)
-      raise type, %(`#{command}` failed: "#{error}")
-    end
-  end
-end