hu 1.5.17 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/hu/deploy.rb +8 -3
  3. data/lib/hu/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f19d9acdfbcd31d03480037204a57b9ffb8784b2
4
- data.tar.gz: c689b4bc8c888f3b62043019dc00135349c271d8
3
+ metadata.gz: 2e3c577d05a4aa439647dd75aff46c5b190505e6
4
+ data.tar.gz: a42898b365935ed89ac75af95fb7ab2fc940e3b2
5
5
  SHA512:
6
- metadata.gz: 40dd9b2c3abd80bc9d500c6652ec5af90fdcca30f3d943b068a9ba301a82a9c8f3d44ee215bdf9796c837e6272e4d11df89ef077db6f3dcbc4b3e55c53d8ae04
7
- data.tar.gz: e344cd5cd0ebc06981501170f709096f41bf40061d06ea75049848bada4afa10c998ac163fd601769b48bb549eb8fbc9c4a5b6ac9e75cb726c3dc82a78772219
6
+ metadata.gz: f73b47f3f664c111753d7cd865538f81f2155a2633e05c1f97f6bb8a2ac235c520402eb2e6281c6a146227b297ecc2369a26457ea9ccfefcb5794492218c7e67
7
+ data.tar.gz: 3adc670c1ffb1de4aec66ce457613c7f58f3e4a4c8b4cccae586ce2e8558997a8994f7578fc0f47e7e30d3400f3a964fa36226614860a492425c034ac8de9b2c
@@ -357,7 +357,7 @@ EOM
357
357
  'RELEASE_TAG' => release_tag,
358
358
  'GIT_MERGE_AUTOEDIT' => 'no'
359
359
  }
360
- unless 0 == finish_release(release_tag, env)
360
+ unless 0 == finish_release(release_tag, env, tf.path)
361
361
  abort_merge
362
362
  puts '*** ERROR! Could not finish release *** '.color(:red)
363
363
  puts
@@ -404,7 +404,7 @@ EOM
404
404
 
405
405
  def show_pipeline_status(pipeline_name, stag_app_name, prod_app_name, release_tag, clear = true)
406
406
  table = TTY::Table.new header: ['', 'commit', 'tag', 'last_modified', 'last_modified_by', 'dynos', '']
407
- busy 'synchronizing', :huroku
407
+ busy 'synchronizing', :dots
408
408
  ts = []
409
409
  workers = []
410
410
  tpl_row = ['?', '', '', '', '', '', '']
@@ -892,7 +892,7 @@ EOM
892
892
  EOS
893
893
  end
894
894
 
895
- def finish_release(release_tag, env)
895
+ def finish_release(release_tag, env, changelog_path)
896
896
  env.each { |k, v| ENV[k] = v }
897
897
  if File.executable? '.hu/hooks/pre_release'
898
898
  run_each <<-EOS.strip_heredoc
@@ -907,6 +907,11 @@ EOM
907
907
  # Finish release
908
908
  git flow release finish #{release_tag}
909
909
 
910
+ # Adjust merge message
911
+ git checkout master
912
+ git commit --amend -F #{changelog_path}
913
+ git tag -f #{release_tag}
914
+
910
915
  # Push final master (#{release_tag}) to origin
911
916
  git push origin master
912
917
  git push origin --tags
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Hu
3
- VERSION = '1.5.17'
3
+ VERSION = '1.6.0'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hu
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.17
4
+ version: 1.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - moe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-10 00:00:00.000000000 Z
11
+ date: 2017-12-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler