terradactyl 0.15.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1878fa2dfe8685f8e0328afda2940e4a5662d9295bb3369a2fd8f2bf4c9ab88
-  data.tar.gz: 3f2412d3d987a3fc8881294676f8a435d09f00088f31c826719aa31a66872168
+  metadata.gz: a7426368caebddb37fb99a029fe1868678b88e0fce83bcd57237ec6cd2b78436
+  data.tar.gz: 66d09971c29d06d319217b8bc9f42e1ad0af72e368e305a3903d140336f56e6d
 SHA512:
-  metadata.gz: 291474a3c77936a5245f7603ff2f4667f86e15485b7f26632c3b4e8d4c0ca5c92248597cc4a0a8d272c0ac817a2f3d7e8a5356ffd7a4be5492c9901cd12cf628
-  data.tar.gz: 5627523418cca7084a30a03f757dcf49a0d628b94c013c87b46279eca181b80856b4e5a064d0aa38c2d57cb97692f6d140878a04662de933e71cd87ab644675d
+  metadata.gz: 5782c0b917da8da15b6dab9dbe539de241b72b692ef52a9c9c328b34fd3a79999cac64ad0420db3fa4eaff9b208f5eddccdc201829164ff98f985d52e2a5afb2
+  data.tar.gz: 986f5d0e48a595ff800fa98cc542c7d337be11cf6bc22fdca6c1f4419938e88da4e54b64f2d8002abdc87d0c423417b2745f3c536c4c38f642476249f6c07766

data/.rubocop.yml

@@ -10,6 +10,8 @@ Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/ClassLength:
   Max: 115
+Naming/ClassAndModuleCamelCase:
+  Enabled: false
 Naming/UncommunicativeMethodParamName:
   MinNameLength: 2
 Style/IfUnlessModifier:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.0.0 (2021-06-09)
+
+NEW FEATURES:
+
+* add support for Terraform version `~> 1.0.0`
+
+BUG FIXES:
+
+* fix bad test matrix
+
 ## 0.15.3 (2021-05-14)
 
 BUG FIXES:

data/lib/terradactyl/commands.rb

@@ -98,8 +98,8 @@ module Terradactyl
       end
 
       def revision_constant(tf_version)
-        revision_name = ['Rev', *tf_version.split('.').take(2)].join
-        const_get(revision_name)
+        revision = Terradactyl::Terraform.calc_revision(tf_version)
+        const_get(revision)
       end
     end
 
@@ -387,6 +387,22 @@ module Terradactyl
         Terraform::Rev015::PlanFileParser
       end
     end
+
+    module Rev1_00
+      class << self
+        def upgradeable?
+          false
+        end
+      end
+
+      include Terraform::Commands
+
+      private
+
+      def parser
+        Terraform::Rev1_00::PlanFileParser
+      end
+    end
   end
   # rubocop:enable Metrics/ModuleLength
 end

data/lib/terradactyl/config.rb

@@ -177,14 +177,20 @@ module Terradactyl
     private
 
     def terraform_required_version
-      matches = TERRAFORM_SETTINGS_FILES.map do |file|
+      matches = TERRAFORM_SETTINGS_FILES.each_with_object([]) do |file, memo|
         path = File.join(stack_path, file)
-        if File.exist?(path)
-          File.read(path).match(Common.required_versions_re)
+        next unless File.exist?(path)
+
+        File.readlines(path).each do |line|
+          next if line =~ /(?:\s*#\s*)/
+
+          if (match = line.match(Common.required_versions_re))
+            memo << match
+          end
         end
       end
 
-      return {} unless matches.compact!.any?
+      return {} unless matches.any?
 
       {
         'terradactyl' => {

data/lib/terradactyl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Terradactyl
-  VERSION = '0.15.3'
+  VERSION = '1.0.0'
 end

data/terradactyl.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deep_merge', '~> 1.2'
   spec.add_dependency 'bundler', '>= 1.16'
   spec.add_dependency 'rake', '>= 10.0'
-  spec.add_dependency 'terradactyl-terraform', '>= 0.15.0'
+  spec.add_dependency 'terradactyl-terraform', '>= 1.0.0'
 
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry', '~> 0.12'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terradactyl
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Brian Warsing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement