terradactyl-terraform 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9dda13855bb6517d2e7fe5a31dc7f2d78b67bbe00a7aa891abd43eb3d857ffd
-  data.tar.gz: 6b14fdf2b3c5dfa2a395814dd4161af2ef926b8577f96f0f09c812df3bf54bd1
+  metadata.gz: 11e631baa96e27046b275f81bac0278e8de6df12fe6faad1e23f8183843dc883
+  data.tar.gz: 6c4e638624c37e240ed580dca0f2cfa2b2a63b1fb4383b7839c6ea87cf6c2b66
 SHA512:
-  metadata.gz: a0789fe7856b3eab604b13dc2d9a35e9f90a5ad8d3c314958f73792e2ef8ea58db946dd1c3a14662f723353ebf4cbbe9ee060202e12ecd358a75fee8fd0ec9df
-  data.tar.gz: 1cc92cb6b6e47f32778e1b75d68114574dd5a1db6db1d5f96482a48c77ff93439054f3ff66f9d6fd050eb5b94a343364e6d5bef335efc56c6ec1ba8c83af470f
+  metadata.gz: 974e91a4fda13702ddf1607b1d0e6324d39e186fca52937be86a1d48cf6163623013bb432ac63b5baa98f754f245c27a27cb4dc25c8d927ed2e6135e8f3e9604
+  data.tar.gz: ae52c3bebfbed294a3aa9556559e48df250a8b8ac37bf572285b082370a039a8fb89413493f59ac66c3b24470a46c27fc340e6cfb0a30fe5af66c4a4c7b06c5e

data/.gitignore

@@ -8,6 +8,7 @@ Gemfile.lock
 /spec/reports/
 /tmp/
 vendor
+.DS_Store
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # CHANGELOG
 
+## 1.2.1 (2022-06-13)
+
+BUG FIX:
+
+* differentiate between `arm` and `arm64` architectures
+  * fixes binary downloader on Apple silicon
+
+MISCELLANEOUS: 
+
+* Add `.DS_Store` to `.gitignore`
+
+## 1.2.0 (2022-05-18)
+
+NEW FEATURES:
+
+* add support for Terraform version `~> 1.2.0`
+* Update lib/terradactyl/terraform/commands/destroy.rb (add Rev1_02)
+* Update lib/terradactyl/terraform/commands/init.rb (add Rev1_02)
+* Update spec/fixtures/stacks (add rev1_02)
+* Update spec/helpers.rb (add rev1_02)
+
+## 1.1.2 (2022-01-03)
+
+BUG FIXES:
+
+* fix calculation of latest version
+* fix failing tests
+
 ## 1.1.0 (2021-12-09)
 
 NEW FEATURES:

data/lib/terradactyl/terraform/commands/destroy.rb

@@ -62,6 +62,12 @@ module Terradactyl
       end
     end
 
+    module Rev1_02
+      module Destroy
+        include Terradactyl::Terraform::Rev015::Destroy
+      end
+    end
+
     module Commands
       class Destroy < Base
       end

data/lib/terradactyl/terraform/commands/init.rb

@@ -59,6 +59,12 @@ module Terradactyl
       end
     end
 
+    module Rev1_02
+      module Init
+        include Terradactyl::Terraform::Rev015::Init
+      end
+    end
+
     module Commands
       class Init < Base
       end

data/lib/terradactyl/terraform/planfile.rb

@@ -108,6 +108,11 @@ module Terradactyl
       end
     end
 
+    module Rev1_02
+      class PlanFileParser < Rev012::PlanFileParser
+      end
+    end
+
     module Rev011
       class PlanFileParser < Rev012::PlanFileParser
         def checksum

data/lib/terradactyl/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module Terradactyl
   module Terraform
-    VERSION = '1.1.0'
+    VERSION = '1.2.1'
   end
 end

data/lib/terradactyl/terraform/version_manager/defaults.rb

@@ -4,16 +4,15 @@ module Terradactyl
   module Terraform
     module VersionManager
       class Defaults
-        DEFAULT_INSTALL_DIR   = Gem.bindir
-        DEFAULT_DOWNLOADS_URL = 'https://www.terraform.io/downloads.html'
-        DEFAULT_RELEASES_URL  = 'https://releases.hashicorp.com/terraform'
-        DEFAULT_VERSION       = nil
+        DEFAULT_INSTALL_DIR  = Gem.bindir
+        DEFAULT_RELEASES_URL = 'https://releases.hashicorp.com/terraform'
+        DEFAULT_VERSION      = nil
 
         def self.load
           new
         end
 
-        attr_reader :version, :install_dir, :downloads_url, :releases_url
+        attr_reader :version, :install_dir, :releases_url
 
         def initialize
           load_defaults
@@ -31,10 +30,6 @@ module Terradactyl
           @install_dir = validate_path(option) || DEFAULT_INSTALL_DIR
         end
 
-        def downloads_url=(option)
-          @downloads_url = validate_url(option) || DEFAULT_DOWNLOADS_URL
-        end
-
         def releases_url=(option)
           @releases_url = validate_url(option) || DEFAULT_RELEASES_URL
         end
@@ -66,7 +61,6 @@ module Terradactyl
 
         def load_defaults
           @install_dir   = DEFAULT_INSTALL_DIR
-          @downloads_url = DEFAULT_DOWNLOADS_URL
           @releases_url  = DEFAULT_RELEASES_URL
           @version       = DEFAULT_VERSION
         end

data/lib/terradactyl/terraform/version_manager/package.rb

@@ -10,8 +10,10 @@ module Terradactyl
             'amd64'
           when /i?86|x86|i86pc/
             '386'
-          when /^arm/
+          when /^arm$/
             'arm'
+          when /^arm64/
+            'arm64'
           else
             raise "FATAL: Unsupported CPU arch, #{value}"
           end
@@ -36,10 +38,6 @@ module Terradactyl
           end
         end
 
-        def downloads_url
-          VersionManager.downloads_url
-        end
-
         def releases_url
           VersionManager.releases_url
         end

data/lib/terradactyl/terraform/version_manager.rb

@@ -31,8 +31,7 @@ module Terradactyl
       class << self
         extend Forwardable
 
-        def_delegators :@options, :version, :version=, :install_dir,
-                       :install_dir=, :downloads_url, :downloads_url=,
+        def_delegators :@options, :version, :version=, :install_dir, :install_dir=,
                        :releases_url, :releases_url=, :reset!
 
         def_delegators :@inventory, :[], :binaries, :any?
@@ -153,6 +152,9 @@ module Terradactyl
           fh = Downloader.fetch(releases_url)
           re = /terraform_(?<version>\d+\.\d+\.\d+(-\w+)?)/
           fh.read.scan(re).flatten.sort_by { |v| Gem::Version.new(v) }
+        ensure
+          fh.close
+          fh.unlink
         end
 
         def pessimistic_max(version)
@@ -163,12 +165,7 @@ module Terradactyl
         end
 
         def calculate_latest
-          fh = Downloader.fetch(downloads_url)
-          re = %r{#{releases_url}\/(?<version>\d+\.\d+\.\d+)}
-          fh.read.match(re)['version']
-        ensure
-          fh.close
-          fh.unlink
+          remote_versions.reject { |e| e =~ /\d+\.\d+\.\d+-/ }.last
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terradactyl-terraform
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brian Warsing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip