hu 1.3.22 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d7e1d9dd3eadf2057e97b3793190c421cd61a6
-  data.tar.gz: 129c6e8fbe5335d4e8c40c7d11a163cce2bfc711
+  metadata.gz: 32585e3867e76c97598713a8177c01bf4a213949
+  data.tar.gz: 3ab2ba38631a63a91532a17ab34d770a5fdbce8d
 SHA512:
-  metadata.gz: fd2063e1aafe15d292ee55e009da9b039d144423e2fad2c48d8e5f8fd3e4a5e9897807f3fc4bbb5b11e11a50e47540579dd31e489afc7537636797bd223b29da
-  data.tar.gz: 490133d42887018d1162d3de66758d3c2d06e58b206caea0342824f6d36dc343dd37addc08927a4f14a9b9810528b46cfdac0e105993663bcdd7860a90a56061
+  metadata.gz: e6eaf746681ae17552108281ba3a9a6f54e1ed112b0f2b8dd97d18a240bcb6fd9f962fbeaa2e6b76d1b541a2cc309fdb976d0681f079e8829cf88d7501f1c557
+  data.tar.gz: b5254ee661dba218a165c461d9cc664e8f6847e4d3ae60981005017558eedaf5eb1067e4871706d4d016c8feb9efc56a7fd8e4e76fcef9ffefc010f737076426

data/.rubocop.yml

@@ -6,3 +6,9 @@ AllCops:
 Metrics/LineLength:
   Max: 200
 
+Metrics/ClassLength:
+  Max: 1000
+
+Metrics/AbcSize:
+  Max: 500
+

data/.rubocop_todo.yml

@@ -4,20 +4,11 @@ Lint/HandleExceptions:
     - 'lib/hu/common.rb'
     - 'lib/hu/telemetry.rb'
 
-# Offense count: 14
-Metrics/AbcSize:
-  Max: 298
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 698
-
 # Offense count: 6
 Metrics/CyclomaticComplexity:
   Max: 45
 
-# Offense count: 16
+# Offense count: 15
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 254
@@ -42,13 +33,27 @@ Style/Documentation:
     - 'lib/hu/deploy.rb'
     - 'lib/hu/telemetry.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Style/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'lib/hu/deploy.rb'
+
 # Offense count: 3
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
-    - 'lib/hu/cli.rb'
     - 'lib/hu/collab.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/hu/deploy.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAsExpressionSeparator.
@@ -56,7 +61,7 @@ Style/Semicolon:
   Exclude:
     - 'lib/hu/deploy.rb'
 
-# Offense count: 1
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: use_perl_names, use_english_names

data/lib/hu/cli.rb

@@ -13,16 +13,11 @@ require 'hu/deploy'
 module Hu
   class Cli < Optix::Cli
     Optix.command do
-      text "Hu v#{Hu::VERSION} - Heroku Utility"
-      opt :quiet, 'Quiet mode (no progress output)', default: false
+      text "Hu v#{Hu::VERSION} - Heroku Utility - https://github.com/busyloop/hu"
       opt :version, 'Print version and exit', short: :none
       trigger :version do
         puts "Hu v#{Hu::VERSION}"
       end
-      filter do |_cmd, opts, _argv|
-        $quiet = opts[:quiet]
-        $quiet = true unless STDOUT.isatty
-      end
     end
   end
 end

data/lib/hu/collab.rb

@@ -34,11 +34,14 @@ module Hu
         text ''
         text "\e[1mWARNING: Environment variable 'HEROKU_API_KEY' must be set.\e[0m"
       end
-      filter do
+      opt :quiet, 'Quiet mode (no progress bar)', default: false
+      filter do |_cmd, opts, _argv|
         if Hu::API_TOKEN.nil?
           STDERR.puts "\e[0;31;1mERROR: Environment variable 'HEROKU_API_KEY' must be set.\e[0m"
           exit 1
         end
+        $quiet = opts[:quiet]
+        $quiet = true unless STDOUT.isatty
       end
       def collab; end
 

data/lib/hu/deploy.rb

@@ -45,13 +45,14 @@ module Hu
 
       def deploy(_cmd, _opts, _argv)
         Hu::Tm.t(:invoke, cmd: 'deploy')
-        trap('INT') { shutdown; safe_abort; exit 1 }
+        trap('INT') { shutdown; puts "\e[0m\e[35;1m^C\e[0m"; exit 1 }
         at_exit do
-          shutdown
-          if $ERROR_INFO.class == SystemExit && 130 == $ERROR_INFO.status
-            puts
-            safe_abort
+          if $!.class == SystemExit && 130 == $!.status
+            puts "\n\n"
           end
+          Hu::Tm.flush!
+          shutdown
+          print "\e[0m\e[?25h"
         end
 
         begin
@@ -61,7 +62,6 @@ module Hu
           puts "Git error: #{e}".color(:red)
           puts 'You need to be inside the working copy of the app that you wish to deploy.'.color(:red)
           puts
-          safe_abort
           print TTY::Cursor.prev_line
           Hu::Tm.t(:error_not_in_working_copy, cmd: 'deploy')
           exit 1
@@ -215,7 +215,7 @@ 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 live at "+"#{stag_app_name}".bright+"."
+            puts 'Phase 2/3: Your local ' + "release/#{release_tag}".bright + ' (formerly ' + 'develop'.bright + ') is live at ' + stag_app_name.to_s.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.'
@@ -394,9 +394,7 @@ module Hu
           end
         end
 
-        workers.each do |t|
-          t.join
-        end
+        workers.each(&:join)
 
         rows = []
         ts.each do |t|
@@ -440,7 +438,7 @@ module Hu
         unless missing_env.empty?
           puts
           missing_env.each do |var|
-            puts " WARNING ".color(:red).bright.inverse + " Missing config in "+prod_app_name.bright+": #{var}"
+            puts ' WARNING '.color(:red).bright.inverse + ' Missing config in ' + prod_app_name.bright + ": #{var}"
             sleep 0.42
           end
         end
@@ -533,7 +531,7 @@ module Hu
               end
             end
 
-            PTY.spawn("stty rows #{rows} cols #{cols}; "+line) do |r, _w, pid|
+            PTY.spawn("stty rows #{rows} cols #{cols}; " + line) do |r, _w, pid|
               begin
                 until r.eof?
                   c = r.getc
@@ -543,7 +541,7 @@ module Hu
                     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.ord == 27 || c.ord < 9
-                    @minispin_disable = false if c =~ /[A-Za-z]/ || [13,10].include?(c.ord)
+                    @minispin_disable = false if c =~ /[A-Za-z]/ || [13, 10].include?(c.ord)
                   end
                 end
               rescue Errno::EIO
@@ -818,7 +816,6 @@ module Hu
       end
 
       def shutdown
-        Hu::Tm.flush!
         @@shutting_down = true
         unbusy
       end
@@ -856,25 +853,6 @@ module Hu
         puts "--- ^#{label}^ ---"
       end
 
-      def safe_abort
-        @spinner&.stop
-        printf "\e[0m\e[?25l"
-        printf '(ヘ･_･)ヘ┳━┳'
-        sleep 0.5
-        printf "\e[12D(ヘ･_･)-┳━┳"
-        sleep 0.1
-        printf "\e[12D\e[31;1m(╯°□°）╯  ┻━┻"
-        sleep 0.1
-        printf "\e[1;31m\e[14D(╯°□°）╯    ┻━┻"
-        sleep 0.05
-        printf "\e[0;31m\e[15D(╯°□°）╯     ┻━┻"
-        sleep 0.05
-        printf "\e[30;1m\e[16D(╯°□°）╯      ┻━┻"
-        sleep 0.05
-        printf "\e[17D                 "
-        printf "\e[?25h"
-        puts
-      end
-    end
-  end
-end
+    end # /Class Deploy
+  end # /Class Cli
+end # /Module Hu

data/lib/hu/version.rb

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

metadata

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