gitcycle 0.2.1 → 0.2.2

data/README.md

@@ -3,6 +3,8 @@ Gitcycle
 
 Tame your development cycle.
 
+Gitcycle is a drop-in replacement for git that makes pull request dev cycles super easy.
+
 Get Started
 -----------
 
@@ -19,7 +21,6 @@ Type `gitc` + your ticket URL to create a new branch:
 
 	gitc https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
 
-
 Pull Changes from Upstream
 --------------------------
 
@@ -27,6 +28,11 @@ When you're developing, you may need to pull new changes from an upstream branch
 
 	gitc pull
 
+Push Changes
+------------
+
+	gitc push
+
 Discuss Code
 ------------
 
@@ -98,11 +104,23 @@ More
 
 If you are working in a fork, it is easy to checkout upstream branches:
 
-	gitc checkout [BRANCH] [...]
+	gitc checkout [BRANCH]
+
+### Collaborate
+
+Its easy to checkout branches from other forks:
+
+	gitc checkout [USER] [BRANCH]
+
+### QA Status
+
+See who is QA'ing what:
+
+	gitc qa
 
-### Reset Branch
+### Redo Branch
 
-If you associate the wrong branch with a ticket, use `gitc reset` to fix it.
+If you associate the wrong branch with a ticket, use `gitc redo` to fix it.
 
 Checkout the branch that you will eventually merge your feature into:
 
@@ -110,7 +128,7 @@ Checkout the branch that you will eventually merge your feature into:
 
 Type `gitc reset` + your ticket URL to reset the branch:
 
-	gitc reset https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
+	gitc redo https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
 
 Todo
 ----

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -213,7 +213,7 @@ class Gitcycle
 
   def push
     branch = pull
-    remote = branch ? branch['home'] : 'origin'
+    remote = branch && branch['collab'] == '1' ? branch['home'] : 'origin'
 
     puts "\nPushing branch '#{remote}/#{branch}'.\n".green
     run("git push #{remote} #{branch}")
@@ -355,7 +355,7 @@ class Gitcycle
     end
   end
 
-  def reset(ticket_or_url)
+  def redo(ticket_or_url)
     create_branch(ticket_or_url, true)
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Winton Welsh