hu 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efbe6862cd755894d50414fe407e2bb130f2dc44
-  data.tar.gz: cf6a2b41e9211b07049d71849dc958e1d1fc9ed0
+  metadata.gz: 7a3481b94745be691e1fc4f00dd65c648d084591
+  data.tar.gz: e04ccde7b6b9aab97db2c1e121db046c06e046e1
 SHA512:
-  metadata.gz: b661bea48bd6b9d90d064c737df0e8dfb9ded4f1cf978e6e978ca1155d45e703d96f0983b86fd18f522d1cb996e92c5c3771488f875403d2e25cd3fc796e589e
-  data.tar.gz: f825acd9b672a8f64020ef0e999a845d6f2049370262ddd7b4cc02014dcac0387e1559a723a7d4479d75752fd14c4abd706bbabe687edc60777cf27640d9c7d5
+  metadata.gz: 9112e6e1b3b044ea865335987c1e4cd0234af0ecc116fbe2866fac9c37ac4676173347972ec665b641636f1cb56c0799f22fada3fd5c608eb5a794429e1376b2
+  data.tar.gz: cba66c9948857c833863937bc93550a7445c66bae5e571a867062920087062be238925261c0965918bc6e5e28cb511124327fdad4a32f4c6e8e7d0afbd81c131

data/lib/hu/deploy.rb

@@ -17,6 +17,7 @@ module Hu
   class Cli < Optix::Cli
     class Deploy < Optix::Cli
       @@shutting_down = false
+      @@spinner = nil
 
       text "Interactive deployment."
       desc "Interactive deployment"
@@ -32,14 +33,25 @@ module Hu
       end
 
       def deploy(cmd, opts, argv)
-        trap('INT') { shutdown; safe_abort }
+        trap('INT') { shutdown; safe_abort; exit 1 }
         at_exit {
           if 130 == $!.status
             shutdown
             puts
             safe_abort
+            exit $!.status
           end
         }
+
+        unless File.exists? '.git'
+          puts
+          puts "You need to be inside the working directory of the app that you wish to deploy.".color(:red)
+          puts
+          safe_abort
+          print TTY::Cursor.prev_line
+          exit 1
+        end
+
         push_url = get_heroku_git_remote
 
         wc_update = Thread.new { update_working_copy }
@@ -151,8 +163,7 @@ module Hu
               puts
               anykey
             when :abort_ask
-              delete_branch("release/#{release_tag}")
-              puts
+              puts if delete_branch("release/#{release_tag}")
               exit 0
             when :retag
               if delete_branch("release/#{release_tag}")
@@ -449,6 +460,7 @@ module Hu
           existing_branch = branches.find {|e| e.start_with? 'release/'}
           branch_already_exists = !existing_branch.nil?
           release_tag = existing_branch[8..-1] if keep_existing && branch_already_exists
+
           if branch_already_exists && !keep_existing
             choice = prompt.expand("The branch '"+"release/#{release_tag}".color(:red)+"' already exists. What shall we do?",
                                                           {default: 0}) do |q|
@@ -475,6 +487,7 @@ module Hu
               release_tag = develop_tag
             else
               start_release(release_tag)
+              puts
             end
           end
 
@@ -566,7 +579,7 @@ module Hu
       end
 
       def safe_abort
-        @@spinner.stop
+        @@spinner&.stop
         printf "\e[0m\e[?25l"
         printf '(ヘ･_･)ヘ┳━┳'
         sleep 0.5
@@ -583,7 +596,6 @@ module Hu
         printf "\e[17D                 "
         printf "\e[?25h"
         puts
-        exit 1
       end
     end
   end

data/lib/hu/version.rb

@@ -1,3 +1,3 @@
 module Hu
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - moe