git-process 1.1.2 → 1.1.3
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.
- data/CHANGELOG.md +5 -1
- data/lib/git-process/git_process.rb +6 -1
- data/lib/git-process/github_pull_request.rb +6 -2
- data/lib/git-process/version.rb +1 -1
- metadata +4 -4
data/CHANGELOG.md
CHANGED
@@ -65,6 +65,11 @@ module GitProc
|
|
65
65
|
end
|
66
66
|
|
67
67
|
|
68
|
+
def master_branch
|
69
|
+
gitlib.config.master_branch
|
70
|
+
end
|
71
|
+
|
72
|
+
|
68
73
|
def remote
|
69
74
|
gitlib.remote
|
70
75
|
end
|
@@ -129,7 +134,7 @@ module GitProc
|
|
129
134
|
|
130
135
|
|
131
136
|
def ask_about_removing_master
|
132
|
-
resp = ask("You should remove your obsolete <%= color('local', [:bold]) %> branch, '#{master_branch}'. Should I remove it for you? (Yn) ") do |q|
|
137
|
+
resp = ask("You should remove your obsolete <%= color('local', [:bold]) %> branch, '#{config.master_branch}'. Should I remove it for you? (Yn) ") do |q|
|
133
138
|
q.responses[:not_valid] = 'Please respond with either (y)es or (n)o. Defaults to (y)es.'
|
134
139
|
q.case = :down
|
135
140
|
q.default = 'Y'
|
@@ -43,9 +43,13 @@ module GitHub
|
|
43
43
|
logger.info { "Creating a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
|
44
44
|
begin
|
45
45
|
client.create_pull_request(repo, base, head, title, body)
|
46
|
-
rescue Octokit::UnprocessableEntity
|
46
|
+
rescue Octokit::UnprocessableEntity => exp
|
47
47
|
pull = pull_requests.find { |p| p[:head][:ref] == head and p[:base][:ref] == base }
|
48
|
-
|
48
|
+
if pull
|
49
|
+
logger.warn { "Pull request already exists. See #{pull[:html_url]}" }
|
50
|
+
else
|
51
|
+
logger.warn { "UnprocessableEntity: #{exp}" }
|
52
|
+
end
|
49
53
|
pull
|
50
54
|
end
|
51
55
|
end
|
data/lib/git-process/version.rb
CHANGED
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git-process
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 21
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 1.1.
|
9
|
+
- 3
|
10
|
+
version: 1.1.3
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Jim Moore
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2013-04-
|
18
|
+
date: 2013-04-29 00:00:00 Z
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|
21
21
|
name: octokit
|