github-pivotal-flow 1.1 → 1.2
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.
- checksums.yaml +4 -4
- data/README.md +2 -1
- data/lib/github_pivotal_flow/story.rb +2 -6
- data/lib/github_pivotal_flow/version.rb +1 -1
- metadata +2 -16
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f9b610ee742c48034c61dea914dda07d41e01ad3
|
|
4
|
+
data.tar.gz: 036cd8c69558626b705bc11fbf8eca6112a31862
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 32a04dadb71f5408229e4fba7067283d7181438ca298c2e6fe070669db7d45c0b1f5eb2588af45f7f59c07f754001f37a48ed6744acfe027e11e31e8f4e276fd
|
|
7
|
+
data.tar.gz: 98b3862a4c10d87e2dac080b62eff22e52df789ff5e70fd18640db09d86b39f5225ebeea03b848c053935b7c6ae71bb9097e7b804e5952eae69d075caee22b2e
|
data/README.md
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
# Github Pivotal Flow
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
[](http://badge.fury.io/rb/github-pivotal-flow)
|
|
4
|
+
[](https://travis-ci.org/donaldpiret/github-pivotal-flow)
|
|
4
5
|
|
|
5
6
|
`github-pivotal-flow` provides a set of additional Git commands to help developers when working with [Pivotal Tracker][pivotal-tracker], git-flow and Github pull requests.
|
|
6
7
|
It follows the branch structure recommended by [Git flow][git-flow].
|
|
@@ -92,16 +92,12 @@ module GithubPivotalFlow
|
|
|
92
92
|
end
|
|
93
93
|
|
|
94
94
|
def merge_to_root!(commit_message = nil, options = {})
|
|
95
|
-
commit_message
|
|
95
|
+
commit_message = "Merge #{branch_name} to #{root_branch_name}" if commit_message.blank?
|
|
96
96
|
commit_message << "\n\n[#{options[:no_complete] ? '' : 'Completes '}##{id}] "
|
|
97
97
|
print "Merging #{branch_name} to #{root_branch_name}... "
|
|
98
98
|
Git.checkout(root_branch_name)
|
|
99
99
|
Git.pull_remote(root_branch_name)
|
|
100
|
-
|
|
101
|
-
Git.merge(branch_name, commit_message: commit_message, ff: true)
|
|
102
|
-
else
|
|
103
|
-
Git.merge(branch_name, commit_message: commit_message, no_ff: true)
|
|
104
|
-
end
|
|
100
|
+
Git.merge(branch_name, commit_message: commit_message, no_ff: true)
|
|
105
101
|
Git.push(root_branch_name)
|
|
106
102
|
self.delete_branch!
|
|
107
103
|
self.cleanup!
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: github-pivotal-flow
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: '1.
|
|
4
|
+
version: '1.2'
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Donald Piret
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-08-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: highline
|
|
@@ -150,20 +150,6 @@ dependencies:
|
|
|
150
150
|
- - "~>"
|
|
151
151
|
- !ruby/object:Gem::Version
|
|
152
152
|
version: '0.8'
|
|
153
|
-
- !ruby/object:Gem::Dependency
|
|
154
|
-
name: byebug
|
|
155
|
-
requirement: !ruby/object:Gem::Requirement
|
|
156
|
-
requirements:
|
|
157
|
-
- - "~>"
|
|
158
|
-
- !ruby/object:Gem::Version
|
|
159
|
-
version: '3.1'
|
|
160
|
-
type: :development
|
|
161
|
-
prerelease: false
|
|
162
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
163
|
-
requirements:
|
|
164
|
-
- - "~>"
|
|
165
|
-
- !ruby/object:Gem::Version
|
|
166
|
-
version: '3.1'
|
|
167
153
|
description: Provides a set of additional Git commands to help developers when working
|
|
168
154
|
with Pivotal Tracker and Github pull requests
|
|
169
155
|
email: donald@donaldpiret.com
|