gitcycle 0.1.14 → 0.1.15

data/README.md

@@ -19,18 +19,6 @@ Type `gitc` + your ticket URL to create a new branch:
 
 	gitc https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
 
-Reset Branch
-------------
-
-If you associate the wrong branch with a ticket, use `git reset` to fix it.
-
-Checkout the branch that you will eventually merge your feature into:
-
-	git checkout master
-
-Type `gitc reset` + your ticket URL to reset the branch:
-
-	gitc reset https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
 
 Pull Changes from Upstream
 --------------------------
@@ -62,9 +50,7 @@ Managers will periodically check for "Pending Review" issues on GitHub.
 
 Once reviewed, they will mark the issue as reviewed:
 
-	gitc reviewed 0000
-
-Where 0000 is the Github issue number.
+	gitc reviewed [GITHUB ISSUE #] [...]
 
 Quality Assurance
 -----------------
@@ -73,7 +59,7 @@ QA engineers will periodically check for "Pending QA" issues on Github.
 
 To create a new QA branch:
 
-	gitc qa 0000 0001
+	gitc qa [GITHUB ISSUE #] [...]
 
 This will create a new QA branch containing the commits from the related Github issue numbers.
 
@@ -84,9 +70,7 @@ QA Fail
 
 If a feature does not pass QA:
 
-	gitc qa fail 0000
-
-Where 0000 is the Github issue number.
+	gitc qa fail [GITHUB ISSUE #] [...]
 
 To fail all issues:
 
@@ -99,9 +83,7 @@ QA Pass
 
 If a feature passes QA:
 
-	gitc qa pass 0000
-
-Where 0000 is the Github issue number.
+	gitc qa pass [GITHUB ISSUE #] [...]
 
 To pass all issues:
 
@@ -109,6 +91,27 @@ To pass all issues:
 
 This will add a "pass" label to the issue and will complete the pull request by merging the feature branch into the target branch.
 
+More
+----
+
+### Reset Branch
+
+If you associate the wrong branch with a ticket, use `gitc reset` to fix it.
+
+Checkout the branch that you will eventually merge your feature into:
+
+	git checkout master
+
+Type `gitc reset` + your ticket URL to reset the branch:
+
+	gitc reset https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
+
+### Track Upstream Branch
+
+If you are working in a fork, it is easy to track upstream branches:
+
+	gitc track [BRANCH] [...]
+
 Todo
 ----
 
@@ -116,3 +119,10 @@ Todo
 * Add comment on lighthouse with issue URL
 * Label issues with ticket milestone?
 * gitc qa pass, should not set ticket to pending-approval if its already resolved
+* gitc pull before gitc ready
+* Note you can use gitc with a string
+* Tag issue with Lighthouse tags (if == backend or frontend)
+* On pass or fail, send email to Github email
+* If gitc reset happens on branch with Github issue, close the existing issue
+* Change QA branch name to qa_login_branch
+* LH states aren't being updated to pending-* states, the active state update works, reported by Jimmy

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -274,6 +274,8 @@ class Gitcycle
 
         puts "Opening issue: #{branch['issue_url']}\n".green
         Launchy.open(branch['issue_url'])
+      else
+        puts "You have not pushed any commits to '#{branch['name']}'.\n".red
       end
     else
       puts "\nLabeling issues as 'Pending Review'.\n".green
@@ -336,6 +338,18 @@ class Gitcycle
     end
   end
 
+  def track(*branches)
+    puts "\nRetrieving repo information from gitcycle.\n".green
+    repo = get('repo')
+
+    branches.each do |branch|
+      add_remote_and_fetch(:owner => repo['owner'], :repo => repo['name'])
+
+      puts "Creating branch '#{branch}' from '#{repo['owner']}/#{branch}'.\n".green
+      run("git branch --no-track #{branch} #{repo['owner']}/#{branch}")
+    end
+  end
+
   private
 
   def add_remote_and_fetch(options={})
@@ -376,7 +390,7 @@ class Gitcycle
     else
       puts "Tracking branch '#{remote}/#{name}'.\n".green
       run("git fetch -q #{remote}")
-      run("git checkout --track -b #{name} #{remote}/#{name}")
+      run("git checkout -b #{name} #{remote}/#{name}")
     end
 
     run("git pull #{remote} #{name}")
@@ -402,7 +416,7 @@ class Gitcycle
     add_remote_and_fetch(options)
     
     puts "Checking out remote branch '#{target}' from '#{owner}/#{repo}/#{branch}'.\n".green
-    run("git checkout --track -b #{target} #{owner}/#{branch}")
+    run("git checkout -b #{target} #{owner}/#{branch}")
 
     puts "Pulling 'origin/#{target}'.\n".green
     run("git pull origin #{target}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 15
+  version: 0.1.15
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 -08:00
+date: 2012-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency