hashicorptools 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578a309d23e6c74f87b157d24e368d36229b383e
-  data.tar.gz: a6001bd980ee8f5dcb254f6c6710ac9ff14a79e6
+  metadata.gz: b38a77f25914cf1c9fdeffb3bd0098add1a79140
+  data.tar.gz: 117c9145ef6181e8a2c158b4e24cc55b4b99e2a6
 SHA512:
-  metadata.gz: ef0ceffa687a95e96eb9c3b6c7633d56136cd5ca0d882f1292f3429fdfb832f00b657f7839f93fb61e97d4dc6fca005cbb8605a7550305af1ecba40a762a7e6b
-  data.tar.gz: ffd7cb65907eb99d3f2d740e0fb377eeb4272d01289e5d916cf8bd1fdd1d4df0e727e506d5e8ec71bae4a3788f3d52ecb1da6bb1ac013f680fab549238dce95e
+  metadata.gz: abec236d7c680241d658d43504cac803040f7994f07a90455f95f8fd2bb347375f29f1dc87e6a0ddce0ea209a870d11ad32dafaee6c4c20b6b629367550c0979
+  data.tar.gz: cdab94f46e5790f19caf0675c67801d32079eeac5d03036f3bc0586508385faae283b9ecd24f3ab7f4b746bcb7ef828784228ce86b7ce47d5a8c380e8a9ad27f

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/hashicorptools.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hashicorptools 0.0.4 ruby lib
+# stub: hashicorptools 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Nathan Woodhull"]
-  s.date = "2015-12-21"
+  s.date = "2016-02-01"
   s.description = "Wrappers for terraform and packer"
   s.email = "systems@controlshiftlabs.com"
   s.executables = ["ec2_host"]

data/lib/hashicorptools/terraform.rb

@@ -1,6 +1,6 @@
 module Hashicorptools
   class Terraform < Thor
-    TERRAFORM_VERSION = '0.6.8'
+    TERRAFORM_VERSION = '0.6.11'
 
     include Ec2Utilities
     include Variables
@@ -100,8 +100,13 @@ module Hashicorptools
     desc 'taint', 'terraform taint'
     option :environment, :required => true
     option :name, :required => true
+    option :module, :required => false
     def taint
-      system "terraform taint -state #{state_path} #{options[:name]}"
+      if options[:module].present?
+        system "terraform taint -module #{options[:module]} -state #{state_path} #{options[:name]}"
+      else
+        system "terraform taint -state #{state_path} #{options[:name]}"
+      end
     end
 
     desc 'show', 'terraform show'
@@ -208,13 +213,14 @@ module Hashicorptools
 
     def output_variables(state_file_path)
       raw_plan_output = `#{output_cmd(state_file_path)}`
-      output_vars = {}
-      raw_plan_output.split("\n").each do |output_var|
-        key, value = output_var.split("=")
-        output_vars[key.strip] = value.strip
-      end
+      parse_key_value_variables(raw_plan_output)
+    end
+
+    def var_file_variables
+      raise "Vars file #{var_file_path} does not exist" unless File.exist?(var_file_path)
 
-      output_vars
+      raw_var_file_variables = File.read(var_file_path)
+      parse_key_value_variables(raw_var_file_variables)
     end
 
     def terraform_version
@@ -279,5 +285,18 @@ module Hashicorptools
     def dns_record_exists?(parent_node_fqdn, record)
       dynect.node_list(nil, parent_node_fqdn).include?(record.fqdn)
     end
+
+    private
+
+    def parse_key_value_variables(vars_string)
+      vars = {}
+      vars_string.split("\n").each do |string_var|
+        next if string_var.blank?
+        key, value = string_var.split("=")
+        vars[key.strip] = value.strip.gsub('"', '')
+      end
+
+      vars
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashicorptools
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk