deployhq 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43e11b1ef4849e98c9be942b9658b8b8dedeb12
-  data.tar.gz: 3a78e73a8cf1231665a35aa1e82334ad0ae79cbe
+  metadata.gz: 723ab3de0e1e230b74f7d7693ab21a364e10f740
+  data.tar.gz: 7e1278b6f5a88dba69ee5bbb5bd77d07a76ae22a
 SHA512:
-  metadata.gz: 30287957a5bcab37ca9179e06457f423916656e81f6739578bab4a7ab1b8b3eb308be29b23f238ea19534af00240416488775c6ad860cfe786ff46605c68c2d4
-  data.tar.gz: 14101ba5008e92fb8ade0628aabcb0957cc51e6890f8eab364cb01ddc8fb06865d66ee0685d6318d68da1a609da95f4cea0f137fd722a75352ac6a67ba145ace
+  metadata.gz: 44315effe285ba11ec9a8cf03676c58b1fc7a7ff380237933d155aee509e37bc602dada22df25fc3ff00d388ba13a15bbe546b8d763a1e2db3ca93de0fd676d1
+  data.tar.gz: 75271d3366c67bbf22a1699caf048d7b5e32f84a0698507344213867d3ecbd28cada60dbdf1656f6e7a8d7d454ef921e38175599e66b2a3ed82083c76f52912d

data/bin/deployhq

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+libdir = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(libdir)
 
 require 'deploy/cli'
 

data/lib/deploy/cli.rb

@@ -102,10 +102,11 @@ module Deploy
         @longest_server_name = @server_names.values.map(&:length).max
 
         last_tap = nil
+        last_tap_lines = 0
         current_status = 'pending'
         previous_status = ''
-        print "Waiting for deployment capacity..."
-        while ['running', 'pending'].include?(current_status) do
+        STDOUT.print "Waiting for deployment capacity..."
+        while ['running', 'pending'].include?(current_status)
           sleep 1
 
           poll = @deployment.status_poll(:since => last_tap, :status => current_status)
@@ -114,15 +115,29 @@ module Deploy
           current_status = poll.status if poll.status
 
           if current_status == 'pending'
-            print "."
+            STDOUT.print "."
           elsif current_status == 'running' && previous_status == 'pending'
-            puts "\n"
+            STDOUT.puts "\n"
           end
 
           if current_status != 'pending'
             poll.taps.each do |tap|
-              puts format_tap(tap)
+              # Delete most recent tap and redraw it if it's been updated
+              if tap.id.to_i == last_tap
+                if tap.updated
+                  # Restore the cursor to the start of the last entry so we can overwrite
+                  STDOUT.print "\e[#{last_tap_lines}A\r"
+                else
+                  next
+                end
+              end
+
+              tap_output = format_tap(tap)
+              last_tap_lines = tap_output.count("\n")
               last_tap = tap.id.to_i
+
+              STDOUT.print tap_output
+              STDOUT.flush
             end
           end
 
@@ -138,11 +153,10 @@ module Deploy
         @longest_server_name = @server_names.values.map(&:length).max
 
         @deployment.taps.reverse.each do |tap|
-          puts format_tap(tap)
+          STDOUT.puts format_tap(tap)
         end
       end
 
-
       ## Data formatters
 
       def format_tap(tap)
@@ -160,6 +174,15 @@ module Deploy
         String.new.tap do |s|
           s << "#{server_name} ".color(text_colour, :bold)
           s << tap.message.color(text_colour).gsub(/\<[^\>]*\>/, '')
+          if tap.backend_message && tap.tap_type == 'command'
+            tap.backend_message.each_line('<br />') do |backend_line|
+              s << "\n"
+              s << " " * server_name.length
+              s << "   "
+              s << backend_line.color(text_colour).gsub(/\<[^\>]*\>/, '')
+            end
+          end
+          s << "\n"
         end
       end
 

data/lib/deploy/version.rb

@@ -1,3 +1,3 @@
 module Deploy
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deployhq
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Dan Wentworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: API and CLI client for the DeployHQ