hu 1.5.17 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f19d9acdfbcd31d03480037204a57b9ffb8784b2
-  data.tar.gz: c689b4bc8c888f3b62043019dc00135349c271d8
+  metadata.gz: 2e3c577d05a4aa439647dd75aff46c5b190505e6
+  data.tar.gz: a42898b365935ed89ac75af95fb7ab2fc940e3b2
 SHA512:
-  metadata.gz: 40dd9b2c3abd80bc9d500c6652ec5af90fdcca30f3d943b068a9ba301a82a9c8f3d44ee215bdf9796c837e6272e4d11df89ef077db6f3dcbc4b3e55c53d8ae04
-  data.tar.gz: e344cd5cd0ebc06981501170f709096f41bf40061d06ea75049848bada4afa10c998ac163fd601769b48bb549eb8fbc9c4a5b6ac9e75cb726c3dc82a78772219
+  metadata.gz: f73b47f3f664c111753d7cd865538f81f2155a2633e05c1f97f6bb8a2ac235c520402eb2e6281c6a146227b297ecc2369a26457ea9ccfefcb5794492218c7e67
+  data.tar.gz: 3adc670c1ffb1de4aec66ce457613c7f58f3e4a4c8b4cccae586ce2e8558997a8994f7578fc0f47e7e30d3400f3a964fa36226614860a492425c034ac8de9b2c

data/lib/hu/deploy.rb

@@ -357,7 +357,7 @@ EOM
               'RELEASE_TAG'  => release_tag,
               'GIT_MERGE_AUTOEDIT' => 'no'
             }
-            unless 0 == finish_release(release_tag, env)
+            unless 0 == finish_release(release_tag, env, tf.path)
               abort_merge
               puts '*** ERROR! Could not finish release *** '.color(:red)
               puts
@@ -404,7 +404,7 @@ EOM
 
       def show_pipeline_status(pipeline_name, stag_app_name, prod_app_name, release_tag, clear = true)
         table = TTY::Table.new header: ['', 'commit', 'tag', 'last_modified', 'last_modified_by', 'dynos', '']
-        busy 'synchronizing', :huroku
+        busy 'synchronizing', :dots
         ts = []
         workers = []
         tpl_row = ['?', '', '', '', '', '', '']
@@ -892,7 +892,7 @@ EOM
         EOS
       end
 
-      def finish_release(release_tag, env)
+      def finish_release(release_tag, env, changelog_path)
         env.each { |k, v| ENV[k] = v }
         if File.executable? '.hu/hooks/pre_release'
           run_each <<-EOS.strip_heredoc
@@ -907,6 +907,11 @@ EOM
         # Finish release
         git flow release finish #{release_tag}
 
+        # Adjust merge message
+        git checkout master
+        git commit --amend -F #{changelog_path}
+        git tag -f #{release_tag}
+
         # Push final master (#{release_tag}) to origin
         git push origin master
         git push origin --tags

data/lib/hu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.6.0
 platform: ruby
 authors:
 - moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler