dg 0.5.19 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a3f4b067937b5536ae9cfa52690850c436b61d1
-  data.tar.gz: 119852a348e991a32ffd868304ca80782e1c7215
+  metadata.gz: 8b00be5ea28289ada6575a196c4c06d72054e47e
+  data.tar.gz: 77decf3d5e7776cbab171e1b90e627fba28c5821
 SHA512:
-  metadata.gz: 2f814cb699707ee2aecb95d19f491d85460c28fe432efeb40b8e6a05b2e31660d0fc4c09b97b1b3146f9bce13f3375e520cafab69818cc708c7428ab370c5108
-  data.tar.gz: cd590c47ffdcaf5b2a0607237ac527cbb883655baaa8cd1bdedd1245e23da60f387d2bd063a86f946f0c638bb153ef94f2833e03754b8ff5d9136cf62a036868
+  metadata.gz: 510fdf4503a1e0bc81f9102fecde5d9a87fe3b3afd0a7c0b176fbe7b9454bb2551950724a1cb39c093e5d507442b2fe3c9aae179eac5e6e2853e15644a77012e
+  data.tar.gz: 5bc7e6f6eab06c13a6122e5281c2d9eefbe8b25d50e3edcec65621c2b091e256d650b190d955ca9e793ce35ede493b6cde3655504d67833590480da9c53e5ab2

data/lib/dg/docker.rb

@@ -5,7 +5,7 @@ require 'dg/version'
 
 module DG
   class Docker
-    SUDO = !!ENV['GO_PIPELINE_NAME']
+    SUDO = !!ENV['USE_SUDO']
     BASEPATH = Dir.pwd
 
     FIG_YML_PATH = "#{BASEPATH}/fig.yml"
@@ -27,7 +27,7 @@ module DG
       end
 
       def push
-        run_with_output("docker push #{git_image_name.tr(':',' ')}")
+        run_with_output("docker push #{git_image_name}")
       end
 
       def deploy
@@ -84,24 +84,26 @@ module DG
       def run_with_output(command, capture = false)
         sudo_command = SUDO ? "sudo -E bash -c '#{command}'" : command
         puts "Running `#{sudo_command}` in #{Dir.pwd}"
-        if capture
-          # TODO: Replace this with a combined function below, so
-          #  that non-zero exit codes are handled correctly
-          return `#{sudo_command}`
-        else
-          begin
-            PTY.spawn(sudo_command) do |stdin, stdout, pid|
-              stdin.each { |line| print line } rescue Errno::EIO
-              Process.wait(pid)
-            end
-            status_code = $?.exitstatus
-
-            error!(RuntimeError.new("exit code was #{status_code}"), "executing #{command}") if status_code != 0
 
-            return status_code
-          rescue PTY::ChildExited
-            puts "The child process exited!"
+        begin
+          PTY.spawn(sudo_command) do |stdin, stdout, pid|
+            buffer = ''
+            callback = capture ?
+              ->(line) {
+                print line
+                buffer << line
+              } :
+              ->(line) { print line }
+            stdin.each(&callback) rescue Errno::EIO
+            Process.wait(pid)
           end
+          status_code = $?.exitstatus
+
+          error!(RuntimeError.new("exit code was #{status_code}"), "executing #{command}") if status_code != 0
+
+          return capture ? buffer : status_code
+        rescue PTY::ChildExited
+          puts "The child process exited!"
         end
       end
 

data/lib/dg/version.rb

@@ -1,3 +1,3 @@
 module DG
-  VERSION = '0.5.19'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dg
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.6.1
 platform: ruby
 authors:
 - Michael Malet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies: []
 description: |
   DockerGo (DG)