gitcycle 0.2.28 → 0.2.29

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.28'
+  s.version     = '0.2.29'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -271,14 +271,14 @@ class Gitcycle
     if branch && branch['collab']
       # Merge from collab
       merge_remote_branch(
-        :owner => branch['home'],
+        :owner => owner = branch['home'],
         :repo => branch['repo']['name'],
         :branch => branch['source']
       )
     elsif branch
       # Merge from upstream source branch
       merge_remote_branch(
-        :owner => branch['repo']['owner'],
+        :owner => owner = branch['repo']['owner'],
         :repo => branch['repo']['name'],
         :branch => branch['source']
       )
@@ -288,13 +288,13 @@ class Gitcycle
 
       # Merge from upstream branch with same name
       merge_remote_branch(
-        :owner => repo['owner'],
+        :owner => owner = repo['owner'],
         :repo => repo['name'],
         :branch => current_branch
       )
     end
 
-    unless branch && branch['collab']
+    unless branch && branch['collab'] || owner == @git_login
       # Merge from origin
       merge_remote_branch(
         :owner => @git_login,
@@ -313,7 +313,7 @@ class Gitcycle
 
     branch = pull
 
-    if branch['collab']
+    if branch && branch['collab']
       puts "\nPushing branch '#{branch['home']}/#{branch['name']}'.\n".green
       run("git push #{branch['home']} #{branch['name']} -q")
     elsif branch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitcycle
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
   prerelease: 
 platform: ruby
 authors: