hu 1.3.19 → 1.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badecd460755df3ef0e716803d7444043fff806a
-  data.tar.gz: 3ae30df8de4108c85d04a603a9a2ac6a6f5e18f5
+  metadata.gz: 7ebf6d97a25b18af1c6168080a870edaddfbd1bb
+  data.tar.gz: ac4a4cbf64432c6fa5ce821609f53e9e23d93b74
 SHA512:
-  metadata.gz: 6482db2c427955516d158fcf987a75dd5d5706f56aa748c2b88485ed3fca99ba2fd0c68855467667e827eb9374ff2208c348e5e68cd8873977a9a9f66b83d819
-  data.tar.gz: c4f3d9830eda61de3dfd14dcc796709845929d0129414fc5f2dfb038c521a428bd146d5b28f3d8edf9140c71bf2f9435958f45ce7be06fea2d4dba1f20ed60e4
+  metadata.gz: c5c85abf52eef7637fd13c3448942404db774a1ff778977e093eb456b4e7f5b66674c4e842bdba66bd47b15db4b922a187487f511bb65b57478d46f7a98d71ac
+  data.tar.gz: 2c61c69e9c85fa066574f47512cee88f590242883c5349daceef552a98c67680c06eec12545a68a64759cc7774b4e8f04cd2c995a933f0c34cda29a3035110ff

data/lib/hu/deploy.rb

@@ -18,10 +18,15 @@ require 'pty'
 require 'thread'
 require 'paint'
 require 'lolcat/lol'
+require 'io/console'
 
 module Hu
   class Cli < Optix::Cli
     class Deploy < Optix::Cli
+      ::TTY::Formats::FORMATS[:hu] = { frames: '🌑🌒🌓🌔🌕🌖🌗🌘'.chars, interval: 10 }
+      ::TTY::Formats::FORMATS[:huroku] = { frames: '⣾⣽⣻⢿⡿⣟⣯⣷'.chars, interval: 10 }
+
+      $stdout.sync
       @@shutting_down = false
       @@spinner = nil
 
@@ -210,14 +215,14 @@ module Hu
           end
 
           if release_branch_exists && git_revisions[:release] == git_revisions[stag_app_name]
-            puts 'Phase 2/3: Your local ' + "release/#{release_tag}".bright + ' (formerly ' + 'develop'.bright + ") is now live at #{stag_app_name}."
-            puts '           Please test thoroughly: ' + (app['web_url']).to_s.bright
+            puts 'Phase 2/3: Your local ' + "release/#{release_tag}".bright + ' (formerly ' + 'develop'.bright + ") is live at "+"#{stag_app_name}".bright+"."
+            puts '           Please test here: ' + (app['web_url']).to_s.bright
             puts '           If everything looks good, you may proceed and finish the release.'
             puts '           If there are problems: Quit, delete the release branch and start fixing.'
             puts
             Hu::Tm.t(:phase2, cmd: 'deploy')
           elsif git_revisions[prod_app_name] != git_revisions[stag_app_name] && !release_branch_exists && git_revisions[:release] != git_revisions[stag_app_name]
-            puts 'Phase 3/3: HEADS UP. This is the last chance to detect problems.'
+            puts 'Phase 3/3: HEADS UP! This is the last chance to detect problems.'
             puts '           The final version of ' + "release/#{release_tag}".bright + ' is now staged.'
             puts
             puts '           Test here: ' + (app['web_url']).to_s.bright
@@ -329,13 +334,21 @@ module Hu
 
       def show_pipeline_status(pipeline_name, stag_app_name, prod_app_name, release_tag, clear = true)
         table = TTY::Table.new header: %w(location commit tag app_last_modified app_last_modified_by dynos# state)
-        busy '', :classic
+        busy 'loading', :huroku
         ts = []
+        workers = []
         tpl_row = ['?', '', '', '', '', '', '']
         revs = ThreadSafe::Hash.new
+        app_config = ThreadSafe::Hash.new
 
         [[0, stag_app_name], [1, prod_app_name]].each do |idx, app_name|
+          workers << Thread.new do
+            # config vars
+            app_config[app_name] = h.config_var.info(app_name)
+          end
+
           ts << Thread.new do
+            # dyno settings
             table_row = tpl_row.dup
             table_row[0] = app_name
             loop do
@@ -381,6 +394,10 @@ module Hu
           end
         end
 
+        workers.each do |t|
+          t.join
+        end
+
         rows = []
         ts.each do |t|
           idx, table_row = t.value
@@ -418,6 +435,16 @@ module Hu
         puts
 
         puts table.render(:unicode, padding: [0, 1, 0, 1], multiline: true)
+
+        missing_env = app_config[stag_app_name].keys - app_config[prod_app_name].keys
+        unless missing_env.empty?
+          puts
+          missing_env.each do |var|
+            puts " WARNING ".color(:red).bright.inverse + " Missing config in "+prod_app_name.bright+": #{var}"
+            sleep 0.42
+          end
+        end
+
         Hu::Tm.t(:status_screen, cmd: 'deploy')
         revs
       end
@@ -481,40 +508,42 @@ module Hu
           status = nil
           if opts[:stream]
             puts "\n> ".color(:green) + line.color(:black).bright
-            PTY.spawn(line) do |r, _w, pid|
-              @tspin ||= Thread.new do
-                @minispin_last_char = Time.now
-                @minispin_disable = false
-                i = 0
-                loop do
-                  break if @minispin_last_char == :end
-                  if 0.23 > Time.now - @minispin_last_char || @minispin_disable
-                    sleep 0.1
-                    next
-                  end
-                  @spinlock.synchronize do
-                    print "\e[?25l"
-                    print Paint[' ', '#000', Lol.rainbow(1, i / 3.0)]
-                    sleep 0.12
-                    print 8.chr
-                    print ' '
-                    print 8.chr
-                    i += 1
-                    print "\e[?25h"
-                  end
+            rows, cols = STDIN.winsize
+            @minispin_disable = false
+            @minispin_last_char_at = Time.now
+            @tspin ||= Thread.new do
+              i = 0
+              loop do
+                break if @minispin_last_char_at == :end
+                if 0.23 > Time.now - @minispin_last_char_at || @minispin_disable
+                  sleep 0.1
+                  next
+                end
+                @spinlock.synchronize do
+                  next if @minispin_disable
+                  print "\e[?25l"
+                  print Paint[' ', '#000', Lol.rainbow(1, i / 3.0)]
+                  sleep 0.12
+                  print 8.chr
+                  print ' '
+                  print 8.chr
+                  i += 1
+                  print "\e[?25h"
                 end
               end
+            end
 
+            PTY.spawn("stty rows #{rows} cols #{cols}; "+line) do |r, _w, pid|
               begin
                 until r.eof?
                   c = r.getc
                   @spinlock.synchronize do
                     print c
-                    @minispin_last_char = Time.now
-                    c = c.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '') # barf.
+                    @minispin_last_char_at = Time.now
+                    c = c.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: "\e") # barf.
                     # hold on when we are (likely) inside an escape sequence
-                    @minispin_disable = true  if c == 27
-                    @minispin_disable = false if c =~ /[A-Za-z]/
+                    @minispin_disable = true  if c.ord == 27 || c.ord < 9
+                    @minispin_disable = false if c =~ /[A-Za-z]/ || [13,10].include?(c.ord)
                   end
                 end
               rescue Errno::EIO
@@ -524,7 +553,7 @@ module Hu
               end
 
               _pid, status = Process.wait2(pid)
-              @minispin_last_char = :end
+              @minispin_last_char_at = :end
               @tspin.join
               @tspin = nil
               # status = PTY.check(pid)

data/lib/hu/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hu
-  VERSION = '1.3.19'
+  VERSION = '1.3.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.3.19
+  version: 1.3.20
 platform: ruby
 authors:
 - moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler