bumper_pusher 0.1.7 → 0.1.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dbb0d24c2e07727306d6db6bdc39acd86d91359e
4
- data.tar.gz: b5b81fda4ec1eb48df7db797a4e7c250a457cbef
3
+ metadata.gz: 328e5eea81ff73d917cfd4b6faf2ae7b1224c654
4
+ data.tar.gz: ad1001cdeab002ad0be2b7f9ef14d0317d6da117
5
5
  SHA512:
6
- metadata.gz: 91df9059b90a9dfe240858199bc5ddb12db886aa62b1fc9af0de4357406466b4e7d39e5cb88aef3c52cbe6bdf6211f6fd39cc59157e1c52200fa39d0f728dc43
7
- data.tar.gz: c7defa37d138cf864243fe81b6eac1b5d0441bceb11fbf3987f0ff591b7ecc6d3cda574120e25548e0f65d83a190b9ca51bc7dc4342d0996370e26196d4cc2bf
6
+ metadata.gz: 0e33e471f3873a8aabfb9cd8f264cb6fe663639519d53ce47cdfdaea2269a841a149dd3c3bdd26c6d438e6a6b5806739cd5c2dfa98baa00a916bc028ce014df9
7
+ data.tar.gz: 20734c4177ef634cdd00f26a2336935f0fe716a5c95dce0370cc10b54117b4de741cc2a8456d8df56b7f42bf5658fe2a210f62f73dc1c8a18003ac99e9ab0e88
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
23
23
  spec.add_development_dependency "rake", "~> 10.0"
24
24
 
25
25
  spec.add_runtime_dependency(%q<colorize>, ["~> 0.7"])
26
+ spec.add_runtime_dependency(%q<github_changelog_generator>, ">= 1.2", "< 5.0")
26
27
  end
@@ -33,7 +33,7 @@ module BumperPusher
33
33
  end
34
34
  end
35
35
 
36
- current_branch = `git rev-parse --abbrev-ref HEAD`.strip!
36
+ current_branch = get_current_branch()
37
37
 
38
38
  unless @options[:beta]
39
39
 
@@ -54,6 +54,10 @@ module BumperPusher
54
54
  end
55
55
  end
56
56
 
57
+ def get_current_branch
58
+ `git rev-parse --abbrev-ref HEAD`.strip!
59
+ end
60
+
57
61
 
58
62
  def find_spec_file
59
63
 
@@ -254,6 +258,12 @@ module BumperPusher
254
258
 
255
259
  check_repo_is_clean_or_dry_run
256
260
 
261
+ unless @options[:beta]
262
+ execute_line_if_not_dry_run('git pull')
263
+ current_branch = get_current_branch
264
+ execute_line_if_not_dry_run("git checkout master && git pull && git checkout #{current_branch}")
265
+ end
266
+
257
267
  version_file = find_version_file
258
268
  result, versions_array = find_version_in_file(version_file)
259
269
  bumped_version = bump_version(versions_array)
@@ -322,9 +332,18 @@ module BumperPusher
322
332
  if `which github_changelog_generator`.empty?
323
333
  puts 'Cancelled bumping: no github_changelog_generator gem found'
324
334
  else
335
+
336
+ if is_gitflow_installed
337
+ execute_line_if_not_dry_run("git flow hotfix start update-changelog")
338
+ end
325
339
  execute_line_if_not_dry_run('github_changelog_generator')
326
340
  execute_line_if_not_dry_run("git commit CHANGELOG.md -m \"Update changelog for version #{bumped_version}\"")
327
- execute_line_if_not_dry_run('git push')
341
+ if is_gitflow_installed
342
+ execute_line_if_not_dry_run("git flow hotfix finish -n update-changelog")
343
+ else
344
+ execute_line_if_not_dry_run('git push')
345
+ end
346
+
328
347
  end
329
348
  end
330
349
 
@@ -1,3 +1,3 @@
1
1
  module BumperPusher
2
- VERSION = "0.1.7"
2
+ VERSION = "0.1.8"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bumper_pusher
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.7
4
+ version: 0.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Petr Korolev
@@ -52,6 +52,26 @@ dependencies:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0.7'
55
+ - !ruby/object:Gem::Dependency
56
+ name: github_changelog_generator
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ">="
60
+ - !ruby/object:Gem::Version
61
+ version: '1.2'
62
+ - - "<"
63
+ - !ruby/object:Gem::Version
64
+ version: '5.0'
65
+ type: :runtime
66
+ prerelease: false
67
+ version_requirements: !ruby/object:Gem::Requirement
68
+ requirements:
69
+ - - ">="
70
+ - !ruby/object:Gem::Version
71
+ version: '1.2'
72
+ - - "<"
73
+ - !ruby/object:Gem::Version
74
+ version: '5.0'
55
75
  description: Bumping and pushing your ruby gems easy and fast!
56
76
  email:
57
77
  - sky4winder@gmail.com