hu 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6012d2704060ace64f41aed7e2b0b6301888cc
-  data.tar.gz: 1faabd1f7eb3187c963402251089d6884513c650
+  metadata.gz: 61e3b5270bf085d9b7027fba304081beafad7410
+  data.tar.gz: f109881ac2f36bb35e04b4d9bb98428d73b3f854
 SHA512:
-  metadata.gz: 795cec6ff98f9cd49f161aee6ffe2046d3d6586e60f7a29fb5e9399a8cbbe4c75c9fe08ec44f9b7fc4b2af09d06767418f76df55601a26e6abde6fe3d639d235
-  data.tar.gz: 07a272210595d6600f665e61cdf3278271c9e5ec16ad6df513b3c3a4a0ddfd83a8b28aa6b18938c78108d1d4f201bc6f69b2a746e52801febe711ba6fb155032
+  metadata.gz: adbb4b03a6c2d9159b4e50b6a2717c1c7f55f43833df29fb648ebca76989a3c8e4ab03360684d8f0e9a569489eef852ce87bad556093d659a845963eb82b5a56
+  data.tar.gz: 98a39b7b4499614550b9209fa6b4d63005110fc4a638200b3b73b6fbe7eb113c8b1e6240b6f0f99374861e2023247b7bb8ada282f625e81f0a464fcfd47302c9

data/lib/hu/deploy.rb

@@ -13,6 +13,10 @@ require 'tempfile'
 require 'thread_safe'
 require 'io/console'
 require 'rugged'
+require 'pty'
+require 'thread'
+require 'paint'
+require 'lolcat/lol'
 
 module Hu
   class Cli < Optix::Cli
@@ -203,7 +207,7 @@ module Hu
             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
-          elsif git_revisions[prod_app_name] != git_revisions[stag_app_name]
+          elsif git_revisions[prod_app_name] != git_revisions[stag_app_name] and !release_branch_exists and git_revisions[:release] != git_revisions[stag_app_name]
             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
@@ -263,13 +267,23 @@ module Hu
               }
               unless 0 == finish_release(release_tag, env)
                 abort_merge
-                puts "*** ERROR!  Push did not complete. *** ".color(:red)
+                puts "*** ERROR! Could not finish release *** ".color(:red)
+                puts
+                puts "This usually means a merge conflict or"
+                puts "something similarly complicated has occured."
+                puts
+                puts "Please bring the universe into a state"
+                puts "where the above command succeeds, then try again."
+                puts
+                exit 1
               end
               ENV['EDITOR'] = old_editor
               anykey
             when :push_to_staging
-              push_command = "git push #{push_url} release/#{release_tag}:master -f"
-              `#{push_command}`
+              run_each <<-EOS.strip_heredoc
+              :stream
+              git push #{push_url} release/#{release_tag}:master -f
+              EOS
               anykey
             when :abort_ask
               puts if delete_branch("release/#{release_tag}")
@@ -292,7 +306,7 @@ 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 '♪♫♬  elevator music ', :pulse
+        busy 'loading', :classic
         ts = []
         tpl_row = ['?', '', '', '', '', '', '']
         revs = ThreadSafe::Hash.new
@@ -415,34 +429,84 @@ module Hu
         @h ||= PlatformAPI.connect_oauth(Hu::API_TOKEN)
       end
 
-      def run_each(script)
-        quiet = false
-        failfast = true
-        spinner = true
+      def run_each(script, opts={})
+        opts = {
+          quiet: false,
+          failfast: true,
+          spinner: true,
+          stream: false
+        }.merge(opts)
+
+        @spinlock ||= Mutex.new # :P
         script.lines.each_with_index do |line, i|
           line.chomp!
           case line[0]
             when '#'
-              puts "\n" + line.bright unless quiet
+              puts "\n" + line.bright unless opts[:quiet]
             when ':'
-              quiet = true     if line == ':quiet'
-              failfast = false if line == ':return'
-              spinner  = false if line == ':nospinner'
+              opts[:quiet]    = true  if line == ':quiet'
+              opts[:failfast] = false if line == ':return'
+              opts[:spinner]  = false if line == ':nospinner'
+              if line == ':stream'
+                opts[:stream] = true
+                opts[:quiet] = false
+              end
           end
           next if line.empty? or ['#', ':'].include? line[0]
-          busy line if spinner
-          output, status = Open3.capture2e(line)
-          unbusy if spinner
-          color = (status.exitstatus == 0) ? :green : :red
-          if status.exitstatus != 0 or !quiet
-            puts "\n> ".color(color) + line.color(:black).bright
-            puts output
+
+          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
+                i = 0
+                loop do
+                  break if @minispin_last_char == :end
+                  if 0.23 > Time.now - @minispin_last_char
+                    sleep 0.1
+                    next
+                  end
+                  @spinlock.synchronize {
+                    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
+
+              while !r.eof?
+                c = r.getc
+                @spinlock.synchronize {
+                  print c
+                  @minispin_last_char = Time.now
+                }
+              end
+              pid, status = Process.wait2(pid)
+              @minispin_last_char = :end
+              @tspin.join
+              @tspin = nil
+              #status = PTY.check(pid)
+            end
+          else
+            busy line if opts[:spinner]
+            output, status = Open3.capture2e(line)
+            unbusy if opts[:spinner]
+            color = (status.exitstatus == 0) ? :green : :red
+            if status.exitstatus != 0 or !opts[:quiet]
+              puts "\n> ".color(color) + line.color(:black).bright
+              puts output
+            end
           end
           if status.exitstatus != 0
-            shutdown if failfast
-            puts "Error on line #{i}: #{line}"
-            puts "Exit code: #{status.exitstatus}"
-            exit status.exitstatus if failfast
+            shutdown if opts[:failfast]
+            puts "Error, exit #{status.exitstatus}: #{line} (L#{i})".color(:red).bright
+            exit status.exitstatus if opts[:failfast]
             return status.exitstatus
           end
         end
@@ -621,6 +685,7 @@ module Hu
 
       def promote_to_production
         run_each <<-EOS.strip_heredoc
+        :stream
         :return
 
         # Promote staging to production
@@ -641,6 +706,7 @@ module Hu
         end
 
         run_each <<-EOS.strip_heredoc
+        :stream
         :return
         # Finish release
         git flow release finish #{release_tag}
@@ -679,10 +745,10 @@ module Hu
         unbusy
       end
 
-      def busy(msg='', format=:classic)
+      def busy(msg='', format=:classic, clear=true)
         return if @@shutting_down
         format ||= TTY::Formats::FORMATS.keys.sample
-        options = {format: format, hide_cursor: true, error_mark: "\e[31;1m✖\e[0m", success_mark: "\e[32;1m✔\e[0m", clear: true}
+        options = {format: format, hide_cursor: true, error_mark: "\e[31;1m✖\e[0m", success_mark: "\e[32;1m✔\e[0m", clear: clear}
         @@spinner = TTY::Spinner.new("\e[0;1m#{msg}#{msg.empty? ? '' : ' '}\e[0m\e[32;1m:spinner\e[0m", options)
         @@spinner.start
       end
@@ -713,7 +779,7 @@ module Hu
       end
 
       def safe_abort
-        @@spinner&.stop
+        @spinner&.stop
         printf "\e[0m\e[?25l"
         printf '(ヘ･_･)ヘ┳━┳'
         sleep 0.5

data/lib/hu/version.rb

@@ -1,3 +1,3 @@
 module Hu
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler