gitcycle 0.3.3 → 0.3.4

data/lib/gitcycle.rb

@@ -15,12 +15,24 @@ require 'yajl'
 $:.unshift File.dirname(__FILE__)
 
 require "ext/string"
+require "gitcycle/branch"
+require "gitcycle/checkout"
+require "gitcycle/commit"
+require "gitcycle/discuss"
+require "gitcycle/incident"
+require "gitcycle/open"
+require "gitcycle/pull"
+require "gitcycle/push"
+require "gitcycle/qa"
+require "gitcycle/ready"
+require "gitcycle/review"
+require "gitcycle/setup"
 
 class Gitcycle
 
   API =
-    if ENV['ENV'] == 'development'
-      "http://127.0.0.1:8080/api"
+    if ENV['ENV'] == 'test'
+      "http://127.0.0.1:3000/api"
     else
       "http://gitcycle.bleacherreport.com/api"
     end
@@ -36,6 +48,19 @@ class Gitcycle
     :last_command_errored => 8,
   }
 
+  include Branch
+  include Checkout
+  include Commit
+  include Discuss
+  include Incident
+  include Open
+  include Pull
+  include Push
+  include QA
+  include Ready
+  include Review
+  include Setup
+
   def initialize(args=nil)
     $remotes = {}
 
@@ -51,524 +76,6 @@ class Gitcycle
     start(args) if args
   end
 
-  def branch(*args)
-    url = args.detect { |arg| arg =~ /^https?:\/\// }
-    title = args.detect { |arg| arg =~ /\s/ }
-
-    exec_git(:branch, args) unless url || title
-
-    require_git && require_config
-
-    params = {
-      'branch[source]' => branches(:current => true)
-    }
-
-    if url && url.include?('lighthouseapp.com/')
-      params.merge!('branch[lighthouse_url]' => url)
-    elsif url && url.include?('github.com/')
-      params.merge!('branch[issue_url]' => url)
-    elsif url
-      puts "Gitcycle only supports Lighthouse or Github Issue URLs.".red
-      exit ERROR[:unrecognized_url]
-    elsif title
-      params.merge!(
-        'branch[name]' => title,
-        'branch[title]' => title
-      )
-    else
-      exec_git(:branch, args)
-    end
-
-    unless yes?("\nYour work will eventually merge into '#{params['branch[source]']}'. Is this correct?")
-      params['branch[source]'] = q("What branch would you like to eventually merge into?")
-    end
-
-    source = params['branch[source]']
-
-    puts "\nRetrieving branch information from gitcycle.\n".green
-    branch = get('branch', params)
-    name = branch['name']
-
-    begin
-      owner, repo = branch['repo'].split(':')
-      branch['home'] ||= @git_login
-
-      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
-
-      checkout_remote_branch(
-        :owner => owner,
-        :repo => repo,
-        :branch => branch['source'],
-        :target => name
-      )
-
-      puts "Sending branch information to gitcycle.".green
-      get('branch',
-          'branch[home]' => branch['home'],
-          'branch[name]' => branch['name'],
-          'branch[rename]' => name != branch['name'] ? name : nil,
-          'branch[source]' => branch['source']
-      )
-    rescue SystemExit, Interrupt
-      puts "\nDeleting branch from gitcycle.\n".green
-      get('branch',
-        'branch[name]' => branch['name'],
-        'create' => 0,
-        'reset' => 1
-      )
-    end
-
-    puts "\n"
-  end
-
-  def checkout(*args)
-    if args.length != 1 || options?(args)
-      exec_git(:checkout, args)
-    end
-
-    require_git && require_config
-
-    if args[0] =~ /^https?:\/\//
-      puts "\nRetrieving branch information from gitcycle.\n".green
-      branch = get('branch', 'branch[lighthouse_url]' => args[0], 'create' => 0)
-      if branch
-        checkout_or_track(:name => branch['name'], :remote => 'origin')
-      else
-        puts "\nBranch not found!\n".red
-        puts "\nDid you mean: gitc branch #{args[0]}\n".yellow
-      end
-    elsif args[0] =~ /^\d*$/
-      puts "\nLooking for a branch for LH ticket ##{args[0]}.\n".green
-      results = branches(:array => true).select {|b| b.include?("-#{args[0]}-") }
-      if results.size == 0
-        puts "\nNo matches for ticket ##{args[0]} found.\n".red
-      elsif results.size == 1
-        branch = results.first
-        if branch.strip == branches(:current => true).strip
-          puts "Already on Github branch for LH ticket ##{args[0]} (#{branch})".yellow
-        else
-          puts "\nSwitching to branch '#{branch}'\n".green
-          run("git checkout #{branch}")
-        end
-      else
-        puts "\nFound #{results.size} matches with that LH ticket number:\n".yellow
-        puts results
-        puts "\nDid not switch branches. Please check your ticket number.\n".red
-      end
-    else
-      remote, branch = args[0].split('/')
-      remote, branch = nil, remote if branch.nil?
-      collab = branch && remote
-
-      unless branches(:match => branch)
-        og_remote = nil
-
-        puts "\nRetrieving repo information from gitcycle.\n".green
-        repo = get('repo')
-        remote = repo['owner'] unless collab
-        
-        output = add_remote_and_fetch(
-          :catch => false,
-          :owner => remote,
-          :repo => @git_repo
-        )
-
-        if errored?(output)
-          og_remote = remote
-          remote = repo["owner"]
-
-          add_remote_and_fetch(
-            :owner => remote,
-            :repo => @git_repo
-          )
-        end
-        
-        puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
-        output = run("git branch --no-track #{branch} #{remote}/#{branch}", :catch => false)
-
-        if errored?(output)
-          puts "Could not find branch #{"'#{og_remote}/#{branch}' or " if og_remote}'#{remote}/#{branch}'.\n".red
-          exit ERROR[:could_not_find_branch]
-        end
-      end
-
-      if collab
-        puts "Sending branch information to gitcycle.".green
-        get('branch',
-          'branch[home]' => remote,
-          'branch[name]' => branch,
-          'branch[source]' => branch,
-          'branch[collab]' => 1,
-          'create' => 1
-        )
-      end
-
-      puts "Checking out '#{branch}'.\n".green
-      run("git checkout -q #{branch}")
-    end
-  end
-  alias :co :checkout
-
-  def commit(*args)
-    msg = nil
-    no_add = args.delete("--no-add")
-
-    if args.empty?
-      require_git && require_config
-
-      puts "\nRetrieving branch information from gitcycle.\n".green
-      branch = get('branch',
-        'branch[name]' => branches(:current => true),
-        'create' => 0
-      )
-
-      id = branch["lighthouse_url"].match(/tickets\/(\d+)/)[1] rescue nil
-
-      if branch && id
-        msg = "[##{id}]"
-        msg += " #{branch["title"]}" if branch["title"]
-      end
-    end
-
-    if no_add
-      cmd = "git commit"
-    else
-      cmd = "git add . && git add . -u && git commit -a"
-    end
-
-    if File.exists?("#{Dir.pwd}/.git/MERGE_HEAD")
-      Kernel.exec(cmd)
-    elsif msg
-      run(cmd + " -m #{msg.dump.gsub('`', "'")}")
-      Kernel.exec("git commit --amend")
-    elsif args.empty?
-      Kernel.exec(cmd)
-    else
-      exec_git(:commit, args)
-    end
-  end
-  alias :ci :commit
-
-  def discuss(*issues)
-    require_git && require_config
-
-    if issues.empty?
-      branch = create_pull_request
-
-      if branch == false
-        puts "Branch not found.\n".red
-      elsif branch['issue_url']
-        puts "\nLabeling issue as 'Discuss'.\n".green
-        get('label',
-          'branch[name]' => branch['name'],
-          'labels' => [ 'Discuss' ]
-        )
-
-        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
-      puts "\nRetrieving branch information from gitcycle.\n".green
-
-      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(*args)
-    exec_git(:pull, args) if args.length > 0
-
-    require_git && require_config
-
-    current_branch = branches(:current => true)
-
-    puts "\nRetrieving branch information from gitcycle.\n".green
-    branch = get('branch',
-      'branch[name]' => current_branch,
-      'include' => [ 'repo' ],
-      'create' => 0
-    )
-
-    if branch && branch['collab']
-      # Merge from collab
-      merge_remote_branch(
-        :owner => owner = branch['home'],
-        :repo => branch['repo']['name'],
-        :branch => branch['source']
-      )
-    elsif branch
-      # Merge from upstream source branch
-      merge_remote_branch(
-        :owner => owner = branch['repo']['owner'],
-        :repo => branch['repo']['name'],
-        :branch => branch['source']
-      )
-    else
-      puts "\nRetrieving repo information from gitcycle.\n".green
-      repo = get('repo')
-
-      # Merge from upstream branch with same name
-      merge_remote_branch(
-        :owner => owner = repo['owner'],
-        :repo => repo['name'],
-        :branch => current_branch
-      )
-    end
-
-    unless branch && branch['collab'] || owner == @git_login
-      # Merge from origin
-      merge_remote_branch(
-        :owner => @git_login,
-        :repo => @git_repo,
-        :branch => current_branch
-      )
-    end
-
-    branch
-  end
-
-  def push(*args)
-    exec_git(:push, args) if args.length > 0
-
-    require_git && require_config
-
-    branch = pull
-
-    if branch && branch['collab']
-      puts "\nPushing branch '#{branch['home']}/#{branch['name']}'.\n".green
-      run("git push #{branch['home']} #{branch['name']} -q")
-    elsif branch
-      puts "\nPushing branch 'origin/#{branch['name']}'.\n".green
-      run("git push origin #{branch['name']} -q")
-    else
-      current_branch = branches(:current => true)
-      puts "\nPushing branch 'origin/#{current_branch}'.\n".green
-      run("git push origin #{current_branch} -q")
-    end
-  end
-
-  def qa(*issues)
-    require_git && require_config
-
-    if issues.empty?
-      puts "\n"
-      get('qa_branch').each do |branches|
-        puts "qa_#{branches['source']}_#{branches['user']}".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)
-      pass_fail = issues.first
-      label = pass_fail.capitalize
-      issues = issues[1..-1]
-
-      if pass_fail == 'pass' && !issues.empty?
-        puts "\nWARNING: #{
-          issues.length == 1 ? "This issue" : "These issues"
-        } will merge straight into '#{branch}' without testing.\n".red
-        
-        if yes?("Continue?")
-          qa_branch = create_qa_branch(
-            :instructions => false,
-            :issues => issues,
-            :source => branch
-          )
-          `git checkout qa_#{qa_branch['source']}_#{qa_branch['user']} -q`
-          $remotes = {}
-          qa('pass')
-        else
-          exit ERROR[:told_not_to_merge]
-        end
-      elsif branch =~ /^qa_/
-        puts "\nRetrieving branch information from gitcycle.\n".green
-        qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
-
-        if pass_fail == 'pass'
-          checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
-        end
-
-        if issues.empty? 
-          branches = qa_branch['branches']
-        else
-          branches = qa_branch['branches'].select do |b|
-            issues.include?(b['issue'])
-          end
-        end
-
-        if pass_fail == 'pass' && issues.empty?
-          owner, repo = qa_branch['repo'].split(':')
-          merge_remote_branch(
-            :owner => owner,
-            :repo => repo,
-            :branch => "qa_#{qa_branch['source']}_#{qa_branch['user']}",
-            :type => :from_qa
-          )
-        end
-
-        unless issues.empty?
-          branches.each do |branch|
-            puts "\nLabeling issue #{branch['issue']} as '#{label}'.\n".green
-            get('label',
-              'qa_branch[source]' => qa_branch['source'],
-              'issue' => branch['issue'],
-              'labels' => [ label ]
-            )
-          end
-        end
-
-        if issues.empty?
-          puts "\nLabeling all issues as '#{label}'.\n".green
-          get('label',
-            'qa_branch[source]' => qa_branch['source'],
-            'labels' => [ label ]
-          )
-        end
-      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_/, ''))
-        
-        branches = qa_branch['branches']
-        conflict = branches.detect { |branch| branch['conflict'] }
-
-        if qa_branch && conflict
-          puts "Committing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
-          run("git add . && git add . -u && git commit -a -F .git/MERGE_MSG")
-
-          puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
-          run("git push origin qa_#{qa_branch['source']}_#{qa_branch['user']} -q")
-
-          puts "\nDe-conflicting on gitcycle.\n".green
-          get('qa_branch',
-            'issues' => branches.collect { |branch| branch['issue'] }
-          )
-
-          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 "\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
-
-    branch = pull
-
-    if branch && !branch['collab']
-      # Recreate pull request if force == true
-      force   = branch['labels'] && branch['labels'].include?('Pass')
-      force ||= branch['state']  && branch['state'] == 'closed'
-
-      branch  = create_pull_request(branch, force)
-    end
-
-    if branch == false
-      puts "Branch not found.\n".red
-    elsif branch['collab']
-      remote, branch = branch['home'], branch['source']
-      puts "\nPushing branch '#{remote}/#{branch}'.\n".green
-      run("git push #{remote} #{branch} -q")
-    elsif branch['issue_url']
-      puts "\nLabeling issue as 'Pending Review'.\n".green
-      get('label',
-        'branch[name]' => branch['name'],
-        'labels' => [ 'Pending Review' ]
-      )
-
-      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
-  end
-
-  def review(pass_fail, *issues)
-    require_git && require_config
-
-    if pass_fail == 'fail'
-      label = 'Fail'
-    else
-      label = 'Pending QA'
-    end
-
-    if issues.empty?
-      puts "\nLabeling issue as '#{label}'.\n".green
-      get('label',
-        'branch[name]' => branches(:current => true),
-        'labels' => [ label ]
-      )
-    else
-      puts "\nLabeling issues as '#{label}'.\n".green
-      get('label',
-        'issues' => issues,
-        'labels' => [ label ],
-        'scope' => 'repo'
-      )
-    end
-  end
-
-  def open(*issues)
-    require_git && require_config
-
-    if issues.empty?
-      branch = create_pull_request
-
-      if branch == false
-        puts "Branch not found.\n".red
-      elsif branch['issue_url']
-        puts "\nOpening the pull request in GitHub\n".green
-
-        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
-      puts "\nRetrieving branch information from gitcycle.\n".green
-
-      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 setup(login, repo, token)
-    repo = "#{login}/#{repo}" unless repo.include?('/')
-    @config[repo] = [ login, token ]
-    save_config
-    puts "\nConfiguration saved.\n".green
-  end
-
   def start(args=[])
     command = args.shift
 
@@ -700,84 +207,6 @@ class Gitcycle
     branch
   end
 
-  def create_qa_branch(options)
-    instructions = options[:instructions]
-    issues = options[:issues]
-    range = options[:range] || (0..-1)
-    source = options[:source]
-
-    if (issues && !issues.empty?) || options[:qa_branch]
-      if options[:qa_branch]
-        qa_branch = options[:qa_branch]
-      else
-        unless source
-          source = branches(:current => true)
-          
-          unless yes?("\nDo you want to create a QA branch from '#{source}'?")
-            source = q("What branch would you like to base this QA branch off of?")
-          end
-        end
-        
-        puts "\nRetrieving branch information from gitcycle.\n".green
-        qa_branch = get('qa_branch', 'issues' => issues, 'source' => source)
-      end
-
-      source = qa_branch['source']
-      name = "qa_#{source}_#{qa_branch['user']}"
-
-      unless qa_branch['branches'].empty?
-        qa_branch['branches'][range].each do |branch|
-          if source != branch['source']
-            puts "You can only QA issues based on '#{source}'\n".red
-            exit ERROR[:cannot_qa]
-          end
-        end
-
-        unless options[:preserve]
-          if branches(:match => name, :all => true)
-            puts "Deleting old QA branch '#{name}'.\n".green
-            if branches(:match => name)
-              run("git checkout master -q")
-              run("git branch -D #{name}")
-            end
-            run("git push origin :#{name} -q")
-          end
-
-          checkout_remote_branch(
-            :owner => @git_login,
-            :repo => @git_repo,
-            :branch => source,
-            :target => name
-          )
-          
-          puts "\n"
-        end
-
-        qa_branch['branches'][range].each do |branch|
-          issue = branch['issue']
-          owner, repo = branch['repo'].split(':')
-          home = branch['home']
-
-          output = merge_remote_branch(
-            :owner => home,
-            :repo => repo,
-            :branch => branch['branch'],
-            :issue => issue,
-            :issues => qa_branch['branches'].collect { |b| b['issue'] },
-            :type => :to_qa
-          )
-        end
-
-        unless options[:instructions] == false
-          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
-
-      qa_branch
-    end
-  end
-
   def errored?(output)
     output.include?("fatal: ") || output.include?("ERROR: ") || $?.exitstatus != 0
   end
@@ -821,7 +250,9 @@ class Gitcycle
       :uid   => (0...20).map{ ('a'..'z').to_a[rand(26)] }.join
     )
 
-    puts "\nTransaction ID: #{hash[:uid]}".green
+    hash[:test] = 1 if ENV['ENV'] == 'test'
+
+    puts "Transaction ID: #{hash[:uid]}".green
 
     params = ''
     hash[:session] = 0
@@ -858,14 +289,6 @@ class Gitcycle
     end
   end
 
-  def load_config
-    if File.exists?(@config_path)
-      @config = YAML.load(File.read(@config_path))
-    else
-      @config = {}
-    end
-  end
-
   def git_config_path(path)
     config = "#{path}/.git/config"
     if File.exists?(config)
@@ -878,6 +301,14 @@ class Gitcycle
     end
   end
 
+  def load_config
+    if File.exists?(@config_path)
+      @config = YAML.load(File.read(@config_path))
+    else
+      @config = {}
+    end
+  end
+
   def load_git
     path = git_config_path(Dir.pwd)
     if path
@@ -906,6 +337,11 @@ class Gitcycle
   def options?(args)
     args.any? { |arg| arg =~ /^-/ }
   end
+  
+  def q(question, extra='')
+    puts "#{question.yellow}#{extra}"
+    $input ? $input.shift : $stdin.gets.strip
+  end
 
   def remotes(options={})
     b = `git remote`
@@ -915,11 +351,6 @@ class Gitcycle
       b
     end
   end
-  
-  def q(question, extra='')
-    puts "#{question.yellow}#{extra}"
-    $input ? $input.shift : $stdin.gets.strip
-  end
 
   def require_config
     unless @login && @token