guard-terraform 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca3ea8a74f9eff42a135900b1365b7ef91ad4d8ab8a8860bb67478e7518be6e2
-  data.tar.gz: a31ec380ad1a26eae1e58a068aa9b9ca36bf65c6f14ab34808cab3bc1ccd9317
+  metadata.gz: 42c6614a4b4d8c9de19825c6e3959c392f4edb8f2641e48658873db3642bb3a4
+  data.tar.gz: 57595bd4449cbcf06851508175c80217bd7d91ad490726df0af08890385f9ccc
 SHA512:
-  metadata.gz: fc02153c09113c7b6c7d6b45c8ad94b3cb2bba8e551ec7178bbcd6f62125ea667e950949735b505c0b9a83d8120ee03a7f56c485490b4d2a91de982fc0b598bb
-  data.tar.gz: 39c791ea2b260282696c1c6495f00df39cf322a8ccf57c89702096e44c53290e755c7e06de003f7bd1148c95a5c2b4a597c6022d903d9608004c1ccf28b1e13f
+  metadata.gz: 2e324f81d68630ff90790c0cccf1bd5cd894f3fb6de1194fbd9828358d2b21ca21e01347ee8a460a372e85d58166f3890a53df3c5f1ad67e5531307554e9eb59
+  data.tar.gz: d1dc22204bf90613e249ad37c3a0d90f5696ead97b7f5d5a95a8b0804d28c656a355eef214b3e731638244d1fc25ad03e3bcfcc59a41149b618d912f8b412ec2

data/lib/guard/terraform/version.rb

@@ -3,6 +3,6 @@
 module Guard
   # Use own namespace to avoid inheriting from `Guard::Plugin`
   module TerraformVersion
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/guard/terraform.rb

@@ -18,7 +18,8 @@ module Guard
       write:        false,  # fix the formatting instead of just verifying?
     }.freeze
 
-    attr_reader :options, :terraform, :tf_flags
+    attr_reader :options
+    attr_reader :terraform, :tf_flags
 
     def initialize(**options)
       super
@@ -49,13 +50,19 @@ module Guard
     end
 
     def run_all
+      paths = ['.']
+      extra_flags = {}
+
       if terraform.pre_0_12?
         # Terraform v<0.12 does not check *.tfvars by default,
-        # so collect them to the list, too
-        run(all_tf_files)
+        # so find and check them separately
+        paths += terraform.find_tfvars_files
       else
-        run('.', recursive: true)
+        # Terraform 0.12+ does not check recursively by default
+        extra_flags[:recursive] = true
       end
+
+      run(paths, extra_flags)
     end
 
     def run_on_modifications(paths)
@@ -65,10 +72,11 @@ module Guard
     alias run_on_additions run_on_modifications
 
     def run(paths, **extra_flags)
+      print_pre_run_message(paths)
+
       flags = tf_flags.merge(extra_flags)
 
-      result = terraform.fmt(paths, flags) do |path, cmd|
-        UI.info("#{flags[:write] ? 'Enforcing' : 'Inspecting'} Terraform formatting: #{path}")
+      result = terraform.fmt(paths, flags) do |_, cmd|
         UI.debug(Shellwords.join(cmd))
       end
 
@@ -78,6 +86,21 @@ module Guard
       throw(:task_has_failed)
     end
 
+    def print_pre_run_message(paths)
+      @msg_format ||= "#{options[:write] ? 'Enforcing' : 'Inspecting'} " \
+                      'Terraform formatting for %s'
+
+      target = if paths.count > 1
+                 "#{paths.count} files or dirs"
+               elsif paths.first == '.'
+                 'the whole project'
+               else
+                 paths.first
+               end
+
+      UI.info(format(@msg_format, target))
+    end
+
     def notify_failure
       Notifier.notify(
         'Terraform format check failed',
@@ -86,11 +109,6 @@ module Guard
       )
     end
 
-    # Returns list of all Terraform files
-    def all_tf_files
-      Dir['**/*.{tf,tfvars}']
-    end
-
     # Terraform 0.12+ only supports checking directories,
     # older versions accept also files
     def mungle_paths(paths)

data/lib/terraform.rb

@@ -31,6 +31,14 @@ class Terraform
     VersionRequirement.new('< 0.12.0-alpha').satisfied_by?(version)
   end
 
+  # Finds all *.tfvars files recursively in the given directory,
+  # or current working directory if not specified.
+  def find_tfvars_files(dir = nil, &block)
+    dir = "#{dir}/" if dir && !dir.empty? && dir[-1] != '/'
+
+    Dir.glob("#{dir}**/*.tfvars", &block)
+  end
+
   # Returns `Array` of CLI flags for Terraform
   # E.g. `{ foo: true, bar: 'baz' }` -> `[ '-foo=true', '-bar=baz' ]`
   def cli_flags(**flags)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-terraform
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Teemu Matilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard