hu 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52de3790edcdcef2f449d3aff6a7dd083d06c99
-  data.tar.gz: 2c9929a304844d941ed96cff16db3a329eccb598
+  metadata.gz: ab85216f272433e54ed07a51cbfcb16b3af59b65
+  data.tar.gz: 13d3ade3dfd5f3ce55b98d55630fa603f15157d2
 SHA512:
-  metadata.gz: 3fe692a4de2f703438e2fcfaa195cb3d5be96f51e933ade01cb1c289d3907e5cca88ccea28f8fb74d0cbfaeb7175da96bce7c0cf68618b74677f21f6af808d11
-  data.tar.gz: 80254aec7c7e99fbcb29dde38676de98576d1c67a3859682757cbfcebdb7d8fa8c2c9f139ee77f3210a95fd73430d30cc0e31bf3a47109b17acb8f6ad86459cb
+  metadata.gz: 70526faca386e04a0207e6f80096c6a193f3ad38e5fd2ab911e70b8f138e3be6c311a1823f4318f354077bf60026b5f30b9267a8fa005f18cc47eeb5603f45b2
+  data.tar.gz: f3734f5b47903fc965efc705545032357c706e48b78215e3482c68adb013eca7c8acdd6d74ccb7cc5b1b08f275dac4a28de71d8ab0bf9344266da2cbc8688294

data/lib/hu/deploy.rb

@@ -29,6 +29,9 @@ module Hu
       $stdout.sync
       @@shutting_down = false
       @@spinner = nil
+      @@home_branch = nil
+
+      MINIMUM_GIT_VERSION = Versionomy.parse('2.9.0')
 
       text 'Interactive deployment.'
       desc 'Interactive deployment'
@@ -52,6 +55,7 @@ module Hu
           end
           Hu::Tm.flush!
           shutdown
+          return_to_home_branch
           print "\e[0m\e[?25h"
         end
 
@@ -103,6 +107,7 @@ module Hu
         end
 
         push_url = heroku_git_remote
+        @@home_branch = current_branch_name
 
         wc_update = Thread.new { update_working_copy }
 
@@ -145,6 +150,14 @@ module Hu
         wc_update.join
         unbusy
 
+        unless develop_can_be_merged_into_master?
+          puts
+          puts "ERROR: It seems like a merge of 'develop' into 'master' would fail.".color(:red)
+          puts "       Aborting early to prevent a merge conflict.".color(:red)
+          puts
+          exit 1
+        end
+
         highest_version = find_highest_version_tag
         begin
           highest_versionomy = Versionomy.parse(highest_version)
@@ -434,8 +447,13 @@ module Hu
           table << r
         end
 
+        git_version_warning = ''
+        if current_git_version < MINIMUM_GIT_VERSION
+          git_version_warning = " (your git is outdated. please upgrade to v#{MINIMUM_GIT_VERSION}!)".color(:black).bright
+        end
+
         puts "\e[H\e[2J" if clear
-        puts " PIPELINE #{pipeline_name} ".inverse
+        puts " PIPELINE #{pipeline_name} ".inverse+git_version_warning
         puts
 
         puts table.render(:unicode, padding: [0, 1, 0, 1], multiline: true)
@@ -836,6 +854,38 @@ module Hu
         Hu::Tm.t(:abort_merge, cmd: 'deploy')
       end
 
+      def return_to_home_branch
+        return if @@home_branch.nil? or @@home_branch == current_branch_name
+        run_each <<-EOS.strip_heredoc
+        :quiet
+        :nospinner
+        :return
+        # Return to home branch
+        git checkout #{@@home_branch}
+        EOS
+        Hu::Tm.t(:return_home, cmd: 'deploy')
+      end
+
+      def develop_can_be_merged_into_master?
+        status = run_each <<-EOS.strip_heredoc
+        :quiet
+        :nospinner
+        :return
+        git checkout develop
+        git diff --exit-code --quiet develop..master || { git format-patch master --stdout >/tmp/hu.diff.tmp && git checkout master && git apply --check </tmp/hu.diff.tmp ; }
+        rm -f /tmp/hu.diff.tmp
+        EOS
+        status == 0
+      end
+
+      def current_branch_name
+        @git.head.name.sub(/^refs\/heads\//, '')
+      end
+
+      def current_git_version
+        Versionomy.parse(`git --version`.chomp.split(' ')[-1])
+      end
+
       def create_changelog(env)
         if File.executable? '.hu/hooks/changelog'
           env.each { |k, v| ENV[k] = v }

data/lib/hu/version.rb

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

metadata

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