gitcycle 0.2.19 → 0.2.20

data/features/branch.feature

@@ -85,12 +85,12 @@ Scenario: Collaborator
     Your work will eventually merge into 'master'. Is this correct? (y/n)
     What branch would you like to eventually merge into?
     Retrieving branch information from gitcycle.
-    Would you like to name your branch 'config.owner-some_branch-ticket.id'? (y/n)
+    Would you like to name your branch 'ticket.id'? (y/n)
     Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
-    Checking out remote branch 'config.owner-some_branch-ticket.id' from 'config.owner/config.repo/some_branch'.
+    Checking out remote branch 'ticket.id' from 'config.owner/config.repo/some_branch'.
     Fetching remote 'origin'.
-    Pushing 'origin/config.owner-some_branch-ticket.id'.
+    Pushing 'origin/ticket.id'.
     Sending branch information to gitcycle.
     """
     And redis entries valid

data/features/checkout.feature

@@ -24,4 +24,23 @@ Scenario: Fresh repo
     Retrieving branch information from gitcycle.
     Tracking branch 'origin/master-last_ticket.id'.
     """
-    And current branch is "master-last_ticket.id"
+    And current branch is "master-last_ticket.id"
+
+Scenario: Collaborator
+  Given a fresh set of repositories
+  When I cd to the owner repo
+    And I execute gitcycle branch with a new URL or string
+    And I give default input
+    And gitcycle runs
+    And I cd to the user repo
+    And I execute gitcycle with "co config.owner/master-ticket.id"
+    And gitcycle runs
+  Then output includes
+    """
+    Adding remote repo 'config.owner/config.repo'.
+    Fetching remote 'config.owner'.
+    Creating branch 'master-ticket.id' from 'br/master-ticket.id'.
+    Sending branch information to gitcycle.
+    Checking out 'master-ticket.id'.
+    """
+    And current branch is "master-ticket.id"

data/features/discuss.feature

@@ -22,6 +22,7 @@ Scenario: (Discuss) No parameters and something committed
     And I give default input
     And gitcycle runs
     And I commit something
+    And I wait for 5 seconds
     And I execute gitcycle with "discuss"
     And gitcycle runs
   Then output includes

data/features/push.feature

@@ -0,0 +1,23 @@
+Feature: Push
+
+Scenario: Collaborator
+  Given a fresh set of repositories
+  When I cd to the owner repo
+    And I execute gitcycle branch with a new URL or string
+    And I give default input
+    And gitcycle runs
+    And I cd to the user repo
+    And I execute gitcycle with "co config.owner/master-ticket.id"
+    And gitcycle runs
+    And I commit something
+    And I execute gitcycle with "push"
+    And gitcycle runs
+  Then output includes
+    """
+    Retrieving branch information from gitcycle.
+    Adding remote repo 'config.owner/config.repo'.
+    Fetching remote 'config.owner'.
+    Merging remote branch 'master-ticket.id' from 'config.owner/config.repo'.
+    Pushing branch 'config.owner/master-ticket.id'.
+    """
+    And current branch is "master-ticket.id"

data/features/ready.feature

@@ -21,6 +21,45 @@ Scenario: Ready issue
     Creating GitHub pull request.
     Labeling issue as 'Pending Review'.
     """
+    And output includes "Opening issue" with URL
+    And URL is a valid issue
+
+Scenario: Reopen pull request
+  Given a fresh set of repositories
+  When I cd to the user repo
+    And I execute gitcycle branch with a new URL or string
+    And I give default input
+    And gitcycle runs
+    And I commit something
+    And I execute gitcycle with "ready"
+    And gitcycle runs
+    And I cd to the owner repo
+    And I checkout master
+    And I execute gitcycle with "qa pass issue.id"
+    And I enter "y"
+    And gitcycle runs
+    And I wait for 5 seconds
+    And I cd to the user repo
+    And I checkout master-ticket.id
+    And I commit something
+    And I wait for 5 seconds
+    And I execute gitcycle with "ready"
+    And gitcycle runs
+  Then output includes
+    """
+    Retrieving branch information from gitcycle.
+    Adding remote repo 'config.owner/config.repo'.
+    Fetching remote 'config.owner'.
+    Merging remote branch 'master' from 'config.owner/config.repo'.
+    Adding remote repo 'config.user/config.repo'.
+    Fetching remote 'config.user'.
+    Merging remote branch 'master-ticket.id' from 'config.user/config.repo'.
+    Creating GitHub pull request.
+    Labeling issue as 'Pending Review'.
+    """
+    And output includes "Opening issue" with URL
+    And URL is a valid issue
+    And URL is not the same as the last
 
 Scenario: Collaborator
   Given a fresh set of repositories
@@ -42,5 +81,6 @@ Scenario: Collaborator
     Retrieving branch information from gitcycle.
     Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
+    Merging remote branch 'some_branch' from 'config.owner/gitcycle_test'.
     Pushing branch 'config.owner/some_branch'.
     """

data/features/steps/gitcycle_steps.rb

@@ -18,6 +18,7 @@ $redis = Redis.new
 
 Before do |scenario|
   Launchy.stub :open do |url|
+    $last_url = $url
     if url =~ /https:\/\/github.com\/.+\/issues\/\d+/
       $github_url = url
     end
@@ -51,12 +52,12 @@ def config(reload=false)
 end
 
 def gsub_variables(str)
-  if $ticket
-    str = str.gsub('ticket.id', $ticket.attributes['id'])
-  end
   if $tickets
     str = str.gsub('last_ticket.id', $tickets.last.attributes['id'])
   end
+  if $ticket
+    str = str.gsub('ticket.id', $ticket.attributes['id'])
+  end
   if $github_url
     issue_id = $github_url.match(/https:\/\/github.com\/.+\/issues\/(\d+)/)[1]
     str = str.gsub('issue.id', issue_id)
@@ -151,9 +152,6 @@ 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
@@ -253,6 +251,16 @@ When /^gitcycle runs$/ do
   run_gitcycle($execute.shift) until $execute.empty?
 end
 
+When /^I resolve the conflict/ do
+  $commit_msg = "#{@scenario_title} - #{rand}"
+  File.open('README', 'w') {|f| f.write($commit_msg) }
+end
+
+When /^I wait for (.+) seconds/ do |seconds|
+  $stdout.puts "Waiting #{seconds} seconds..."
+  sleep seconds.to_i
+end
+
 Then /^gitcycle runs with exit$/ do
   $execute.each do |cmd|
     lambda { run_gitcycle(cmd) }.should raise_error SystemExit
@@ -292,12 +300,7 @@ end
 
 Then /^redis entries valid$/ do
   collab = @scenario_title.include?('Collaborator')
-  before =
-    if collab
-      "br-some_branch-"
-    else
-      "master-"
-    end
+  before = collab ? "" : "master-"
   after = 
     if @scenario_title.include?('Custom branch name')
       "-rename"
@@ -327,6 +330,7 @@ Then /^redis entries valid$/ do
     'user' => config['user'],
     'source' => collab ? 'some_branch' : 'master'
   }
+  should['collab'] = '1' if collab
   if @scenario_title.include?("(Discuss)") && @scenario_title.include?("something committed")
     should['labels'] = 'Branch - master'
     should['issue_url'] = $github_url
@@ -344,4 +348,8 @@ end
 
 Then /^URL is a valid issue$/ do
   $github_url.should =~ /https:\/\/github.com\/.+\/issues\/\d+/
+end
+
+Then /^URL is not the same as the last$/ do
+  $last_url.should_not == $url
 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.19'
+  s.version     = '0.2.20'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -71,17 +71,19 @@ class Gitcycle
       params['branch[source]'] = q("What branch would you like to eventually merge into?")
     end
 
+    source = params['branch[source]']
+    if source.include?('/')
+      params['branch[home]'], params['branch[source]'] = source.split('/')
+      params['branch[collab]'] = 1
+    end
+
     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
-
-      if branch['source'].include?('/')
-        branch['home'], branch['source'] = branch['source'].split('/')
-      end
+      branch['home'] ||= @git_login
 
       unless yes?("Would you like to name your branch '#{name}'?")
         name = q("\nWhat would you like to name your branch?")
@@ -89,7 +91,7 @@ class Gitcycle
       end
 
       checkout_remote_branch(
-        :owner => owner,
+        :owner => branch['collab'] ? branch['home'] : owner,
         :repo => repo,
         :branch => branch['source'],
         :target => name
@@ -115,13 +117,13 @@ class Gitcycle
   end
 
   def checkout(*args)
-    if args.length > 2 || options?(args)
+    if args.length != 1 || options?(args)
       exec_git(:checkout, args)
     end
 
     require_git && require_config
 
-    if args.length == 1 && args[0] =~ /^https?:\/\//
+    if args[0] =~ /^https?:\/\//
       puts "\nRetrieving branch information from gitcycle.\n".green
       branch = get('branch', 'branch[lighthouse_url]' => args[0], 'create' => 0)
       if branch
@@ -131,7 +133,7 @@ class Gitcycle
         puts "\nDid you mean: gitc branch #{args[0]}\n".yellow
       end
     else
-      remote, branch = args
+      remote, branch = args[0].split('/')
       remote, branch = nil, remote if branch.nil?
 
       unless branches(:match => branch)
@@ -156,6 +158,8 @@ class Gitcycle
           get('branch',
             'branch[home]' => remote,
             'branch[name]' => branch,
+            'branch[source]' => branch,
+            'branch[collab]' => 1,
             'create' => 1
           )
         end
@@ -246,12 +250,12 @@ class Gitcycle
       'create' => 0
     )
 
-    if collab?(branch)
+    if branch && branch['collab']
       # Merge from collab
       merge_remote_branch(
         :owner => branch['home'],
         :repo => branch['repo']['name'],
-        :branch => branch['name']
+        :branch => branch['source']
       )
     elsif branch
       # Merge from upstream source branch
@@ -272,7 +276,7 @@ class Gitcycle
       )
     end
 
-    unless collab?(branch)
+    unless branch && branch['collab']
       # Merge from origin
       merge_remote_branch(
         :owner => @git_login,
@@ -289,11 +293,15 @@ class Gitcycle
 
     require_git && require_config
 
-    pull
-    branch = branches(:current => true)
+    branch = pull
 
-    puts "\nPushing branch 'origin/#{branch}'.\n".green
-    run("git push origin #{branch} -q")
+    if branch['collab']
+      puts "\nPushing branch '#{branch['home']}/#{branch['name']}'.\n".green
+      run("git push #{branch['home']} #{branch['name']} -q")
+    else
+      puts "\nPushing branch 'origin/#{branch}'.\n".green
+      run("git push origin #{branch} -q")
+    end
   end
 
   def qa(*issues)
@@ -421,14 +429,14 @@ class Gitcycle
 
     branch = pull
 
-    if branch && !collab?(branch)
+    if branch && !branch['collab']
       force = branch['labels'] && branch['labels'].include?('Pass')
       branch = create_pull_request(branch, force)
     end
 
     if branch == false
       puts "Branch not found.\n".red
-    elsif collab?(branch)
+    elsif branch['collab']
       remote, branch = branch['home'], branch['source']
       puts "\nPushing branch '#{remote}/#{branch}'.\n".green
       run("git push #{remote} #{branch} -q")
@@ -578,18 +586,6 @@ class Gitcycle
     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
     readme = "https://github.com/winton/gitcycle/blob/master/README.md"
     puts "\nCommand not recognized.".red
@@ -793,7 +789,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} -q")
+      run("git merge #{owner}/#{branch}")
 
       fix_conflict(options)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 -07:00
+date: 2012-08-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,7 @@ files:
 - features/discuss.feature
 - features/errors.feature
 - features/pull.feature
+- features/push.feature
 - features/qa.feature
 - features/ready.feature
 - features/review.feature
@@ -206,6 +207,7 @@ test_files:
 - features/discuss.feature
 - features/errors.feature
 - features/pull.feature
+- features/push.feature
 - features/qa.feature
 - features/ready.feature
 - features/review.feature