gitcycle 0.1.0

data/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+*.gem
+.bundle
+features/config.yml
+features/fixtures
+Gemfile.lock
+pkg
+tmp

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2010
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
+the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,16 @@
+Gitcycle
+========
+
+Tame your development cycle.
+
+Requirements
+------------
+
+<pre>
+gem install gitcycle
+</pre>
+
+Get Started
+-----------
+
+Visit [gitcycle.com](http://gitcycle.com) to get set up.

data/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/bin/gitc

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require File.expand_path("../../lib/gitcycle", __FILE__)
+
+gitcycle = Gitcycle.new
+command = ARGV.shift
+
+if command.nil?
+  puts "\nNo command specified\n".red
+elsif gitcycle.respond_to?(command)
+  gitcycle.send(command, *ARGV)
+elsif ARGV.empty?
+  gitcycle.create_branch(command)
+else
+  puts "\nCommand '#{command}' not found.\n".red
+end

data/features/config.example.yml

@@ -0,0 +1,9 @@
+lighthouse:
+  account: # lighthouse subdomain
+  project: # lighthouse project id integer
+  token: # lighthouse api token hash
+owner: # user of parent repo
+repo: # repo name
+token_dev: # gitcycle api token (dev)
+token_qa: # gitcycle api token (qa)
+user: # user of forked repo

data/features/gitcycle.feature

@@ -0,0 +1,155 @@
+Feature: gitcycle
+
+Scenario: No command given
+  When I execute gitcycle with ""
+  Then output includes "No command specified"
+
+Scenario: Non-existent command
+  When I execute gitcycle with "blah blah"
+  Then output includes "Command 'blah' not found"
+
+Scenario: Setup
+  When I execute gitcycle setup
+  Then output includes "Configuration saved."
+    And gitcycle.yml should be valid
+
+Scenario: Feature branch w/ custom branch name
+  Given a fresh set of repositories
+    And a new Lighthouse ticket
+  When I cd to the user repo
+    And I execute gitcycle with the Lighthouse ticket URL
+    And I enter "n"
+    And I enter "ticket.id-rename"
+  Then output includes "Retrieving branch information from gitcycle."
+    And output includes "Would you like to name your branch 'ticket.id'?"
+    And output includes "What would you like to name your branch?"
+    And output includes "Creating 'ticket.id-rename' from 'master'."
+    And output includes "Checking out branch 'ticket.id-rename'."
+    And output includes "Pushing 'ticket.id-rename'."
+    And output includes "Sending branch information to gitcycle."
+    And redis entries valid
+
+Scenario: Feature branch
+  Given a fresh set of repositories
+    And a new Lighthouse ticket
+  When I cd to the user repo
+    And I execute gitcycle with the Lighthouse ticket URL
+    And I enter "y"
+  Then output includes "Retrieving branch information from gitcycle."
+    And output includes "Would you like to name your branch 'ticket.id'?"
+    And output does not include "What would you like to name your branch?"
+    And output includes "Creating 'ticket.id' from 'master'."
+    And output includes "Checking out branch 'ticket.id'."
+    And output includes "Pushing 'ticket.id'."
+    And output includes "Sending branch information to gitcycle."
+    And redis entries valid
+
+Scenario: Checkout via ticket w/ existing branch
+  When I cd to the user repo
+    And I execute gitcycle with the Lighthouse ticket URL
+  Then output includes "Retrieving branch information from gitcycle."
+    And output does not include "Would you like to name your branch 'ticket.id'?"
+    And output does not include "What would you like to name your branch?"
+    And output does not include "Creating 'ticket.id' from 'master'."
+    And output includes "Checking out branch 'ticket.id'."
+    And output does not include "Pushing 'ticket.id'."
+    And output does not include "Sending branch information to gitcycle."
+    And current branch is "ticket.id"
+
+Scenario: Checkout via ticket w/ fresh repo
+  Given a fresh set of repositories
+  When I cd to the user repo
+    And I execute gitcycle with the Lighthouse ticket URL
+  Then output includes "Retrieving branch information from gitcycle."
+    And output does not include "Would you like to name your branch 'ticket.id'?"
+    And output does not include "What would you like to name your branch?"
+    And output does not include "Creating 'ticket.id' from 'master'."
+    And output includes "Tracking branch 'ticket.id'."
+    And output does not include "Pushing 'ticket.id'."
+    And output does not include "Sending branch information to gitcycle."
+    And current branch is "ticket.id"
+
+Scenario: Pull changes from upstream
+  When I cd to the owner repo
+    And I checkout master
+    And I commit something
+    And I cd to the user repo
+    And I execute gitcycle with "pull"
+  Then output includes "Retrieving branch information from gitcycle."
+    And output includes "Adding remote repo 'config.owner/config.repo'."
+    And output includes "Fetching remote branch 'master'."
+    And output includes "Merging remote branch 'master' from 'config.owner/config.repo'."
+    And git log should contain the last commit
+
+Scenario: Discuss commits w/ no parameters and nothing committed
+  When I cd to the user repo
+    And I checkout ticket.id
+    And I execute gitcycle with "discuss"
+  Then output includes "Retrieving branch information from gitcycle."
+    And output includes "Creating GitHub pull request."
+    And output does not include "Branch not found."
+    And output does not include "Opening issue"
+    And output includes "You must push code before opening a pull request."
+    And redis entries valid
+
+Scenario: Discuss commits w/ no parameters and something committed
+  When I cd to the user repo
+    And I checkout ticket.id
+    And I commit something
+    And I execute gitcycle with "discuss"
+  Then output includes "Retrieving branch information from gitcycle."
+    And output includes "Creating GitHub pull request."
+    And output does not include "Branch not found."
+    And output includes "Opening issue" with URL
+    And output does not include "You must push code before opening a pull request."
+    And URL is a valid issue
+    And redis entries valid
+
+Scenario: Discuss commits w/ parameters
+  When I cd to the user repo
+    And I checkout ticket.id
+    And I execute gitcycle with "discuss issue.id"
+  Then output includes "Retrieving branch information from gitcycle."
+    And output does not include "Creating GitHub pull request."
+    And output does not include "Branch not found."
+    And output does not include "You must push code before opening a pull request."
+    And output includes "Opening issue" with URL
+    And URL is a valid issue
+
+Scenario: Ready issue w/ no parameters
+  When I cd to the user repo
+    And I checkout ticket.id
+    And I execute gitcycle with "ready"
+  Then output includes "Labeling issue as 'Pending Review'."
+
+Scenario: Ready issue w/ parameters
+  When I cd to the user repo
+    And I execute gitcycle with "ready issue.id"
+  Then output includes "Labeling issues as 'Pending Review'."
+
+Scenario: Reviewed issue w/ no parameters
+  When I cd to the user repo
+    And I checkout ticket.id
+    And I execute gitcycle with "reviewed"
+  Then output includes "Labeling issue as 'Pending QA'."
+
+Scenario: Reviewed issue w/ parameters
+  When I cd to the user repo
+    And I execute gitcycle with "reviewed issue.id"
+  Then output includes "Labeling issues as 'Pending QA'."
+
+Scenario: QA issue
+  When I cd to the owner repo
+    And I checkout master
+    And I execute gitcycle with "qa issue.id"
+  Then output includes "Retrieving branch information from gitcycle."
+    And output does not include "Checking out source branch 'master'."
+    And output does not include "Tracking source branch 'master'."
+    And output does not include "Deleting old QA branch 'qa_master'."
+    And output includes "Creating QA branch 'qa_master'."
+    And output includes "Adding remote repo 'config.user/config.repo'."
+    And output includes "Fetching remote branch 'ticket.id'."
+    And output includes "Merging remote branch 'ticket.id' from 'config.user/config.repo'."
+    And output includes "Pushing QA branch 'qa_master'."
+    And output includes "Type 'gitc qa pass' to approve all issues in this branch."
+    And output includes "Type 'gitc qa fail' to reject all issues in this branch."

data/features/steps/gitcycle_steps.rb

@@ -0,0 +1,225 @@
+require 'aruba/cucumber'
+require 'lighthouse'
+require 'redis'
+require 'rspec/expectations'
+require 'yaml'
+require 'yajl'
+
+BASE = File.expand_path '../../../', __FILE__
+BIN = "#{BASE}/bin/gitc"
+
+ENV['CONFIG'] = GITCYCLE = "#{BASE}/features/fixtures/gitcycle.yml"
+ENV['ENV'] = 'development'
+
+$redis = Redis.new
+
+Before do |scenario|
+  @aruba_timeout_seconds = 10
+  @scenario_title = scenario.title
+end
+
+def branches(options={})
+  in_current_dir do
+    b = `git branch#{" -a" if options[:all]}`
+    if options[:current]
+      b.match(/\*\s+(.+)/)[1]
+    elsif options[:match]
+      b.match(/([\s]+|origin\/)(#{options[:match]})/)[2] rescue nil
+    else
+      b
+    end
+  end
+end
+
+def config(reload=false)
+  @config = nil if reload
+  @config ||= YAML.load(File.read("#{BASE}/features/config.yml"))
+  Lighthouse.account = @config['lighthouse']['account']
+  Lighthouse.token = @config['lighthouse']['token']
+  @config
+end
+
+def gsub_variables(str)
+  if $ticket
+    str = str.gsub('ticket.id', $ticket.attributes['id'])
+  end
+  if $url
+    issue_id = $url.match(/https:\/\/github.com\/.+\/issues\/(\d+)/)[1]
+    str = str.gsub('issue.id', issue_id)
+  end
+  str = str.gsub('config.owner', config['owner'])
+  str = str.gsub('config.repo', config['repo'])
+  str = str.gsub('config.user', config['user'])
+  str
+end
+
+def log(match)
+  in_current_dir do
+    log = `git log --pretty=format:%s`
+    match = !(match =~ /^#{match}$/).nil?
+  end
+  match
+end
+
+def repos(reload=false)
+  if $repos && !reload
+    $repos
+  else
+    owner = "#{BASE}/features/fixtures/owner"
+    user = "#{BASE}/features/fixtures/user"
+    
+    FileUtils.rm_rf(owner)
+    FileUtils.rm_rf(user)
+    
+    system [
+      "cd #{BASE}/features/fixtures",
+      "git clone git@github.com:#{config['owner']}/#{config['repo']}.git owner",
+      "git clone git@github.com:#{config['user']}/#{config['repo']}.git user"
+    ].join(' && ')
+
+    $repos = { :owner => owner, :user => user }
+  end
+end
+
+def run_gitcycle(cmd, interactive=false)
+  cmd = [ BIN, cmd ].join(' ')
+  if interactive
+    run_interactive(unescape(cmd))
+  else
+    run_simple(unescape(cmd), false)
+  end
+end
+
+Given /^a fresh set of repositories$/ do
+  repos(true)
+end
+
+Given /^a new Lighthouse ticket$/ do
+  $ticket = Lighthouse::Ticket.new(
+    :body => "test",
+    :project_id => config['lighthouse']['project'],
+    :state => "open",
+    :title => "Test ticket"
+  )
+  $ticket.save
+end
+
+When /^I execute gitcycle with "([^\"]*)"$/ do |cmd|
+  cmd = gsub_variables(cmd)
+  run_gitcycle(cmd)
+end
+
+When /^I execute gitcycle setup$/ do
+  FileUtils.rm(GITCYCLE) if File.exists?(GITCYCLE)
+  run_gitcycle [
+    "setup",
+    config['user'],
+    config['repo'],
+    config['token_dev']
+  ].join(' ')
+  run_gitcycle [
+    "setup",
+    config['user'],
+    "#{config['owner']}/#{config['repo']}",
+    config['token_qa']
+  ].join(' ')
+end
+
+When /^I execute gitcycle with the Lighthouse ticket URL$/ do
+  run_gitcycle $ticket.url, true
+end
+
+When /^I cd to the (.*) repo$/ do |user|
+  dirs.pop
+  cd($repos[user.to_sym])
+end
+
+When /^I enter "([^\"]*)"$/ do |input|
+  input = gsub_variables(input)
+  type(input)
+end
+
+When /^I commit something$/ do
+  branch = branches(:current => true)
+  in_current_dir do
+    $commit_msg = "#{@scenario_title} - #{rand}"
+    File.open('README', 'w') {|f| f.write($commit_msg) }
+    `git add . && git add . -u && git commit -a -m '#{$commit_msg}'`
+    `git push origin #{branch}`
+  end
+end
+
+When /^I checkout (.+)$/ do |branch|
+  branch = gsub_variables(branch)
+  in_current_dir do
+    `git checkout #{branch}`
+  end
+end
+
+Then /^gitcycle\.yml should be valid$/ do
+  gitcycle = YAML.load(File.read(GITCYCLE))
+
+  repo = "#{config['user']}/#{config['repo']}"
+  gitcycle[repo].should == [ config['user'], config['token_dev'] ]
+  
+  repo = "#{config['owner']}/#{config['repo']}"
+  gitcycle[repo].should == [ config['user'], config['token_qa'] ]
+end
+
+Then /^output includes \"([^\"]*)"$/ do |expected|
+  expected = gsub_variables(expected)
+  assert_partial_output(expected, all_output)
+end
+
+Then /^output includes \"([^\"]*)" with URL$/ do |expected|
+  puts all_output.inspect
+  expected = gsub_variables(expected)
+  assert_partial_output(expected, all_output)
+  $url = all_output.match(/^#{expected}.*(https?:\/\/[^\s]+)/)[1]
+end
+
+Then /^output does not include \"([^\"]*)"$/ do |expected|
+  expected = gsub_variables(expected)
+  assert_no_partial_output(expected, all_output)
+end
+
+Then /^redis entries valid$/ do
+  add = @scenario_title.include?('custom branch name') ? "-rename" : ""
+  branch = $redis.hget(
+    [
+      "users",
+      config['user'],
+      "repos",
+      "#{config['owner']}:#{config['repo']}",
+      "branches"
+    ].join('/'),
+    $ticket.attributes['id'] + add
+  )
+  branch = Yajl::Parser.parse(branch)
+  should = {
+    'lighthouse_url' => $ticket.url,
+    'body' => "<div><p>test</p></div>\n\n#{$ticket.url}",
+    'name' => $ticket.attributes['id'] + add,
+    'id' => $ticket.attributes['id'] + add,
+    'title' => $ticket.title,
+    'repo' => "#{config['owner']}:#{config['repo']}",
+    'user' => config['user'],
+    'source' => 'master'
+  }
+  if @scenario_title == 'Discuss commits w/ no parameters and something committed'
+    should['issue_url'] = $url
+  end
+  branch.should == should
+end
+
+Then /^current branch is \"([^\"]*)"$/ do |branch|
+  branches(:current => true).should == gsub_variables(branch)
+end
+
+Then /^git log should contain the last commit$/ do
+  log($commit_msg).should == true
+end
+
+Then /^URL is a valid issue$/ do
+  $url.should =~ /https:\/\/github.com\/.+\/issues\/\d+/
+end

data/gitcycle.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+root = File.expand_path('../', __FILE__)
+lib = "#{root}/lib"
+
+$:.unshift lib unless $:.include?(lib)
+
+Gem::Specification.new do |s|
+  s.name        = "gitcycle"
+  s.version     = '0.1.0'
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = [ 'Winton Welsh' ]
+  s.email       = [ 'mail@wintoni.us' ]
+  s.homepage    = "https://github.com/winton/gitcycle"
+  s.summary     = %q{Tame your development cycle}
+  s.description = %q{Tame your development cycle.}
+
+  s.executables = `cd #{root} && git ls-files bin/*`.split("\n").collect { |f| File.basename(f) }
+  s.files = `cd #{root} && git ls-files`.split("\n")
+  s.require_paths = %w(lib)
+  s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n")
+
+  s.add_development_dependency "aruba"
+  s.add_development_dependency "cucumber"
+  s.add_development_dependency "lighthouse"
+  s.add_development_dependency "redis"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "yajl-ruby"
+
+  s.add_dependency "launchy", "= 2.0.5"
+  s.add_dependency "yajl-ruby", "= 1.1.0"
+end

data/lib/ext/string.rb

@@ -0,0 +1,20 @@
+class String
+
+  # Colors
+
+  def blue
+    "\e[34m#{self}\e[0m"
+  end
+
+  def green
+    "\e[32m#{self}\e[0m"
+  end
+
+  def red
+    "\e[31m#{self}\e[0m"
+  end
+
+  def yellow
+    "\e[33m#{self}\e[0m"
+  end
+end

data/lib/gitcycle.rb

@@ -0,0 +1,498 @@
+require 'open-uri'
+require 'uri'
+require 'yaml'
+
+gem 'launchy', '= 2.0.5'
+require 'launchy'
+
+gem 'yajl-ruby', '= 1.1.0'
+require 'yajl'
+
+$:.unshift File.dirname(__FILE__)
+
+require "ext/string"
+
+class Gitcycle
+
+  API =
+    if ENV['ENV'] == 'development'
+      "http://127.0.0.1:8080/api"
+    else
+      "http://gitcycle.bleacherreport.com/api"
+    end
+  
+  def initialize
+    if ENV['CONFIG']
+      @config_path = File.expand_path(ENV['CONFIG'])
+    else
+      @config_path = File.expand_path("~/.gitcycle.yml")
+    end
+    load_config
+    load_git
+  end
+
+  def create_branch(url_or_title)
+    require_git && require_config
+
+    params = {}
+
+    if url_or_title.strip[0..3] == 'http'
+      if url_or_title.include?('lighthouseapp.com/')
+        params = { 'branch[lighthouse_url]' => url_or_title }
+      elsif url_or_title.include?('github.com/')
+        params = { 'branch[issue_url]' => url_or_title }
+      end
+    else
+      params = {
+        'branch[name]' => url_or_title,
+        'branch[title]' => url_or_title
+      }
+    end
+
+    puts "\nRetrieving branch information from gitcycle.\n".green
+    branch = get('branch', params)
+
+    name = branch['name']
+
+    unless branch['exists']
+      branch['source'] = branches(:current => true)
+
+      unless yes?("Would you like to name your branch '#{name}'?")
+        name = q("\nWhat would you like to name your branch?")
+        name = name.gsub(/[\s\W]/, '-')
+      end
+
+      unless branches(:match => name)
+        puts "\nCreating '#{name}' from '#{branch['source']}'.\n".green
+        run("git branch #{name}")
+      end
+    end
+
+    if branches(:match => name)
+      puts "Checking out branch '#{name}'.\n".green
+      run("git checkout #{name}")
+    else
+      puts "Tracking branch '#{name}'.\n".green
+      run("git fetch && git checkout -b #{name} origin/#{name}")
+    end
+
+    unless branch['exists']
+      puts "Pushing '#{name}'.".green
+      run("git push origin #{name}")
+
+      puts "Sending branch information to gitcycle.".green
+      get('branch',
+        'branch[name]' => branch['name'],
+        'branch[rename]' => name != branch['name'] ? name : nil,
+        'branch[source]' => branch['source']
+      )
+    end
+
+    puts "\n"
+  end
+
+  def discuss(*issues)
+    require_git && require_config
+
+    puts "\nRetrieving branch information from gitcycle.\n".green
+
+    if issues.empty?
+      branch = get('branch',
+        'branch[name]' => branches(:current => true),
+        'create' => 0
+      )
+
+      if branch && !branch['issue_url']
+        puts "Creating GitHub pull request.\n".green
+        branch = get('branch',
+          'branch[create_pull_request]' => true,
+          'branch[name]' => branch['name'],
+          'create' => 0
+        )
+      end
+
+      if branch == false
+        puts "Branch not found.\n".red
+      elsif branch['issue_url']
+        puts "Opening issue: #{branch['issue_url']}\n".green
+        Launchy.open(branch['issue_url'])
+      else
+        puts "You must push code before opening a pull request.\n".red
+      end
+    else
+      get('branch', 'issues' => issues, 'scope' => 'repo').each do |branch|
+        if branch['issue_url']
+          puts "Opening issue: #{branch['issue_url']}\n".green
+          Launchy.open(branch['issue_url'])
+        end
+      end
+    end
+  end
+
+  def pull
+    require_git && require_config
+
+    puts "\nRetrieving branch information from gitcycle.\n".green
+    branch = get('branch',
+      'branch[name]' => branches(:current => true),
+      'include' => [ 'repo' ],
+      'create' => 0
+    )
+
+    merge_remote_branch(
+      :owner => branch['repo']['owner'],
+      :repo => branch['repo']['name'],
+      :branch => branch['source']
+    )
+  end
+
+  def qa(*issues)
+    require_git && require_config
+
+    if issues.empty?
+      puts "\n"
+      get('qa_branch').each do |branches|
+        puts "qa_#{branches['source']}".green
+        branches['branches'].each do |branch|
+          puts "  #{"issue ##{branch['issue']}".yellow}\t#{branch['user']}/#{branch['branch']}"
+        end
+        puts "\n"
+      end
+    elsif issues.first == 'fail' || issues.first == 'pass'
+      branch = branches(:current => true)
+      label = issues.first.capitalize
+
+      if branch =~ /^qa_/
+        puts "\nRetrieving branch information from gitcycle.\n".green
+        qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
+
+        puts "Checking out #{qa_branch['source']}.".green
+        run("git checkout #{qa_branch['source']}")
+
+        if issues[1..-1].empty?
+          puts "Merging '#{branch}' into '#{qa_branch['source']}'.\n".green
+          run("git merge #{branch}")
+          run("git push origin #{qa_branch['source']}")
+          
+          puts "\nLabeling all issues as '#{label}'.\n".green
+          get('label',
+            'qa_branch[source]' => branch.gsub(/^qa_/, ''),
+            'labels' => [ label ]
+          )
+
+          branches = qa_branch['branches']
+        else
+          issues = [1..-1]
+
+          branches = qa_branch['branches'].select do |b|
+            issues.include?(b['issue'])
+          end
+
+          branches.each do |branch|
+            merge_remote_branch(
+              :user => branch['user'],
+              :repo => branch['repo'].split(':'),
+              :branch => branch['branch']
+            )
+
+            puts "\nLabeling issue #{branch['issue']} as '#{label}'.\n".green
+            get('label',
+              'qa_branch[source]' => branch.gsub(/^qa_/, ''),
+              'issue' => branch['issue'],
+              'labels' => [ label ]
+            )
+          end
+        end
+
+        puts "\nMarking Lighthouse tickets as 'pending-approval'.\n".green
+        branches = branches.collect do |b|
+          { :name => b['branch'], :repo => b['repo'], :user => b['user'] }
+        end
+        get('ticket_resolve', 'branches' => Yajl::Encoder.encode(branches))
+      else
+        puts "\nYou are not in a QA branch.\n".red
+      end
+    elsif issues.first == 'resolved'
+      branch = branches(:current => true)
+
+      if branch =~ /^qa_/
+        puts "\nRetrieving branch information from gitcycle.\n".green
+        qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
+
+        if qa_branch
+          branches = qa_branch['branches']
+          conflict = branches.detect { |branch| branch['conflict'] }
+
+          if conflict
+            puts "Committing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
+            run("git add . && git add . -u && git commit -a -m 'Merge conflict resolution of #{conflict['branch']} (issue ##{conflict['issue']})'")
+
+            puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
+            run("git push origin qa_#{qa_branch['source']}")
+
+            create_qa_branch(
+              :preserve => true,
+              :range => (branches.index(conflict)+1..-1),
+              :qa_branch => qa_branch
+            )
+          else
+            puts "Couldn't find record of a conflicted merge.\n".red
+          end
+        else
+          puts "Couldn't find record of a conflicted merge.\n".red
+        end
+      else
+        puts "\nYou aren't on a QA branch.\n".red
+      end
+    else
+      create_qa_branch(:issues => issues)
+    end
+  end
+
+  def ready(*issues)
+    require_git && require_config
+
+    if issues.empty?
+      puts "\nLabeling issue as 'Pending Review'.\n".green
+      get('label',
+        'branch[name]' => branches(:current => true),
+        'labels' => [ 'Pending Review' ]
+      )
+    else
+      puts "\nLabeling issues as 'Pending Review'.\n".green
+      get('label',
+        'issues' => issues,
+        'labels' => [ 'Pending Review' ],
+        'scope' => 'repo'
+      )
+    end
+  end
+
+  def reviewed(*issues)
+    require_git && require_config
+
+    if issues.empty?
+      puts "\nLabeling issue as 'Pending QA'.\n".green
+      get('label',
+        'branch[name]' => branches(:current => true),
+        'labels' => [ 'Pending QA' ]
+      )
+    else
+      puts "\nLabeling issues as 'Pending QA'.\n".green
+      get('label',
+        'issues' => issues,
+        'labels' => [ 'Pending QA' ],
+        'scope' => 'repo'
+      )
+    end
+  end
+
+  def setup(login, repo, token)
+    repo = "#{login}/#{repo}" unless repo.include?('/')
+    @config[repo] = [ login, token ]
+    save_config
+    puts "\nConfiguration saved.\n".green
+  end
+
+  private
+
+  def branches(options={})
+    b = `git branch#{" -a" if options[:all]}`
+    if options[:current]
+      b.match(/\*\s+(.+)/)[1]
+    elsif options[:match]
+      b.match(/([\s]+|origin\/)(#{options[:match]})/)[2] rescue nil
+    else
+      b
+    end
+  end
+
+  def create_qa_branch(options)
+    issues = options[:issues]
+    range = options[:range] || (0..-1)
+
+    if (issues && !issues.empty?) || options[:qa_branch]
+      if options[:qa_branch]
+        qa_branch = options[:qa_branch]
+      else
+        puts "\nRetrieving branch information from gitcycle.\n".green
+        qa_branch = get('qa_branch', 'issues' => issues)
+      end
+
+      source = qa_branch['source']
+      name = "qa_#{source}"
+
+      unless qa_branch['branches'].empty?
+        unless options[:preserve]
+          if branches(:current => source)
+            # Do nothing
+          elsif branches(:match => source)
+            puts "Checking out source branch '#{source}'.\n".green
+            run("git checkout #{source}")
+          else
+            puts "Tracking source branch '#{source}'.\n".green
+            run("git fetch && git checkout -b #{source} origin/#{source}")
+          end
+
+          if branches(:match => name)
+            puts "Deleting old QA branch '#{name}'.\n".green
+            run("git branch -D #{name}")
+            run("git push origin :#{name}")
+          end
+          
+          puts "Creating QA branch '#{name}'.\n".green
+          run("git branch #{name} && git checkout #{name}")
+
+          puts "\n"
+        end
+
+        qa_branch['branches'][range].each do |branch|
+          issue = branch['issue']
+          owner, repo = branch['repo'].split(':')
+          user = branch['user']
+          branch = branch['branch']
+
+          output = merge_remote_branch(
+            :owner => user,
+            :repo => repo,
+            :branch => branch
+          )
+
+          if output.include?('CONFLICT')
+            puts "Conflict occurred when merging '#{branch}' (issue ##{issue}).\n".red
+            answer = q("Would you like to (s)kip or (r)esolve?")
+
+            issues = qa_branch['branches'].collect { |b| b['issue'] }
+
+            if answer.downcase[0..0] == 's'
+              run("git reset --hard HEAD")
+              issues.delete(issue)
+
+              puts "\nSending QA branch information to gitcycle.\n".green
+              get('qa_branch', 'issues' => issues, 'conflict' => issue)
+            else
+              puts "\nSending conflict information to gitcycle.\n".green
+              get('qa_branch', 'issues' => issues, 'conflict' => issue)
+
+              puts "Type 'gitc qa resolved' when finished resolving.\n".yellow
+              exit
+            end
+          else
+            puts "Pushing QA branch '#{name}'.\n".green
+            run("git push origin #{name}")
+          end
+        end
+
+        puts "\nType '".yellow + "gitc qa pass".green + "' to approve all issues in this branch.\n".yellow
+        puts "Type '".yellow + "gitc qa fail".red + "' to reject all issues in this branch.\n".yellow
+      end
+    end
+  end
+
+  def get(path, hash={})
+    hash.merge!(
+      :login => @login,
+      :token => @token
+    )
+
+    params = ''
+    hash[:session] = 0
+    hash.each do |k, v|
+      if v
+        params << "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}&"
+      end
+    end
+    params.chop! # trailing &
+
+    json = open("#{API}/#{path}.json?#{params}").read
+    Yajl::Parser.parse(json)
+  end
+
+  def load_config
+    if File.exists?(@config_path)
+      @config = YAML.load(File.read(@config_path))
+    else
+      @config = {}
+    end
+  end
+
+  def load_git
+    path = "#{Dir.pwd}/.git/config"
+    if File.exists?(path)
+      @git_url = File.read(path).match(/\[remote "origin"\][^\[]*url = ([^\n]+)/m)[1]
+      @git_repo = @git_url.match(/\/(.+)\./)[1]
+      @git_login = @git_url.match(/:(.+)\//)[1]
+      @login, @token = @config["#{@git_login}/#{@git_repo}"] rescue [ nil, nil ]
+    end
+  end
+
+  def merge_remote_branch(options={})
+    owner = options[:owner]
+    repo = options[:repo]
+    branch = options[:branch]
+
+    $remotes ||= {}
+
+    unless $remotes[owner]
+      $remotes[owner] = true
+      puts "Adding remote repo '#{owner}/#{repo}'.\n".green
+      run("git remote rm #{owner}") if remotes(:match => owner)
+      run("git remote add #{owner} git@github.com:#{owner}/#{repo}.git")
+    end
+    
+    puts "\nFetching remote branch '#{branch}'.\n".green
+    run("git fetch #{owner}")
+
+    puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
+    run("git merge #{owner}/#{branch}")
+  end
+
+  def remotes(options={})
+    b = `git remote`
+    if options[:match]
+      b.match(/^(#{options[:match]})$/)[1] rescue nil
+    else
+      b
+    end
+  end
+
+  def require_config
+    unless @login && @token
+      puts "\nGitcycle configuration not found.".red
+      puts "Are you in the right repository?".yellow
+      puts "Have you set up this repository at http://gitcycle.com?\n".yellow
+      exit
+    end
+  end
+
+  def require_git
+    unless @git_url && @git_repo && @git_login
+      puts "\norigin entry within '.git/config' not found!".red
+      puts "Are you sure you are in a git repository?\n".yellow
+      exit
+    end
+  end
+
+  def save_config
+    File.open(@config_path, 'w') do |f|
+      f.write(YAML.dump(@config))
+    end
+  end
+
+  def q(question, extra='')
+    puts "#{question.yellow}#{extra}"
+    $stdin.gets.strip
+  end
+
+  def run(cmd)
+    if ENV['RUN'] == '0'
+      puts cmd
+    else
+      `#{cmd}`
+    end
+  end
+
+  def yes?(question)
+    q(question, " (#{"y".green}/#{"n".red})").downcase[0..0] == 'y'
+  end
+end

metadata

@@ -0,0 +1,149 @@
+--- !ruby/object:Gem::Specification
+name: gitcycle
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
+platform: ruby
+authors:
+- Winton Welsh
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70199852896960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70199852896960
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70199852895300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70199852895300
+- !ruby/object:Gem::Dependency
+  name: lighthouse
+  requirement: &70199852894720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70199852894720
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &70199852894100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70199852894100
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70199852893240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70199852893240
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70199852892360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70199852892360
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70199852879100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70199852879100
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70199852877580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70199852877580
+description: Tame your development cycle.
+email:
+- mail@wintoni.us
+executables:
+- gitc
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/gitc
+- features/config.example.yml
+- features/gitcycle.feature
+- features/steps/gitcycle_steps.rb
+- gitcycle.gemspec
+- lib/ext/string.rb
+- lib/gitcycle.rb
+homepage: https://github.com/winton/gitcycle
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.10
+signing_key: 
+specification_version: 3
+summary: Tame your development cycle
+test_files:
+- features/config.example.yml
+- features/gitcycle.feature
+- features/steps/gitcycle_steps.rb