gitcycle 0.2.14 → 0.2.15

data/features/setup.feature

@@ -0,0 +1,7 @@
+Feature: Setup
+
+Scenario: Setup
+  When I execute gitcycle setup
+    And gitcycle runs
+  Then output includes "Configuration saved."
+    And gitcycle.yml should be valid

data/features/steps/gitcycle_steps.rb

@@ -17,10 +17,18 @@ require "gitcycle"
 $redis = Redis.new
 
 Before do |scenario|
+  Launchy.stub :open do |url|
+    if url =~ /https:\/\/github.com\/.+\/issues\/\d+/
+      $github_url = url
+    end
+    $url = url
+  end
+
   @scenario_title = scenario.title
   $execute = []
   $input = []
   $remotes = nil
+  $ticket = nil
 end
 
 def branches(options={})
@@ -36,7 +44,7 @@ end
 
 def config(reload=false)
   @config = nil if reload
-  @config ||= YAML.load(File.read("#{BASE}/features/config.yml"))
+  @config ||= YAML.load(File.read("#{BASE}/features/config/config.yml"))
   Lighthouse.account = @config['lighthouse']['account']
   Lighthouse.token = @config['lighthouse']['token']
   @config
@@ -46,8 +54,11 @@ 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]
+  if $tickets
+    str = str.gsub('last_ticket.id', $tickets.last.attributes['id'])
+  end
+  if $github_url
+    issue_id = $github_url.match(/https:\/\/github.com\/.+\/issues\/(\d+)/)[1]
     str = str.gsub('issue.id', issue_id)
   end
   str = str.gsub('env.home', ENV['REPO'] == 'owner' ? config['owner'] : config['user'])
@@ -63,23 +74,73 @@ def log(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)
-    
+  fixtures = "#{BASE}/features/fixtures"
+
+  if !$repo_cache_created || !$repos || reload
+    Dir.chdir(fixtures)
+  end
+
+  if !$repo_cache_created || reload
+    $stdout.puts "Creating cached fixture repositories..."
+
     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"
+      "rm -rf #{fixtures}/owner_cache",
+      "rm -rf #{fixtures}/user_cache",
+      "mkdir -p #{fixtures}/owner_cache",
+      "cd #{fixtures}/owner_cache",
+      "git init . -q",
+      "git remote add origin git@github.com:#{config['owner']}/#{config['repo']}.git",
+      "echo 'first commit' > README",
+      "git add .",
+      "git commit -q -a -m 'First commit'",
+      "git push origin master --force -q",
+      "git fetch -q",
+      "cd #{fixtures}",
+      "rm -rf user_cache",
+      "cp -r owner_cache user_cache",
+      "cd user_cache",
+      "git remote rm origin",
+      "git remote add origin git@github.com:#{config['user']}/#{config['repo']}.git",
+      "git fetch -q",
+      "git push origin master --force -q"
     ].join(' && ')
 
-    $repos = { :owner => owner, :user => user }
+    unless $repo_cache_created
+      $stdout.puts "Clearing old fixture branches..."
+
+      [ 'owner', 'user' ].each do |type|
+        system(
+          "cd #{fixtures}/#{type}_cache && " +
+          [
+            "git branch -r",
+            "grep origin/",
+            "grep -v master$",
+            "grep -v HEAD",
+            "cut -d/ -f2-",
+            "while read line; do git push origin :$line -q; git branch -D $line; done;"
+          ].join(' | ')
+          )
+      end
+    end
+
+    $repo_cache_created = true
   end
+
+  if !$repos || reload
+    $repos = {}
+
+    [ 'owner', 'user' ].each do |type|
+      FileUtils.rm_rf("#{fixtures}/#{type}")
+      $repos[type.to_sym] = "#{fixtures}/#{type}"
+
+      system [
+        "cd #{fixtures}",
+        "cp -R #{type}_cache #{type}"
+      ].join(' && ')
+    end
+  end
+
+  $repos
 end
 
 def run_gitcycle(cmd)
@@ -90,6 +151,9 @@ def run_gitcycle(cmd)
     @output << "#{str}\n"
     puts str
   end
+  if @scenario_title.include?('Collaborator')
+    @gitcycle.stub(:collab?).and_return(true)
+  end
   if cmd
     @gitcycle.start(Shellwords.split(cmd))
   else
@@ -105,15 +169,8 @@ 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
-  $ticket.attributes['id'] = "master-#{$ticket.attributes['id']}"
+When /^I create a new branch "([^\"]*)"$/ do |branch|
+  `git branch #{branch}`
 end
 
 When /^I execute gitcycle with nothing$/ do
@@ -124,6 +181,11 @@ When /^I execute gitcycle with "([^\"]*)"$/ do |cmd|
   $execute << gsub_variables(cmd)
 end
 
+When /^I give default input$/ do
+  step "I enter \"y\""
+  step "I enter \"y\""
+end
+
 When /^I execute gitcycle setup$/ do
   FileUtils.rm(GITCYCLE) if File.exists?(GITCYCLE)
   $execute << [
@@ -140,10 +202,23 @@ When /^I execute gitcycle setup$/ do
   ].join(' ')
 end
 
-When /^I execute gitcycle (.*) with the Lighthouse ticket URL$/ do |cmd|
+When /^I execute gitcycle (.*) with a new URL or string$/ do |cmd|
+  $ticket = Lighthouse::Ticket.new(
+    :body => "test",
+    :project_id => config['lighthouse']['project'],
+    :state => "open",
+    :title => "Test ticket"
+  )
+  $ticket.save
+  $tickets ||= []
+  $tickets << $ticket
   $execute << "#{cmd} #{$ticket.url}"
 end
 
+When /^I execute gitcycle (.*) with the last URL or string$/ do |cmd|
+  $execute << "#{cmd} #{$tickets.last.url}"
+end
+
 When /^I cd to the (.*) repo$/ do |user|
   if ENV['REPO']
     puts "(overiding repo as #{ENV['REPO']})"
@@ -160,19 +235,22 @@ When /^I commit something$/ do
   branch = branches(:current => true)
   $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}`
+  `git add . && git add . -u && git commit -q -a -m '#{$commit_msg}'`
+  `git push origin #{branch} -q`
 end
 
 When /^I checkout (.+)$/ do |branch|
   branch = gsub_variables(branch)
-  `git checkout #{branch}`
+  `git checkout #{branch} -q`
 end
 
-Then /^gitcycle runs$/ do
-  $execute.each do |cmd|
-    run_gitcycle(cmd)
-  end
+When /^I push (.+)$/ do |branch|
+  branch = gsub_variables(branch)
+  `git push origin #{branch} -q`
+end
+
+When /^gitcycle runs$/ do
+  run_gitcycle($execute.shift) until $execute.empty?
 end
 
 Then /^gitcycle runs with exit$/ do
@@ -198,12 +276,12 @@ end
 
 Then /^output includes \"([^\"]*)" with URL$/ do |expected|
   expected = gsub_variables(expected)
-  @output.include?(expected).should == true
-  $url = @output.match(/#{expected}.*(https?:\/\/[^\s]+)/)[1]
+  @output.should =~ /#{expected}.*(https?:\/\/[^\s]+)/
 end
 
 Then /^output includes$/ do |expected|
   expected = gsub_variables(expected).gsub('\t', "\t")
+  $stdout.puts expected
   @output.gsub(/\n+/, "\n").include?(expected).should == true
 end
 
@@ -213,7 +291,20 @@ Then /^output does not include \"([^\"]*)"$/ do |expected|
 end
 
 Then /^redis entries valid$/ do
-  add = @scenario_title.include?('custom branch name') ? "-rename" : ""
+  collab = @scenario_title.include?('Collaborator')
+  before =
+    if collab
+      "br-some_branch-"
+    else
+      "master-"
+    end
+  after = 
+    if @scenario_title.include?('Custom branch name')
+      "-rename"
+    else
+      ""
+    end
+  ticket_id = "#{before}#{$ticket.attributes['id']}#{after}"
   branch = $redis.hget(
     [
       "users",
@@ -222,22 +313,22 @@ Then /^redis entries valid$/ do
       "#{config['owner']}:#{config['repo']}",
       "branches"
     ].join('/'),
-    $ticket.attributes['id'] + add
+    ticket_id
   )
   branch = Yajl::Parser.parse(branch)
   should = {
     'lighthouse_url' => $ticket.url,
     'body' => "<div><p>test</p></div>\n\n#{$ticket.url}",
-    'home' => ENV['REPO'] == 'owner' ? config['owner'] : config['user'],
-    'name' => $ticket.attributes['id'] + add,
-    'id' => $ticket.attributes['id'] + add,
+    'home' => collab || ENV['REPO'] == 'owner' ? config['owner'] : config['user'],
+    'name' => ticket_id,
+    'id' => ticket_id,
     'title' => $ticket.title,
     'repo' => "#{config['owner']}:#{config['repo']}",
     'user' => config['user'],
-    'source' => 'master'
+    'source' => collab ? 'some_branch' : 'master'
   }
-  if @scenario_title == 'Discuss commits w/ no parameters and something committed'
-    should['issue_url'] = $url
+  if @scenario_title == 'No parameters and something committed'
+    should['issue_url'] = $github_url
   end
   branch.should == should
 end
@@ -251,5 +342,5 @@ Then /^git log should contain the last commit$/ do
 end
 
 Then /^URL is a valid issue$/ do
-  $url.should =~ /https:\/\/github.com\/.+\/issues\/\d+/
+  $github_url.should =~ /https:\/\/github.com\/.+\/issues\/\d+/
 end

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -25,6 +25,8 @@ class Gitcycle
     end
   
   def initialize(args=nil)
+    $remotes = {}
+
     if ENV['CONFIG']
       @config_path = File.expand_path(ENV['CONFIG'])
     else
@@ -65,6 +67,10 @@ class Gitcycle
       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
+
     puts "\nRetrieving branch information from gitcycle.\n".green
     branch = get('branch', params)
     name = branch['name']
@@ -73,8 +79,8 @@ class Gitcycle
       owner, repo = branch['repo'].split(':')
       branch['home'] = @git_login
 
-      unless yes?("\nYour work will eventually merge into '#{branch['source']}'. Is this correct?")
-        branch['source'] = q("What branch would you like to eventually merge into?")
+      if branch['source'].include?('/')
+        branch['home'], branch['source'] = branch['source'].split('/')
       end
 
       unless yes?("Would you like to name your branch '#{name}'?")
@@ -145,14 +151,13 @@ class Gitcycle
           get('branch',
             'branch[home]' => remote,
             'branch[name]' => branch,
-            'branch[collab]' => 1,
             'create' => 1
           )
         end
       end
 
       puts "Checking out '#{branch}'.\n".green
-      run("git checkout #{branch}")
+      run("git checkout -q #{branch}")
     end
   end
   alias :co :checkout
@@ -236,9 +241,7 @@ class Gitcycle
       'create' => 0
     )
 
-    collab = branch && branch['collab'] == '1'
-
-    if collab
+    if collab?(branch)
       # Merge from collab
       merge_remote_branch(
         :owner => branch['home'],
@@ -264,7 +267,7 @@ class Gitcycle
       )
     end
 
-    unless collab
+    unless collab?(branch)
       # Merge from origin
       merge_remote_branch(
         :owner => @git_login,
@@ -281,12 +284,11 @@ class Gitcycle
 
     require_git && require_config
 
-    branch = pull
-    remote = branch && branch['collab'] == '1' ? branch['home'] : 'origin'
-
+    pull
     branch = branches(:current => true)
-    puts "\nPushing branch '#{remote}/#{branch}'.\n".green
-    run("git push #{remote} #{branch}")
+
+    puts "\nPushing branch 'origin/#{branch}'.\n".green
+    run("git push origin #{branch} -q")
   end
 
   def qa(*issues)
@@ -303,15 +305,31 @@ class Gitcycle
       end
     elsif issues.first == 'fail' || issues.first == 'pass'
       branch = branches(:current => true)
-      label = issues.first.capitalize
-
-      if branch =~ /^qa_/
+      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
+        end
+      elsif branch =~ /^qa_/
         puts "\nRetrieving branch information from gitcycle.\n".green
         qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
 
-        pass_fail = issues.first
-        issues = issues[1..-1]
-
         if pass_fail == 'pass'
           checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
         end
@@ -324,19 +342,18 @@ class Gitcycle
           end
         end
 
-        branches.each do |branch|
-          if pass_fail == 'pass'
-            merge_remote_branch(
-              :owner => branch['home'],
-              :repo => branch['repo'].split(':')[1],
-              :branch => branch['branch'],
-              :issue => branch['issue'],
-              :issues => qa_branch['branches'].collect { |b| b['issue'] },
-              :type => :from_qa
-            )
-          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?
+        unless issues.empty?
+          branches.each do |branch|
             puts "\nLabeling issue #{branch['issue']} as '#{label}'.\n".green
             get('label',
               'qa_branch[source]' => qa_branch['source'],
@@ -371,7 +388,7 @@ class Gitcycle
           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']}")
+          run("git push origin qa_#{qa_branch['source']}_#{qa_branch['user']} -q")
 
           puts "\nDe-conflicting on gitcycle.\n".green
           get('qa_branch',
@@ -397,31 +414,29 @@ class Gitcycle
   def ready(*issues)
     require_git && require_config
 
-    if issues.empty?
-      branch = pull
-      branch = create_pull_request(branch)
+    branch = pull
 
-      if branch == false
-        puts "Branch not found.\n".red
-      elsif branch['issue_url']
-        puts "\nLabeling issue as 'Pending Review'.\n".green
-        get('label',
-          'branch[name]' => branch['name'],
-          'labels' => [ 'Pending Review' ]
-        )
+    if branch && !collab?(branch)
+      branch = create_pull_request(branch)
+    end
 
-        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
+    if branch == false
+      puts "Branch not found.\n".red
+    elsif collab?(branch)
+      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',
-        'issues' => issues,
-        'labels' => [ 'Pending Review' ],
-        'scope' => 'repo'
+        '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
 
@@ -483,8 +498,6 @@ class Gitcycle
     owner = options[:owner]
     repo = options[:repo]
 
-    $remotes ||= {}
-
     unless $remotes[owner]
       $remotes[owner] = true
       
@@ -514,14 +527,14 @@ class Gitcycle
 
     if branches(:match => name)
       puts "Checking out branch '#{name}'.\n".green
-      run("git checkout #{name}")
+      run("git checkout #{name} -q")
     else
       puts "Tracking branch '#{remote}/#{name}'.\n".green
       run("git fetch -q #{remote}")
-      run("git checkout -b #{name} #{remote}/#{name}")
+      run("git checkout -q -b #{name} #{remote}/#{name}")
     end
 
-    run("git pull #{remote} #{name}")
+    run("git pull #{remote} #{name} -q")
   end
 
   def checkout_remote_branch(options={})
@@ -532,12 +545,12 @@ class Gitcycle
 
     if branches(:match => target)
       if yes?("You already have a branch called '#{target}'. Overwrite?")
-        run("git push origin :#{target}")
-        run("git checkout master")
+        run("git push origin :#{target} -q")
+        run("git checkout master -q")
         run("branch -D #{target}")
       else
-        run("git checkout #{target}")
-        run("git pull origin #{target}")
+        run("git checkout #{target} -q")
+        run("git pull origin #{target} -q")
         return
       end
     end
@@ -545,18 +558,30 @@ class Gitcycle
     add_remote_and_fetch(options)
     
     puts "Checking out remote branch '#{target}' from '#{owner}/#{repo}/#{branch}'.\n".green
-    run("git checkout -b #{target} #{owner}/#{branch}")
+    run("git checkout -q -b #{target} #{owner}/#{branch}")
 
     puts "Fetching remote 'origin'.\n".green
     run("git fetch -q origin")
 
     if branches(:remote => true, :match => "origin/#{target}")
       puts "Pulling 'origin/#{target}'.\n".green
-      run("git pull origin #{target}")
+      run("git pull origin #{target} -q")
     end
 
     puts "Pushing 'origin/#{target}'.\n".green
-    run("git push origin #{target}")
+    run("git push origin #{target} -q")
+  end
+
+  def collab?(branch)
+    return false unless branch
+    owner =
+      if branch['repo'].is_a?(::Hash)
+        branch['repo']['owner']
+      else
+        branch['repo'].split(':')[0]
+      end
+    branch['home'] != branch['user'] &&
+    branch['home'] != owner
   end
 
   def command_not_recognized
@@ -588,17 +613,21 @@ class Gitcycle
   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
-        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?")
+        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
@@ -613,10 +642,10 @@ class Gitcycle
           if branches(:match => name, :all => true)
             puts "Deleting old QA branch '#{name}'.\n".green
             if branches(:match => name)
-              run("git checkout master")
+              run("git checkout master -q")
               run("git branch -D #{name}")
             end
-            run("git push origin :#{name}")
+            run("git push origin :#{name} -q")
           end
 
           checkout_remote_branch(
@@ -651,8 +680,10 @@ class Gitcycle
           )
         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
+        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
 
         unless warnings.empty?
           puts "\n#{"WARNING:".red} If you pass this QA branch, the following branches will merge into '#{source.yellow}':\n"
@@ -665,6 +696,8 @@ class Gitcycle
           puts "\nBe sure this is correct!\n".yellow
         end
       end
+
+      qa_branch
     end
   end
 
@@ -684,7 +717,7 @@ class Gitcycle
     if $? != 0
       puts "Conflict occurred when merging '#{branch}'#{" (issue ##{issue})" if issue}.\n".red
       
-      if type # from_qa or to_qa
+      if type == :to_qa
         puts "Please resolve this conflict with '#{owner}'.\n".yellow
       
         puts "\nSending conflict information to gitcycle.\n".green
@@ -696,7 +729,7 @@ class Gitcycle
     elsif type # from_qa or to_qa
       branch = branches(:current => true)
       puts "Pushing branch '#{branch}'.\n".green
-      run("git push origin #{branch}")
+      run("git push origin #{branch} -q")
     end
   end
 
@@ -765,7 +798,7 @@ class Gitcycle
 
     if branches(:remote => true, :match => "#{owner}/#{branch}")
       puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
-      run("git merge #{owner}/#{branch}")
+      run("git merge #{owner}/#{branch} -q")
 
       fix_conflict(options)
     end