genesis_cli 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1618948f7193a77820ab055cb59b3ffd127b41e7
-  data.tar.gz: a560d1085e763d45adec28af6c02fa0dfcc2a538
+  metadata.gz: 6531669f295b2887262b4100570eef51bbde0967
+  data.tar.gz: 5033f138be958a3c235d119397c3e66f44f49cba
 SHA512:
-  metadata.gz: 19239c14c4b0d570a3902097227aa905927597c8ffc3b18e73ecd45582a62b99acd64b9d087ab2351da506b3bc71d7f37559ed149f0a173490cccad5f8dcc6c5
-  data.tar.gz: df4ea705aaf38036ceb276b0f6054f9b182cf80f1e7531387b8feb4767746fb25eb2a002edf6ccabbc1368131a4fca99b37ebeef39316312ffd57cd25cb2aa49
+  metadata.gz: 144c3468b841185a7700b37075d4c32708120776faab9807e1433bca3bf8f918a9fd2aee7d80d8f2bbd3f80a94e29bccd4c8edc1040226b3c7e6cb3e4ddc4633
+  data.tar.gz: c62afa6556d7e7d7439390a86bfd8dd451b158c17314da77cfda49cb6579dda3bf580ad3cb7544f09b2210379a297710c564ddd9ce0cb8a593bdb5a8f1624b66

data/lib/genesis/cli.rb

@@ -24,7 +24,8 @@ module Genesis
         true
       end
 
-      system apply_command if confirmed
+      puts apply_command
+      # system apply_command if confirmed
     end
 
     desc 'show', 'Output contents of the state file'
@@ -56,6 +57,12 @@ module Genesis
       default: File.join(Dir.pwd, 'terraform'),
       desc: 'Directory where terraform files can be found'
     }
+    option :vars, {
+      required: true,
+      type: :hash,
+      default: {},
+      desc: "Adds additional variables for a Terraform command."
+    }
     def initialize(*args)
       super
 
@@ -64,6 +71,7 @@ module Genesis
       @aws_key_pair = ENV['AWS_KEY_PAIR']
       @prompt = options[:prompt]
       @terraform_dir = options[:terraform_dir]
+      @vars = options[:vars]
 
       validate_environment_variables
       validate_path

data/lib/genesis/commands.rb

@@ -3,64 +3,80 @@ require 'thor'
 module Genesis
   module Commands
     def destroy_plan_command
-      %W[
-        terraform plan
-        -var "aws_access_key=#{@aws_access_key}"
-        -var "aws_secret_key=#{@aws_secret_key}"
-        -var "aws_key_pair=#{@aws_key_pair}"
-        -refresh=true
-        -destroy
-        -state=#{state_file}
-        -out=#{plan_file}
-        #{terraform_dir}
-      ].join(' ')
-    end
-
-    def apply_plan_command
-      %W[
-        terraform apply
-        -state=#{state_file}
-        #{plan_file}
-      ].join(' ')
+      command = []
+      command << 'terraform plan'
+      command << variables
+      command.flatten!
+      command << '-refresh=true'
+      command << '-destroy'
+      command << "-state=#{state_file}"
+      command << "-out=#{plan_file}"
+      command << "#{@terraform_dir}"
+      
+      command.join(' ')
     end
 
     def apply_command
-      %W[
-        terraform apply
-        -var "aws_access_key=#{@aws_access_key}"
-        -var "aws_secret_key=#{@aws_secret_key}"
-        -var "aws_key_pair=#{@aws_key_pair}"
-        -refresh=true
-        -state=#{state_file}
-        #{terraform_dir}
-      ].join(' ')
+      command = []
+      command << 'terraform apply'
+      command << variables
+      command.flatten!
+      command << '-refresh=true'
+      command << "-state=#{state_file}"
+      command << "#{@terraform_dir}"
+      
+      command.join(' ')
     end
 
     def refresh_command
-      %W[
-        terraform refresh
-        -var "aws_access_key=#{@aws_access_key}"
-        -var "aws_secret_key=#{@aws_secret_key}"
-        -var "aws_key_pair=#{@aws_key_pair}"
-        -state=#{state_file}
-        #{terraform_dir}
-      ].join(' ')
+      command = []
+      command << 'terraform refresh'
+      command << variables
+      command.flatten!
+      command << "-state=#{state_file}"
+      command << "#{@terraform_dir}"
+      
+      command.join(' ')
     end
 
     def plan_command
+      command = []
+      command << 'terraform plan'
+      command << variables
+      command.flatten!
+      command << '-refresh=true'
+      command << "-state=#{state_file}"
+      command << "#{@terraform_dir}"
+      
+      command.join(' ')
+    end
+
+    def show_command
+      "terraform show #{state_file}"
+    end
+
+    def apply_plan_command
       %W[
-        terraform plan
-        -var "aws_access_key=#{@aws_access_key}"
-        -var "aws_secret_key=#{@aws_secret_key}"
-        -var "aws_key_pair=#{@aws_key_pair}"
-        -refresh=true
+        terraform apply
         -state=#{state_file}
-        #{terraform_dir}
+        #{plan_file}
       ].join(' ')
     end
 
-    def show_command
-      "terraform show #{state_file}"
+  private
+
+    def variables
+      defaults = {
+        aws_access_key: @aws_access_key,
+        aws_secret_key: @aws_secret_key,
+        aws_key_pair: @aws_key_pair
+      }
+
+      variables = defaults.merge(@vars)
+
+      variables.reduce([]) do |data, (name, value)|
+        data << "-var \"#{name}=#{value}\""
+      end
     end
   end
 end

data/lib/genesis/version.rb

@@ -1,3 +1,3 @@
 module Genesis
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genesis_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tyler Cross