TerraformDevKit 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 713f6ef3806009eefddbfdfc74d69481d2d2b45b
-  data.tar.gz: 0981d0e087efec31ff8939765222765a8963458c
+  metadata.gz: 04709e0dc40b2c3960bd89826014ba546243b34d
+  data.tar.gz: c02340b70022353947393a20281e1f2f45bba1c0
 SHA512:
-  metadata.gz: 6612c58a4ab0b0f3128027d58580fef28dd7f61ff989c957f346d75db9c7dfcca4bf49698fcdb8fea40498ec01d2a789fceb0d900eba8560303c9872a9defa95
-  data.tar.gz: 31f34fa33228af2bec14ec246f8e374b145afac6b638e95e0d61986c57d655a838f88b5ccdd1ad4e2a844d0ebb1a160273fe7d930c3ad8e4309cc3e780814a55
+  metadata.gz: 0b54e4a575922c7d4425497bec680c3c9cf22ecbc6a215606bca11fc5da09ca4802e83dce9b4a7926b6ec59b071514786ef0a967641b038b2ccaa463d0b7391a
+  data.tar.gz: f94a2bd9acc219cb01c09ee03c84bb1821d51d58f96612117d5c5dbdf8411c46f67bbb6a560da93fd54d9f6f57f0906078c4f0020fd4ca0c822ca5712d4f3998

data/lib/TerraformDevKit/command.rb

@@ -2,19 +2,49 @@ require 'open3'
 
 module TerraformDevKit
   class Command
-    def self.run(cmd, directory: Dir.pwd, print_output: true)
+    def self.run(cmd, directory: Dir.pwd, print_output: true, close_stdin: true)
       output = []
 
-      Open3.popen2e(cmd, chdir: directory) do |_, stdout_and_stderr, thread|
-        stdout_and_stderr.each do |line|
-          output << line.tr("\r\n", '')
-          puts line if print_output
+      Open3.popen2e(cmd, chdir: directory) do |stdin, stdout_and_stderr, thread|
+        stdout_thread = Thread.new do
+          process_output(stdout_and_stderr, print_output, output)
         end
 
+        if close_stdin
+          stdin.close
+        else
+          input_thread = Thread.new do
+            loop { stdin.puts $stdin.gets }
+          end
+        end
+
+        thread.join
+        stdout_thread.join
+        input_thread.terminate unless close_stdin
+
         raise "Error running command #{cmd}" unless thread.value.success?
       end
 
       output
     end
+
+    private_class_method
+    def self.process_output(stdout_and_stderr, print_output, output)
+      line = ''
+      stdout_and_stderr.each_char do |char|
+        $stdout.print(char) if print_output
+        case char
+        when "\r"
+          next
+        when "\n"
+          output << line
+          line = ''
+        else
+          line << char
+        end
+      end
+
+      output << line unless line.empty?
+    end
   end
 end

data/lib/TerraformDevKit/terraform_env_manager.rb

@@ -4,33 +4,35 @@ require 'TerraformDevKit/os'
 module TerraformDevKit
   class TerraformEnvManager
     def self.exist?(env)
-      output = Command.run('terraform env list')
+      output = Command.run('terraform env list', print_output: false)
       output.any? { |line| line.tr('* ', '') == env }
     end
 
     def self.create(env)
-      Command.run("terraform env new #{env}") unless exist?(env)
+      unless exist?(env)
+        Command.run("terraform env new #{env}", print_output: false)
+      end
     end
 
     def self.delete(env)
       if exist?(env)
         select('default')
-        Command.run("terraform env delete #{env}")
+        Command.run("terraform env delete #{env}", print_output: false)
       end
     rescue RuntimeError => error
       # TODO: Get rid of this hack once the following issue gets fixed:
       # https://github.com/hashicorp/terraform/issues/15343
-      puts "Error deleting terraform environment: #{error}" \
+      puts "Error deleting terraform environment: #{error}\n" \
         'NOTE: Deleting an environment does not currently work on Windows'
     end
 
     def self.select(env)
       create(env)
-      Command.run("terraform env select #{env}")
+      Command.run("terraform env select #{env}", print_output: false)
     end
 
     def self.active
-      output = Command.run('terraform env list')
+      output = Command.run('terraform env list', print_output: false)
       active = output.select { |line| line.include?('*') }
       raise 'Error parsing output from terraform' if active.length != 1
       match = /\s*\*\s*(\S+)/.match(active[0])

data/lib/TerraformDevKit/version.rb

@@ -1,3 +1,3 @@
 module TerraformDevKit
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TerraformDevKit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Victor Jimenez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler