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 CHANGED
@@ -1,4 +1,8 @@
1
- # CHANGELOG - 1.1.1 #
1
+ # CHANGELOG - 1.1.3 #
2
+
3
+ ### Since 1.1.2 ###
4
+
5
+ * Fixed undefined local variable error when asking about removing local integration branch.
2
6
 
3
7
  ### Since 1.1.0 ###
4
8
 
@@ -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
- logger.warn { "Pull request already exists. See #{pull[:html_url]}" }
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
@@ -14,7 +14,7 @@ module GitProc
14
14
  module Version
15
15
  MAJOR = 1
16
16
  MINOR = 1
17
- PATCH = 2
17
+ PATCH = 3
18
18
  BUILD = nil
19
19
 
20
20
  STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
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: 23
4
+ hash: 21
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
- - 2
10
- version: 1.1.2
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-21 00:00:00 Z
18
+ date: 2013-04-29 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: octokit