rake_terraform 0.21.1.pre5 → 0.21.1.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a3571480484e19664f5acfad96443b34334d9df411c70bf88c0f40c0e7b529
-  data.tar.gz: a4d35152677843e683f24ac5c2c6f265aebad902e2bc9281f9f2f3f69c71e392
+  metadata.gz: f2496bb28d388840a61a8345f5b36da22a211c05f267743fd2ec9efb83721609
+  data.tar.gz: fbcfdec0df877019c990b6461dc282cd8210f084283af0acf378c18347f06f82
 SHA512:
-  metadata.gz: 3e5b9708013bbf02acb4a9dc1d47579eabf58562307ea9e7c4ccdf2b1342fdba37c935d47a28882f34a729c4d414f3fb19a202077ffac49107d7c4a100bc1729
-  data.tar.gz: 7132d27d1ea92eb1d164f59b30a432b4f5ac1f9cc4f2b5ec1e27658dd37c340030cec0e5665d48132e2b4744a7cfc8c0a690f9c8212fb07b85b46acf1c89dcb3
+  metadata.gz: bf1b7431705d1585b4fe174f036ef8028f0938965be0cffb7d49e087914e7956f46109f0ed608e49dab74c5941df280d45907f9a216a6016ad605ae3dbf11312
+  data.tar.gz: 17477e27a5f053da9e4f685972b0622bcc8f56cb5eaa1dd9fbed4fa03dda4f63c7a9ed94776f66efbc8ab5193e5099aeb7d548b7a0333f92049e2d77d313f738

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_terraform (0.21.1.pre5)
+    rake_terraform (0.21.1.pre6)
       colored2 (~> 3.1)
       rake_dependencies (~> 0.18)
       ruby-terraform (>= 0.11.2)

data/lib/rake_terraform/version.rb

@@ -1,3 +1,3 @@
 module RakeTerraform
-  VERSION = "0.21.1.pre5"
+  VERSION = "0.21.1.pre6"
 end

data/lib/rake_terraform.rb

@@ -13,6 +13,9 @@ module RakeTerraform
   end
 
   def self.define_installation_tasks(opts = {})
+    logger = opts[:logger] ||
+        Logger.new(STDERR, Logger.const_get(ENV['RKTF_LOG'] || 'WARN'))
+
     namespace = opts[:namespace] || :terraform
     version = opts[:version] || '0.10.3'
     path = opts[:path] || File.join('vendor', 'terraform')
@@ -37,16 +40,13 @@ module RakeTerraform
           'terraform_<%= @version %>_<%= @os_id %>_amd64<%= @ext %>'
 
       t.needs_fetch = lambda do |parameters|
-        logger = Logger.new(STDERR)
-        logger.level = Logger.const_get(ENV['RKTF_LOG'] || 'WARN')
-
         terraform_binary = File.join(
             parameters[:path],
             parameters[:binary_directory],
             'terraform')
         version_string = StringIO.new
 
-        logger.debug("Terraform binary is at: #{terraform_binary}")
+        logger.debug("Terraform binary should be at: #{terraform_binary}")
 
         if File.exist?(terraform_binary)
           command_line = Lino::CommandLineBuilder.for_command(terraform_binary)
@@ -62,9 +62,14 @@ module RakeTerraform
           logger.debug(
               "Terraform version information is: \n#{version_string.string}")
 
-          if version_string.string.lines.first =~ /#{version}/
-            return false
-          end
+          version_line = version_string.string.lines.first
+          version_is_correct = version_line =~ /#{version}/
+
+          logger.trace(
+              "Version: '#{version}' is in version line: '#{version_line}'?: " +
+                  "#{version_is_correct}")
+
+          return !version_is_correct
         end
 
         return true
@@ -101,11 +106,20 @@ module RakeTerraform
             t.installation_directory = "#{ENV['HOME']}/.terraform.d/plugins"
 
             t.needs_fetch = lambda do |parameters|
-              !File.exists?(
-                  File.join(
-                      parameters[:path],
-                      parameters[:binary_directory],
-                      "#{dependency}_v#{parameters[:version]}"))
+              provider_binary = File.join(
+                  parameters[:path],
+                  parameters[:binary_directory],
+                  "#{dependency}_v#{parameters[:version]}")
+
+              logger.debug(
+                  "Terraform provider binary for: #{name} should be at: " +
+                      terraform_binary)
+
+              binary_exists = File.exists?(provider_binary)
+
+              logger.trace("Provider file exists?: #{binary_exists}")
+
+              !binary_exists
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_terraform
 version: !ruby/object:Gem::Version
-  version: 0.21.1.pre5
+  version: 0.21.1.pre6
 platform: ruby
 authors:
 - Toby Clemson