rake-terraform 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzQ2MGQyYjFkMTUzMGUwOTdkZGMzNzRkYmRiOTMzMjE5MGQ3NWMyNw==
+    ODNkNmUyNTk3ZWRiZDY4NTFjMjJmN2QwYWFjNTk3ODJlMmE3Y2I0YQ==
   data.tar.gz: !binary |-
-    MGNhYmQwMWM5MDIyZGRiOGQ3ZTUyNDBkZDg5NDFjZWEyY2I5ZmEwOA==
+    ZTg2NTNhODcyZDU2M2JjMGJhMDllYTMxMGJiNjQ4NTk3NTJkOWVjNA==
 SHA512:
   metadata.gz: !binary |-
-    YWExY2YzZmUxNzgyYzRmOGM5N2VmZjc0M2ZjMWFkNjZlYjg4MmIzZGJiNjgw
-    MTFhMjFkODZlODg4ODQ2ODU5MjkwOTAwY2ViNzdhOWViZDRjOTUwMjk0NTE3
-    MTMyZTE4NTU2N2ZkMjFiYjJjYzBhOGQ5ZGRiN2U3YWY2YmFmYzU=
+    OGFhNTBiNTgwYmIzODRhZjhmZWU2YTE0NzdjZDFiNTA3YjgxNTlhMDNlMWQ1
+    OGM3NjQ4MDg1OWUxMjEwZWVkNTNjZjc4ODkzYWY0ZTI2YzE3MzEwY2Q4MGUw
+    ZTMwMTBkNjA0ZjY5NGVjYjliYjY4ZWJjY2Y2NzdlYjY1MjhlYmY=
   data.tar.gz: !binary |-
-    NzNiNmVjM2RhNGNkZmNjZWQ2NDRhYjdhNThiYWRiNGQ5Y2Q0MzgzYjY3MmY0
-    MjgyN2E0MmU4Y2U1OWE5ZTc4MDJkYzc2NDY5NTgzYTRiZWYwZTE4ZjQxMTNj
-    NmFjMTliNjkxYTM5NDgxMzcwNDU0MTk3YzM1N2Q2ZWRhNzczNTY=
+    NjVkNTgzZjE4MjVjNDRlNTBkMjJlNjg4ODc1MDE4ODg5NzQ2NGYzYmVhYzRi
+    MDYwZDVkNDY3Njc3YTZmYTkwZGYxZjM1ZTg5M2M2NGFiMDI0YzI4MWE3ZmEx
+    MmRhMTA3ODhjOWUzYzg3YjI5YWUwZTYzYjYzNDJlNTZlOWY1OGQ=

data/lib/rake-terraform/default_tasks.rb

@@ -1,4 +1,5 @@
 require 'rake_terraform'
+require 'pathname'
 
 namespace :terraform do
   env_glob = ENV['TERRAFORM_ENVIRONMENT_GLOB'] || 'terraform/**/*.tf'
@@ -9,10 +10,19 @@ namespace :terraform do
   # Set to string 'false' instead of bool so users can more-easily override
   hide_tasks = ENV['TERRAFORM_HIDE_TASKS'] || 'false'
 
+  # Regex to determine the relative root path for env_glob
+  # Might need a more comprehenvise regex to cover all cases
+  # Example Input: test/path to/some-file/**/*.tf
+  # Output: test/path to/some-file/
+  env_root = env_glob.match(%r{^((\w|\s|-)+\/?)+}).to_s
   environments = (Dir.glob env_glob).map { |f| File.dirname f }.uniq
 
   environments.each do |env|
-    short_name = File.basename env
+    relative_to_current = Pathname.new(env)
+    env_glob_root  = Pathname.new(env_root)
+    abs_relative_path = relative_to_current.relative_path_from(env_glob_root)
+
+    short_name = abs_relative_path.to_s.gsub('/', '_')
     plan_path = File.expand_path File.join(output_base, "#{short_name}.tf")
 
     desc "Plan migration of #{short_name}" if hide_tasks == 'false'

data/lib/rake-terraform/version.rb

@@ -1,4 +1,4 @@
 # Version of the gem
 module RakeTerraform
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-terraform
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Norm MacLennan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler