rake_terraform 0.33.0 → 0.34.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9a2ecd0ef5a64212110598dec1836b440ab913853d3e18042721fceb54d43cc
-  data.tar.gz: f2cca76f4131b47e6c16feba6881b0add67697dd11da492917e9214c3e0259ef
+  metadata.gz: 0c25ba63bc782a8dd95ad482a42b3a523e6703e387aafd29765d037be9452755
+  data.tar.gz: db7934c9f74eeee6a04162cc6640545b460e1f079f9d9de7042e1ab28118ce86
 SHA512:
-  metadata.gz: 957eddae9ca0028fe0b9acfa82044dccf34292433f6094d18fcaee2eedc09eb0121ef3ebbb47c802c2175ef5810941a79ed87decc0cf146e657c7beec30612ce
-  data.tar.gz: 3aa37887b46635a24ff9a0bb907fbc015f148c9b93142ef014b3a8b22f771afb17acceff8606542e047b0683a28a97db1e7a3a98373dc6602c3c990fd092c5d5
+  metadata.gz: 477970e38bffedfa3c71155b74ea521aeeea009a451aa880e30057f61aef9aeab8094778ebd543a190750c9862744dfdddc31135859a3890531569e4571ac900
+  data.tar.gz: 18bdc924c3c14a1f952d18174bbaa2795615c788846741c0ec8b74d3279f0125e5b4dd1c9a46793b7e057aebb00555c7bf42f70fa07103e8655d72cbb42b2f37

data/.circleci/config.yml

@@ -3,14 +3,14 @@ jobs:
   test:
     working_directory: ~/rake-terraform
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/steps/test.sh
   prerelease:
     working_directory: ~/rake-terraform
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh
@@ -21,7 +21,7 @@ jobs:
   release:
     working_directory: ~/rake-terraform
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh

data/.ruby-version

@@ -1 +1 @@
-2.4.7
+2.6.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rake_terraform (0.33.0)
+    rake_terraform (0.34.0.pre.1)
       colored2 (~> 3.1)
-      rake_dependencies (~> 0.23)
+      rake_dependencies (~> 1.6)
       ruby-terraform (~> 0.46)
 
 GEM
@@ -30,10 +30,14 @@ GEM
     minitest (5.12.2)
     open4 (1.3.4)
     rake (13.0.0)
-    rake_dependencies (0.23.0)
+    rake_dependencies (1.6.0)
       hamster (~> 3.0)
-      minitar (~> 0.7)
-      rubyzip (>= 1.2.2)
+      minitar (~> 0.9)
+      rake_factory (~> 0.11)
+      rubyzip (~> 2.0)
+    rake_factory (0.11.0)
+      activesupport (~> 5.2)
+      rake (~> 13.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -47,7 +51,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    ruby-terraform (0.46.0)
+    ruby-terraform (0.48.0)
       lino (~> 1.1)
     rubyzip (2.0.0)
     thread_safe (0.3.6)
@@ -67,4 +71,4 @@ DEPENDENCIES
   rspec (~> 3.9)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/lib/rake_terraform/version.rb

@@ -1,3 +1,3 @@
 module RakeTerraform
-  VERSION = "0.33.0"
+  VERSION = "0.34.0.pre.1"
 end

data/lib/rake_terraform.rb

@@ -14,116 +14,129 @@ module RakeTerraform
 
   def self.define_installation_tasks(opts = {})
     logger = opts[:logger] ||
-        Logger.new(STDERR, level: Logger.const_get(ENV['RKTF_LOG'] || 'WARN'))
+        Logger.new(STDERR, level: Logger.const_get(ENV['TF_LOG'] || 'WARN'))
 
     namespace = opts[:namespace] || :terraform
     version = opts[:version] || '0.10.3'
     path = opts[:path] || File.join(Dir.pwd, 'vendor', 'terraform')
     providers = opts[:providers] || []
 
-    RubyTerraform.configure do |c|
-      c.binary = File.join(path, 'bin', 'terraform')
-    end
-    RakeDependencies::Tasks::All.new do |t|
-      t.namespace = namespace
-      t.dependency = 'terraform'
-      t.version = version
-      t.path = path
-      t.type = :zip
+    command_task_set_opts = {
+        namespace: namespace,
+        dependency: 'terraform',
+        version: version,
+        path: path,
+        type: :zip,
 
-      t.os_ids = {mac: 'darwin', linux: 'linux'}
+        os_ids: {mac: 'darwin', linux: 'linux'},
 
-      t.uri_template =
-          'https://releases.hashicorp.com/terraform/<%= @version %>/' +
-              'terraform_<%= @version %>_<%= @os_id %>_amd64<%= @ext %>'
-      t.file_name_template =
-          'terraform_<%= @version %>_<%= @os_id %>_amd64<%= @ext %>'
+        uri_template:
+            'https://releases.hashicorp.com/terraform/<%= @version %>/' +
+                'terraform_<%= @version %>_<%= @os_id %>_amd64<%= @ext %>',
+        file_name_template:
+            'terraform_<%= @version %>_<%= @os_id %>_amd64<%= @ext %>',
 
-      t.needs_fetch = lambda do |parameters|
-        terraform_binary = File.join(
-            parameters[:path],
-            parameters[:binary_directory],
-            'terraform')
-        version_string = StringIO.new
+        needs_fetch: lambda { |params|
+          terraform_binary = File.join(
+              params.path, params.binary_directory, 'terraform')
+          version_string = StringIO.new
 
-        logger.info("Terraform binary should be at: #{terraform_binary}")
+          logger.info("Terraform binary should be at: #{terraform_binary}")
 
-        if File.exist?(terraform_binary)
-          command_line = Lino::CommandLineBuilder.for_command(terraform_binary)
-              .with_flag('-version')
-              .build
+          if File.exist?(terraform_binary)
+            command_line = Lino::CommandLineBuilder
+                .for_command(terraform_binary)
+                .with_flag('-version')
+                .build
 
-          logger.info(
-              'Fetching terraform version information using command: ' +
-                  "#{command_line}")
+            logger.info(
+                'Fetching terraform version information using command: ' +
+                    "#{command_line}")
 
-          command_line.execute(stdout: version_string)
+            command_line.execute(stdout: version_string)
 
-          logger.info(
-              "Terraform version information is: \n#{version_string.string}")
+            logger.info(
+                "Terraform version information is: \n#{version_string.string}")
 
-          version_line = version_string.string.lines.first
-          version_is_correct = version_line =~ /#{version}/
+            version_line = version_string.string.lines.first
+            version_is_correct = version_line =~ /#{version}/
 
-          logger.debug(
-              "Version: '#{version}' is in version line: '#{version_line}'?: " +
-                  "#{version_is_correct}")
+            logger.debug(
+                "Version: '#{version}' is in version line: " +
+                    "'#{version_line}'?: #{version_is_correct}")
 
-          return !version_is_correct
-        end
+            return !version_is_correct
+          end
 
-        return true
-      end
+          return true
+        }
+    }
+
+    RubyTerraform.configure do |c|
+      c.binary = File.join(path, 'bin', 'terraform')
     end
-    providers.each do |provider|
+
+    command_task_set = RakeDependencies::TaskSets::All
+        .define(command_task_set_opts)
+
+    provider_task_sets = providers.map do |provider|
       dependency = "terraform-provider-#{provider[:name]}"
+      provider_task_set_opts = {
+          namespace: provider[:name],
+          dependency: dependency,
+          version: provider[:version],
+          path: provider[:path] || File.join('vendor', dependency),
+          type: :tar_gz,
 
-      Rake.application.in_namespace namespace do
-        Rake.application.in_namespace :providers do
-          RakeDependencies::Tasks::All.new do |t|
-            t.namespace = provider[:name]
-            t.dependency = dependency
-            t.version = provider[:version]
-            t.path = provider[:path] || File.join('vendor', dependency)
-            t.type = :tar_gz
+          os_ids: {mac: 'darwin', linux: 'linux'},
 
-            t.os_ids = {mac: 'darwin', linux: 'linux'}
+          uri_template:
+              "https://github.com/#{provider[:repository]}/releases/" +
+                  "download/<%= @version %>/" +
+                  "#{dependency}_v<%= @version %>_<%= @os_id %>" +
+                  "_amd64<%= @ext %>",
+          file_name_template:
+              "#{dependency}_v<%= @version %>_<%= @os_id %>_amd64<%= @ext %>",
 
-            t.uri_template =
-                "https://github.com/#{provider[:repository]}/releases/" +
-                    "download/<%= @version %>/" +
-                    "#{dependency}_v<%= @version %>_<%= @os_id %>" +
-                    "_amd64<%= @ext %>"
-            t.file_name_template =
-                "#{dependency}_v<%= @version %>_<%= @os_id %>_amd64<%= @ext %>"
+          source_binary_name_template: dependency,
+          target_binary_name_template: "#{dependency}_v<%= @version %>",
 
-            t.source_binary_name_template = dependency
-            t.target_binary_name_template = "#{dependency}_v<%= @version %>"
+          installation_directory: "#{ENV['HOME']}/.terraform.d/plugins",
 
-            t.installation_directory = "#{ENV['HOME']}/.terraform.d/plugins"
+          needs_fetch: lambda { |params|
+            provider_binary = File.join(
+                params.path,
+                params.binary_directory,
+                "#{dependency}_v#{params.version}")
 
-            t.needs_fetch = lambda do |parameters|
-              provider_binary = File.join(
-                  parameters[:path],
-                  parameters[:binary_directory],
-                  "#{dependency}_v#{parameters[:version]}")
+            logger.info(
+                "Terraform provider binary for: #{provider.name} " +
+                    "should be at: #{provider_binary}")
 
-              logger.info(
-                  "Terraform provider binary for: #{provider[:name]} " +
-                      "should be at: #{provider_binary}")
+            binary_exists = File.exists?(provider_binary)
 
-              binary_exists = File.exists?(provider_binary)
+            logger.debug("Provider file exists?: #{binary_exists}")
 
-              logger.debug("Provider file exists?: #{binary_exists}")
+            !binary_exists
+          }
+      }
 
-              !binary_exists
-            end
-          end
+      provider_task_set = RakeDependencies::TaskSets::All.new(
+          provider_task_set_opts)
+
+      Rake.application.in_namespace namespace do
+        Rake.application.in_namespace :providers do
+          provider_task_set.define_on(Rake.application)
         end
       end
+
+      provider_task_set
     end
+
     Rake::Task["#{namespace}:ensure"]
-        .enhance(providers.map {|provider|
-          "#{namespace}:providers:#{provider[:name]}:ensure"})
+        .enhance(providers.map { |provider|
+          "#{namespace}:providers:#{provider[:name]}:ensure" })
+
+    return command_task_set, provider_task_sets
   end
 end

data/rake_terraform.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4.7'
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'rake_dependencies', '~> 0.23'
+  spec.add_dependency 'rake_dependencies', '~> 1.6'
   spec.add_dependency 'ruby-terraform', '~> 0.46'
   spec.add_dependency 'colored2', '~> 3.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_terraform
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: ruby-terraform
   requirement: !ruby/object:Gem::Requirement
@@ -202,14 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.7
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks for running terraform.