helm-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2178e1cf5c785d76d7adfdf613b8ba498f16ce460467e12bc5950e2b39c57410
-  data.tar.gz: 13467f86a20c2c1c57294cbb30b72d1778d4cee9ca388dd0c15450cd2b7f4e4b
+  metadata.gz: df943c745733500ec8e3fe4f4625d93f0177e0a4d990b179b0a9dd97dcceea4d
+  data.tar.gz: cfc72f57fbc9bfc4024b56b7dd7f68a3d2f81afe8b37a355b3025e1d9984b3d7
 SHA512:
-  metadata.gz: 4211173e0d471ad4ad65ca225a6f2f3037dcd7bd806c3caf8bfbf5a89ca6c1b0b3bb6020e393064b8588b572135a5e15a3af8d58a4a8b971216979aebd094121
-  data.tar.gz: 973c27dd6c8cb77e99de3d80b5628d45ce58c80021f70cf4b4f2c18fde82399c7cd2ca74b7ebbcdea3741b39726f797ce43c8b724178e1ce1474bc544a120a4d
+  metadata.gz: 612a1959c9b722180fb4014910f081652154ed2ba267d1e121f9a423716ff6237495e67e6434d1fd3f71e5f564fa719337013ca7495178198977e02ee0d09a18
+  data.tar.gz: 37b29e9f4f293278a0e17ae149104aad929d4ddffa658c9ac95c87876ec66286af0873d64c107ac22ff95b5162b30f1a995e653cbb4fec05d923dacce3f3e5a8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0
+* Add ability to redirect Helm's stdout and stderr streams.
+
 ## 0.2.0
 * Fix bug causing crash when an error occurs while upgrading a chart.
 

data/lib/helm-cli.rb

@@ -1,4 +1,5 @@
 require 'helm-rb'
+require 'open3'
 
 class HelmCLI
   class HelmError < StandardError; end
@@ -79,6 +80,33 @@ class HelmCLI
     end
   end
 
+  def with_pipes(out = STDOUT, err = STDERR)
+    previous_stdout = self.stdout
+    previous_stderr = self.stderr
+    self.stdout = out
+    self.stderr = err
+    yield
+  ensure
+    self.stdout = previous_stdout
+    self.stderr = previous_stderr
+  end
+
+  def stdout
+    Thread.current[stdout_key] || STDOUT
+  end
+
+  def stdout=(new_stdout)
+    Thread.current[stdout_key] = new_stdout
+  end
+
+  def stderr
+    Thread.current[stderr_key] || STDERR
+  end
+
+  def stderr=(new_stderr)
+    Thread.current[stderr_key] = new_stderr
+  end
+
   private
 
   def base_cmd
@@ -87,15 +115,52 @@ class HelmCLI
 
   def backticks(cmd)
     cmd_s = cmd.join(' ')
-    `#{cmd_s}`.tap do
-      self.last_status = $?
+    result = StringIO.new
+
+    Open3.popen3(cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
+      Thread.new do
+        begin
+          p_stdout.each { |line| result.puts(line) }
+        rescue IOError
+        end
+      end
+
+      Thread.new(stderr) do |t_stderr|
+        begin
+          p_stderr.each { |line| t_stderr.puts(line) }
+        rescue IOError
+        end
+      end
+
+      p_stdin.close
+      self.last_status = wait_thread.value
+      wait_thread.join
     end
+
+    result.string
   end
 
   def systemm(cmd)
     cmd_s = cmd.join(' ')
-    system(cmd_s).tap do
-      self.last_status = $?
+
+    Open3.popen3(cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
+      Thread.new(stdout) do |t_stdout|
+        begin
+          p_stdout.each { |line| t_stdout.puts(line) }
+        rescue IOError
+        end
+      end
+
+      Thread.new(stderr) do |t_stderr|
+        begin
+          p_stderr.each { |line| t_stderr.puts(line) }\
+        rescue IOError
+        end
+      end
+
+      p_stdin.close
+      self.last_status = wait_thread.value
+      wait_thread.join
     end
   end
 
@@ -104,6 +169,14 @@ class HelmCLI
   end
 
   def status_key
-    :helm_rb_cli_last_status
+    :helm_cli_last_status
+  end
+
+  def stdout_key
+    :helm_cli_stdout
+  end
+
+  def stderr_key
+    :helm_cli_stderr
   end
 end

data/lib/helm-cli/version.rb

@@ -1,3 +1,3 @@
 class HelmCLI
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: helm-rb