bumper_pusher 0.1.15 → 0.1.16

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +84 -43
  3. data/lib/bumper_pusher/bumper.rb +17 -10
  4. data/lib/bumper_pusher/version.rb +1 -1
  5. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 221caf300713c8a338aea4067b57a8fc07b23096
4
- data.tar.gz: e452613d46aae1f3652d1edc6a1aafaef493d2ea
3
+ metadata.gz: 4e583e0512a8968f2bf1b31b5fa1dc5e8a184d65
4
+ data.tar.gz: 6b9be7b84f751f9a51dd0ee06f095d25919e014c
5
5
  SHA512:
6
- metadata.gz: 434d801446803d372fc1d66c257c655f608a0b71787c68e8abf99c169190b9de1f5256446ee592db6ef3ab5e9f581367ff75bde8f0822f4c0e0d221419bcc757
7
- data.tar.gz: 46236f555c829db0fd4263ea7897305f4245d4c73a989dbd503c458ab0d5da3b72b88278c95ccf79b9190f67de33e5b45b03942a51249a74d3cec2804142a205
6
+ metadata.gz: d7dd8e3d28a66faf8ba05763765fa647a7650a6e204442dd5976a19581b869685d90156561003edd1da12f3907cb724e0621bf6b69a9eb7fcf122cb4b69d9322
7
+ data.tar.gz: 317511f49a1c1f2cdf286ae6666a42188674349a7d4c00771cc261d475458dc5d7fa1917ae5721e2a9997c7138c31d3e5543d698f466a56c54503c0e9e9f9131
data/CHANGELOG.md CHANGED
@@ -1,70 +1,111 @@
1
- # Changelog
1
+ # Change Log
2
+
3
+ ## [0.1.15](https://github.com/skywinder/bumper_pusher/tree/0.1.15) (2015-03-03)
4
+
5
+ [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.14...0.1.15)
6
+
7
+ **Closed issues:**
8
+
9
+ - Support git flow hotfixes [\#13](https://github.com/skywinder/bumper_pusher/issues/13)
10
+
11
+ ## [0.1.14](https://github.com/skywinder/bumper_pusher/tree/0.1.14) (2015-02-09)
2
12
 
3
- ## [0.1.14](https://github.com/skywinder/bumper_pusher/tree/0.1.14)
4
13
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.13...0.1.14)
5
- #### 09/02/15
6
- ## [0.1.13](https://github.com/skywinder/bumper_pusher/tree/0.1.13)
14
+
15
+ **Closed issues:**
16
+
17
+ - Better integration with skywinder/Github-Changelog-Generator [\#12](https://github.com/skywinder/bumper_pusher/issues/12)
18
+
19
+ ## [0.1.13](https://github.com/skywinder/bumper_pusher/tree/0.1.13) (2015-02-09)
20
+
7
21
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.12...0.1.13)
8
- #### 09/02/15
9
- ## [0.1.12](https://github.com/skywinder/bumper_pusher/tree/0.1.12)
22
+
23
+ ## [0.1.12](https://github.com/skywinder/bumper_pusher/tree/0.1.12) (2015-02-09)
24
+
10
25
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.11...0.1.12)
11
- #### 09/02/15
12
- - *Merged pull-request:* Add support projects without git flow [\#11](https://github.com/skywinder/bumper_pusher/pull/11) ([skywinder](https://github.com/skywinder))
13
26
 
14
- ## [0.1.11](https://github.com/skywinder/bumper_pusher/tree/0.1.11)
27
+ ## [0.1.11](https://github.com/skywinder/bumper_pusher/tree/0.1.11) (2015-01-08)
28
+
15
29
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.10...0.1.11)
16
- #### 08/01/15
17
- ## [0.1.10](https://github.com/skywinder/bumper_pusher/tree/0.1.10)
30
+
31
+ **Merged pull requests:**
32
+
33
+ - Add support projects without git flow [\#11](https://github.com/skywinder/bumper_pusher/pull/11) ([skywinder](https://github.com/skywinder))
34
+
35
+ ## [0.1.10](https://github.com/skywinder/bumper_pusher/tree/0.1.10) (2014-12-11)
36
+
18
37
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.9...0.1.10)
19
- #### 11/12/14
20
- ## [0.1.9](https://github.com/skywinder/bumper_pusher/tree/0.1.9)
38
+
39
+ ## [0.1.9](https://github.com/skywinder/bumper_pusher/tree/0.1.9) (2014-12-10)
40
+
21
41
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.8...0.1.9)
22
- #### 10/12/14
23
- - *Closed issue:* Push after update changelog [\#10](https://github.com/skywinder/bumper_pusher/issues/10)
24
42
 
25
- ## [0.1.8](https://github.com/skywinder/bumper_pusher/tree/0.1.8)
43
+ **Closed issues:**
44
+
45
+ - Push after update changelog [\#10](https://github.com/skywinder/bumper_pusher/issues/10)
46
+
47
+ ## [0.1.8](https://github.com/skywinder/bumper_pusher/tree/0.1.8) (2014-12-10)
48
+
26
49
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.7...0.1.8)
27
- #### 10/12/14
28
- ## [0.1.7](https://github.com/skywinder/bumper_pusher/tree/0.1.7)
50
+
51
+ ## [0.1.7](https://github.com/skywinder/bumper_pusher/tree/0.1.7) (2014-12-10)
52
+
29
53
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.6...0.1.7)
30
- #### 10/12/14
31
- - *Merged pull-request:* Fix tag not in master [\#9](https://github.com/skywinder/bumper_pusher/pull/9) ([skywinder](https://github.com/skywinder))
32
54
 
33
- ## [0.1.6](https://github.com/skywinder/bumper_pusher/tree/0.1.6)
55
+ **Merged pull requests:**
56
+
57
+ - Fix tag not in master [\#9](https://github.com/skywinder/bumper_pusher/pull/9) ([skywinder](https://github.com/skywinder))
58
+
59
+ ## [0.1.6](https://github.com/skywinder/bumper_pusher/tree/0.1.6) (2014-12-09)
60
+
34
61
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.5...0.1.6)
35
- #### 09/12/14
36
- - *Merged pull-request:* Add gitflow support [\#8](https://github.com/skywinder/bumper_pusher/pull/8) ([skywinder](https://github.com/skywinder))
37
62
 
38
- - *Implemented enhancement:* Add support for git flow strategy [\#6](https://github.com/skywinder/bumper_pusher/issues/6)
63
+ **Merged pull requests:**
64
+
65
+ - Add gitflow support [\#8](https://github.com/skywinder/bumper_pusher/pull/8) ([skywinder](https://github.com/skywinder))
66
+
67
+ ## [0.1.5](https://github.com/skywinder/bumper_pusher/tree/0.1.5) (2014-12-09)
39
68
 
40
- ## [0.1.5](https://github.com/skywinder/bumper_pusher/tree/0.1.5)
41
69
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.0.1...0.1.5)
42
- #### 09/12/14
43
- ## [0.0.1](https://github.com/skywinder/bumper_pusher/tree/0.0.1)
70
+
71
+ **Implemented enhancements:**
72
+
73
+ - Add support for git flow strategy [\#6](https://github.com/skywinder/bumper_pusher/issues/6)
74
+
75
+ ## [0.0.1](https://github.com/skywinder/bumper_pusher/tree/0.0.1) (2014-11-24)
76
+
44
77
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.4...0.0.1)
45
- #### 24/11/14
46
- ## [0.1.4](https://github.com/skywinder/bumper_pusher/tree/0.1.4)
78
+
79
+ ## [0.1.4](https://github.com/skywinder/bumper_pusher/tree/0.1.4) (2014-11-19)
80
+
47
81
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.2...0.1.4)
48
- #### 19/11/14
49
- - *Merged pull-request:* Add check and warrning message, if you try to bump not from master branch [\#4](https://github.com/skywinder/bumper_pusher/pull/4) ([skywinder](https://github.com/skywinder))
50
82
 
51
- - *Merged pull-request:* Remove confirmation for build for beta builds [\#3](https://github.com/skywinder/bumper_pusher/pull/3) ([skywinder](https://github.com/skywinder))
83
+ **Merged pull requests:**
84
+
85
+ - Add check and warrning message, if you try to bump not from master branch [\#4](https://github.com/skywinder/bumper_pusher/pull/4) ([skywinder](https://github.com/skywinder))
86
+
87
+ - Remove confirmation for build for beta builds [\#3](https://github.com/skywinder/bumper_pusher/pull/3) ([skywinder](https://github.com/skywinder))
88
+
89
+ ## [0.1.2](https://github.com/skywinder/bumper_pusher/tree/0.1.2) (2014-11-19)
52
90
 
53
- ## [0.1.2](https://github.com/skywinder/bumper_pusher/tree/0.1.2)
54
91
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.1...0.1.2)
55
- #### 19/11/14
56
- - *Merged pull-request:* Install and remove gem after push [\#2](https://github.com/skywinder/bumper_pusher/pull/2) ([skywinder](https://github.com/skywinder))
57
92
 
58
- - *Merged pull-request:* Don't generate changelog for beta build [\#1](https://github.com/skywinder/bumper_pusher/pull/1) ([skywinder](https://github.com/skywinder))
93
+ **Merged pull requests:**
94
+
95
+ - Install and remove gem after push [\#2](https://github.com/skywinder/bumper_pusher/pull/2) ([skywinder](https://github.com/skywinder))
96
+
97
+ - Don't generate changelog for beta build [\#1](https://github.com/skywinder/bumper_pusher/pull/1) ([skywinder](https://github.com/skywinder))
98
+
99
+ ## [0.1.1](https://github.com/skywinder/bumper_pusher/tree/0.1.1) (2014-11-18)
59
100
 
60
- ## [0.1.1](https://github.com/skywinder/bumper_pusher/tree/0.1.1)
61
101
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.0...0.1.1)
62
- #### 18/11/14
63
- ## [0.1.0](https://github.com/skywinder/bumper_pusher/tree/0.1.0)
102
+
103
+ ## [0.1.0](https://github.com/skywinder/bumper_pusher/tree/0.1.0) (2014-11-18)
104
+
64
105
  [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.0.2...0.1.0)
65
- #### 18/11/14
66
- ## [0.0.2](https://github.com/skywinder/bumper_pusher/tree/0.0.2)
67
- #### 14/11/14
106
+
107
+ ## [0.0.2](https://github.com/skywinder/bumper_pusher/tree/0.0.2) (2014-11-14)
108
+
68
109
 
69
110
 
70
- \* *This changelog was generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
111
+ \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
data/lib/bumper_pusher/bumper.rb CHANGED
@@ -279,7 +279,6 @@ module BumperPusher
279
279
  end
280
280
  current_branch = get_current_branch
281
281
  execute_line_if_not_dry_run("git checkout master && git pull && git checkout #{current_branch}")
282
- execute_line_if_not_dry_run('git push --all')
283
282
  end
284
283
 
285
284
  version_file = find_version_file
@@ -288,14 +287,10 @@ module BumperPusher
288
287
 
289
288
 
290
289
  unless @options[:beta]
291
- <<<<<<< HEAD
292
- if is_gitflow_installed
293
- =======
294
290
  execute_line_if_not_dry_run('git push --all')
295
291
  if is_git_flow_installed && !is_branch_hotfix?
296
- >>>>>>> hotfix/fix-13
297
292
  execute_line_if_not_dry_run("git flow release start #{bumped_version}", check_exit = false)
298
- end
293
+ end
299
294
  end
300
295
 
301
296
  if @options[:bump]
@@ -309,16 +304,27 @@ module BumperPusher
309
304
  if is_git_flow_installed
310
305
  if is_branch_hotfix?
311
306
  branch_split = get_current_branch.split('/').last
312
- if execute_line_if_not_dry_run("git flow hotfix finish -n #{branch_split}", check_exit = false) == 0
313
- execute_line_if_not_dry_run('git checkout master')
307
+ unless execute_line_if_not_dry_run("git flow hotfix finish -n #{branch_split}", check_exit = false) == 0
308
+ puts 'Automatic merge failed, please open new terminal, resolve conflicts, then press Y. Or press N to terminate'
309
+ str = ''
310
+ while str != 'Y' && str != 'N'
311
+ str = gets.chomp
312
+ puts str
313
+ end
314
+ if str == 'N'
315
+ puts '-> exit'
316
+ exit
317
+ end
318
+ execute_line_if_not_dry_run("git flow hotfix finish -n #{branch_split}")
314
319
  end
320
+ execute_line_if_not_dry_run('git checkout master')
321
+
315
322
  else
316
323
  if execute_line_if_not_dry_run("git flow release finish -n #{bumped_version}", check_exit = false) == 0
317
324
  execute_line_if_not_dry_run('git checkout master')
318
325
  end
319
326
  end
320
327
  end
321
- execute_line_if_not_dry_run('git push --all')
322
328
  execute_line_if_not_dry_run("git tag #{bumped_version}")
323
329
  end
324
330
 
@@ -432,6 +438,7 @@ module BumperPusher
432
438
  end
433
439
 
434
440
  if $0 == __FILE__
435
- puts "bumper.rb self run"
441
+ puts 'bumper.rb self run'
442
+
436
443
  BumperPusher::Bumper.new({}).execute_interactive_if_not_dry_run("pwd")
437
444
  end
data/lib/bumper_pusher/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module BumperPusher
2
- VERSION = "0.1.15"
2
+ VERSION = "0.1.16"
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.15
4
+ version: 0.1.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Petr Korolev