git-process 1.1.2 → 1.1.3

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# CHANGELOG - 1.1.1 #
+# CHANGELOG - 1.1.3 #
+
+### Since 1.1.2 ###
+
+* Fixed undefined local variable error when asking about removing local integration branch.
 
 ### Since 1.1.0 ###
 

data/lib/git-process/git_process.rb

@@ -65,6 +65,11 @@ module GitProc
     end
 
 
+    def master_branch
+      gitlib.config.master_branch
+    end
+
+
     def remote
       gitlib.remote
     end
@@ -129,7 +134,7 @@ module GitProc
 
 
     def ask_about_removing_master
-      resp = ask("You should remove your obsolete <%= color('local', [:bold]) %> branch, '#{master_branch}'. Should I remove it for you? (Yn) ") do |q|
+      resp = ask("You should remove your obsolete <%= color('local', [:bold]) %> branch, '#{config.master_branch}'. Should I remove it for you? (Yn) ") do |q|
         q.responses[:not_valid] = 'Please respond with either (y)es or (n)o. Defaults to (y)es.'
         q.case = :down
         q.default = 'Y'

data/lib/git-process/github_pull_request.rb

@@ -43,9 +43,13 @@ module GitHub
       logger.info { "Creating a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
       begin
         client.create_pull_request(repo, base, head, title, body)
-      rescue Octokit::UnprocessableEntity
+      rescue Octokit::UnprocessableEntity => exp
         pull = pull_requests.find { |p| p[:head][:ref] == head and p[:base][:ref] == base }
-        logger.warn { "Pull request already exists. See #{pull[:html_url]}" }
+        if pull
+          logger.warn { "Pull request already exists. See #{pull[:html_url]}" }
+        else
+          logger.warn { "UnprocessableEntity: #{exp}" }
+        end
         pull
       end
     end

data/lib/git-process/version.rb

@@ -14,7 +14,7 @@ module GitProc
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-process
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Jim Moore
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-21 00:00:00 Z
+date: 2013-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: octokit