rake-terraform 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWE5MWZmZDg3OGZlNWE4YmNkNmVhY2U3NTFkZGFmODhiMGMzOWE1MA==
+    MTlhYzI2MGMxMjE4ZjNkMThlZDFjOWUxYzM5OWYyZjRlOWI2NDFlZg==
   data.tar.gz: !binary |-
-    NjA1MWMyZjY1YjljN2U0NjM3MTY3OTM2Y2I0YzlmNTQ4NzhhOTAyNA==
+    OTc5NDMzZDA3YzEzMWY1OGU3ZGE4ZDA2M2IzMzU5NmI0YjgzZGRlMQ==
 SHA512:
   metadata.gz: !binary |-
-    YTFkNjY4MjY4MDkxNjNmZWNhYTQ1YTVmYWY4NWFhODkxYWY2YjJjZWE0YjM0
-    ZjEwMjE3M2YzMjc1NDU4ZjU0N2Y5YjQ3NDAzYTc2ODUwOWU0OGI4NGE2ZjE2
-    YmQzMWEwZWJkOWQwMmIxMTQyYmE4NmM5ODY0MDM3MWNiOWM2ZjE=
+    YzM0ZGIyOGRjZmJmNmI5OTc0Njk3ZTJjMzExN2M4ZDhiMWZmMWQ3ZTFiYTYx
+    MWVjN2U0ZWJiYTg0NDQ5MWUxZDg2N2Y0NWU3MWNlZGU3NGI0NTA1YjgyMTVj
+    N2NlMzgzNjVkNzhkNjliYzQ5ZmIwMWM5YTQxZTVlYjgwNzA0MWI=
   data.tar.gz: !binary |-
-    NDJmZDc5YjE2YTQwMTVmMTU0NjJiYTQ4Y2ZjZGUxOWNlMWY2YTZjMWEwNDY5
-    YmYwZmU2ZjEzNjNmMmU5YzQyNmJiMzIwMzllYmY0N2M0MTE1MWI0MDY0NmZm
-    N2NkYWMxZDE5ZmQ1YzZmYmFlMTU0ZjYzNWJiOGQ1YWY5MjFmZjc=
+    MDVjMDQ3NzUyNTVkZDQyYWYyN2U3NzcyNzBiY2UzN2VmNjBlZDdiY2FjOWRk
+    MzBmMjMxMzFjNDg0MjQyOWJhZDdiNDkwZWRlZjYyYTFiYThkNTJiOWQzZDE3
+    ZDQ5YjJjZGQ2ZTU3Y2IwOTk5OTc5NmJmN2EzOTllNmY2MTI0YjQ=

data/lib/rake-terraform/apply_task/task.rb

@@ -36,7 +36,7 @@ module RakeTerraform
       end
 
       def ensure_plan_exists(plan)
-        fail "Plan #{plan} does not exist! Aborting!" unless File.exist? plan
+        raise "Plan #{plan} does not exist! Aborting!" unless File.exist? plan
       end
     end
   end

data/lib/rake-terraform/basetask.rb

@@ -8,7 +8,7 @@ module RakeTerraform
   class BaseTask < Rake::Task
     def validate_terraform_installed
       error = 'Please ensure you have terraform installed and on your path!'
-      fail TerraformNotInstalled, error unless terraform_installed?
+      raise TerraformNotInstalled, error unless terraform_installed?
     end
 
     def terraform_installed?
@@ -20,9 +20,9 @@ module RakeTerraform
 
     def get_aws_credentials(creds_file, project = 'default')
       error = "Could not locate AWS credentials in #{creds_file}!"
-      fail error unless File.exist? creds_file
+      raise error unless File.exist? File.expand_path(creds_file)
 
-      credentials = IniParse.parse(File.read(creds_file))
+      credentials = IniParse.parse(File.read(File.expand_path(creds_file)))
       { accesskey: credentials[project]['aws_access_key_id'],
         secretkey: credentials[project]['aws_secret_access_key'] }
     end

data/lib/rake-terraform/dsl.rb

@@ -2,8 +2,6 @@ require 'rake'
 
 # Rake terraform
 module RakeTerraform
-  private
-
   # Definitions of methods for custom rake tasks
   module DSL
     def terraform_plan(*args)

data/lib/rake-terraform/env_process.rb

@@ -30,7 +30,7 @@ module RakeTerraform
       state_var = ENV['TERRAFORM_UNIQUE_STATE'].to_b
       return false if state_var == false
       unless tf_unique_state_valid?
-        fail(
+        raise(
           ArgumentError,
           'Both or neither of TERRAFORM_STATE_FILE or TERRAFORM_STATE_DIR_VAR' \
           ' given, or missing target for TERRAFORM_STATE_DIR_VAR'
@@ -46,7 +46,7 @@ module RakeTerraform
       return state_dir_full_path if tf_state_dir_valid?
       return nil if ENV['TERRAFORM_STATE_FILE'].nil?
       unless tf_state_file_valid?
-        fail(
+        raise(
           ArgumentError,
           'Argument for TERRAFORM_STATE_FILE is invalid'
         )
@@ -59,7 +59,7 @@ module RakeTerraform
     def tf_state_dir_var
       return nil if ENV['TERRAFORM_STATE_DIR_VAR'].nil?
       unless tf_state_dir_var_valid?
-        fail(
+        raise(
           ArgumentError,
           'Argument for TERRAFORM_STATE_DIR_VAR is invalid'
         )
@@ -72,7 +72,7 @@ module RakeTerraform
     def tf_state_dir
       return nil if ENV['TERRAFORM_STATE_DIR_VAR'].nil?
       unless tf_state_dir_valid?
-        fail(
+        raise(
           ArgumentError,
           'Argument for TERRAFORM_STATE_DIR_VAR is invalid'
         )
@@ -102,11 +102,8 @@ module RakeTerraform
     def tf_unique_state_valid?
       state_var = ENV['TERRAFORM_UNIQUE_STATE'].to_b
       return true if state_var == false
-      if tf_state_file_valid? && tf_state_dir_var_valid?
-        return false
-      else
-        tf_state_file_valid? || tf_state_dir_var_valid?
-      end
+      return false if tf_state_file_valid? && tf_state_dir_var_valid?
+      tf_state_file_valid? || tf_state_dir_var_valid?
     end
 
     # validate tf_state_file_valid?
@@ -132,7 +129,7 @@ module RakeTerraform
       value =~ /^[a-z0-9_]+$/i
     end
 
-    alias_method :tf_state_dir_valid?, :tf_state_dir_var_valid?
+    alias tf_state_dir_valid? tf_state_dir_var_valid?
 
     # name of the default state file
     def default_state_file_name

data/lib/rake-terraform/terraformcmd.rb

@@ -29,7 +29,7 @@ module RakeTerraform
         cmd << " -var access_key=\"#{access_key}\""
         cmd << " -var secret_key=\"#{secret_key}\""
       elsif access_key || secret_key
-        fail ArgumentError, 'Only one of access_key or secret_key given'
+        raise ArgumentError, 'Only one of access_key or secret_key given'
       end
       output_file && cmd << " -out #{output_file}"
       system(cmd)

data/lib/rake-terraform/version.rb

@@ -1,4 +1,4 @@
 # Version of the gem
 module RakeTerraform
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-terraform
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Norm MacLennan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler