rake_terraform 1.22.0.pre.2 → 1.22.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89ca3f0ef39f03aa9c1768bce8b6d50c9801b891ab31d8eb7ce356640a250e2
-  data.tar.gz: c6f164843565abc7ec38f081edd17de40037c0503302b130853185af337f9d46
+  metadata.gz: 18f38b5d9da5b0724463e7a05f4beb1db015efe9776c3ccca3a6200ad77d16bf
+  data.tar.gz: 27ba875bdcf6c4d9584662a7eabf8dcd5a51ceefd063c5e23a646dab84b9834b
 SHA512:
-  metadata.gz: 513db5d1d7bc9c9816350065bf5dd0d8c4f1a18b0b2cef82ed9376228f3275303f4b47828ecd36f1680dd66aff681a73f905ca770b5381b6bfc1dff254a1924a
-  data.tar.gz: 31f49208f5f8d444227455631b24f445e9286185278b66cce5582f88236a8a3b1252b1dd7f6e8c2d7d00d079792c3799964181ee5d4c0770adf08a00f75b08b6
+  metadata.gz: 44dcb1f42fcbe59dbd26fe2b7aafee737d4c75d142c7fc9efbf0d1ecf343ce8571058076a1f86f483325b7f1b8ab0f9a55833ad326fe4f1a56561871d6247837
+  data.tar.gz: e08ae2e7e7d08bb22cd446b28813ce6ca5d6a4c2f930ffd63a22bd076b7950543ae8d43e76fa1181737cbf737147bb2a3ecd11d4f6938bf7acb413b287b6ba30

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rake_terraform (1.22.0.pre.2)
+    rake_terraform (1.22.0.pre.3)
       colored2 (~> 3.1)
-      rake_dependencies (~> 2.11)
+      rake_dependencies (= 3.0.0.pre.2)
       rake_factory (~> 0.23)
       ruby-terraform (~> 1.4)
 
@@ -103,7 +103,7 @@ GEM
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_dependencies (2.13.0)
+    rake_dependencies (3.0.0.pre.2)
       hamster (~> 3.0)
       minitar (~> 0.9)
       rake_factory (~> 0.23)

data/lib/rake_terraform/task_sets/provider.rb

@@ -15,9 +15,10 @@ module RakeTerraform
 
       def initialize(*args, &configuration_block)
         @opts = args[0]
-        @delegate = RakeDependencies::TaskSets::All.new(
-          task_set_opts, &configuration_block
-        )
+        @delegate =
+          RakeDependencies::TaskSets::All.new(
+            task_set_opts, &configuration_block
+          )
       end
 
       def define_on(application)
@@ -41,7 +42,8 @@ module RakeTerraform
           path: path,
           type: type,
 
-          os_ids: os_ids,
+          platform_os_names: platform_os_names,
+          platform_cpu_names: platform_cpu_names,
 
           uri_template: uri_template,
           file_name_template: file_name_template,
@@ -108,21 +110,38 @@ module RakeTerraform
         @type ||= :tar_gz
       end
 
-      def os_ids
-        @os_ids ||= { mac: 'darwin', linux: 'linux' }
+      def platform_os_names
+        @platform_os_names ||= {
+          darwin: 'darwin',
+          linux: 'linux',
+          mswin32: 'windows',
+          mswin64: 'windows'
+        }
+      end
+
+      # rubocop:disable Naming/VariableNumber
+      def platform_cpu_names
+        @platform_cpu_names ||= {
+          x86_64: 'amd64',
+          x86: '386',
+          x64: 'amd64',
+          arm64: 'arm64'
+        }
       end
+      # rubocop:enable Naming/VariableNumber
 
       def uri_template
         @uri_template ||=
           "https://github.com/#{repository}/releases/" \
           'download/<%= @version %>/' \
-          "#{dependency}_v<%= @version %>_<%= @os_id %>" \
-          '_amd64<%= @ext %>'
+          "#{dependency}_v<%= @version %>_" \
+          '<%= @platform_os_name %>_<%= @platform_cpu_name %><%= @ext %>'
       end
 
       def file_name_template
         @file_name_template ||=
-          "#{dependency}_v<%= @version %>_<%= @os_id %>_amd64<%= @ext %>"
+          "#{dependency}_v<%= @version %>_" \
+          '<%= @platform_os_name %>_<%= @platform_cpu_name %><%= @ext %>'
       end
 
       def source_binary_name_template

data/lib/rake_terraform/task_sets/terraform.rb

@@ -42,7 +42,8 @@ module RakeTerraform
           path: path,
           type: type,
 
-          os_ids: os_ids,
+          platform_os_names: platform_os_names,
+          platform_cpu_names: platform_cpu_names,
 
           uri_template: uri_template,
           file_name_template: file_name_template,
@@ -91,19 +92,37 @@ module RakeTerraform
         @type ||= :zip
       end
 
-      def os_ids
-        @os_ids ||= { mac: 'darwin', linux: 'linux' }
+      def platform_os_names
+        @platform_os_names ||= {
+          darwin: 'darwin',
+          linux: 'linux',
+          mswin32: 'windows',
+          mswin64: 'windows'
+        }
+      end
+
+      # rubocop:disable Naming/VariableNumber
+      def platform_cpu_names
+        @platform_cpu_names ||= {
+          x86_64: 'amd64',
+          x86: '386',
+          x64: 'amd64',
+          arm64: 'arm64'
+        }
       end
+      # rubocop:enable Naming/VariableNumber
 
       def uri_template
         @uri_template ||=
           'https://releases.hashicorp.com/terraform/<%= @version %>/' \
-          'terraform_<%= @version %>_<%= @os_id %>_amd64<%= @ext %>'
+          'terraform_<%= @version %>_' \
+          '<%= @platform_os_name %>_<%= @platform_cpu_name %><%= @ext %>'
       end
 
       def file_name_template
         @file_name_template ||=
-          'terraform_<%= @version %>_<%= @os_id %>_amd64<%= @ext %>'
+          'terraform_<%= @version %>_' \
+          '<%= @platform_os_name %>_<%= @platform_cpu_name %><%= @ext %>'
       end
 
       def needs_fetch

data/lib/rake_terraform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RakeTerraform
-  VERSION = '1.22.0.pre.2'
+  VERSION = '1.22.0.pre.3'
 end

data/rake_terraform.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'colored2', '~> 3.1'
-  spec.add_dependency 'rake_dependencies', '~> 2.11'
+  spec.add_dependency 'rake_dependencies', '3.0.0.pre.2'
   spec.add_dependency 'rake_factory', '~> 0.23'
   spec.add_dependency 'ruby-terraform', '~> 1.4'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_terraform
 version: !ruby/object:Gem::Version
-  version: 1.22.0.pre.2
+  version: 1.22.0.pre.3
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -28,16 +28,16 @@ dependencies:
   name: rake_dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.0.0.pre.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.0.0.pre.2
 - !ruby/object:Gem::Dependency
   name: rake_factory
   requirement: !ruby/object:Gem::Requirement