gitcycle 0.1.8 → 0.1.9

data/README.md

@@ -99,7 +99,11 @@ This will add a "pass" label to the issue and will complete the pull request by
 Todo
 ----
 
+* Make ticket active when starting branch
 * Label issues with ticket milestone?
-* Add confirmation when creating new dev branch for branch that it is based off of
-	* If confirmation is a no, allow user to specify branch to base off of
-* bug with branch rename on Jimmy's machine
+* Check for conflict whenever merge happens
+* Instead of detecting CONFLICT, use error status $? != 0
+* Add comment on lighthouse with issue URL
+* Need to make sure when a branch is created, it is always from the pristine remote version, not local
+* Add conflict check when calling "qa pass [ticket]"
+* Need to change Github.parseLabels so we can have a "Fail" label along side a "Pending" tag, but for all other cases there should only be one of these tags present: "Pending QA", "Pending Review", "Pass"

data/features/gitcycle.feature

@@ -21,16 +21,24 @@ Scenario: Feature branch w/ custom branch name
     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"
     And I enter "n"
     And I enter "ticket.id-rename"
   Then gitcycle runs
-    And 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 output includes
+      """
+      Retrieving branch information from gitcycle.
+      Your work will eventually merge into 'master'. Is this correct? (y/n)
+      Adding remote repo 'br/gitcycle_test'.
+      Fetching remote repo 'br'.
+      Checking out remote branch 'master' from 'br/gitcycle_test'.
+      Would you like to name your branch 'ticket.id'? (y/n)
+      What would you like to name your branch?
+      Creating 'ticket.id-rename' from 'master'.
+      Checking out branch 'ticket.id-rename'.
+      Pushing 'ticket.id-rename'.
+      Sending branch information to gitcycle.
+      """
     And redis entries valid
 
 Scenario: Feature branch
@@ -39,27 +47,32 @@ Scenario: Feature branch
   When I cd to the user repo
     And I execute gitcycle with the Lighthouse ticket URL
     And I enter "y"
+    And I enter "y"
   Then gitcycle runs
-    And 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 output includes
+      """
+      Retrieving branch information from gitcycle.
+      Your work will eventually merge into 'master'. Is this correct? (y/n)
+      Adding remote repo 'br/gitcycle_test'.
+      Fetching remote repo 'br'.
+      Checking out remote branch 'master' from 'br/gitcycle_test'.
+      Would you like to name your branch 'ticket.id'? (y/n)
+      Creating 'ticket.id' from 'master'.
+      Checking out branch 'ticket.id'.
+      Pushing 'ticket.id'.
+      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 gitcycle runs
-    And 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 output includes
+      """
+      Retrieving branch information from gitcycle.
+      Checking out branch 'ticket.id'.
+      """
     And current branch is "ticket.id"
 
 Scenario: Checkout via ticket w/ fresh repo
@@ -67,13 +80,11 @@ Scenario: Checkout via ticket w/ fresh repo
   When I cd to the user repo
     And I execute gitcycle with the Lighthouse ticket URL
   Then gitcycle runs
-    And 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 output includes
+      """
+      Retrieving branch information from gitcycle.
+      Tracking branch 'ticket.id'.
+      """
     And current branch is "ticket.id"
 
 Scenario: Pull changes from upstream
@@ -84,10 +95,13 @@ Scenario: Pull changes from upstream
     And I checkout ticket.id
     And I execute gitcycle with "pull"
   Then gitcycle runs
-    And 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 output includes
+      """
+      Retrieving branch information from gitcycle.
+      Adding remote repo 'config.owner/config.repo'.
+      Fetching remote repo 'config.owner'.
+      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
@@ -95,11 +109,12 @@ Scenario: Discuss commits w/ no parameters and nothing committed
     And I checkout ticket.id
     And I execute gitcycle with "discuss"
   Then gitcycle runs
-    And 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 output includes
+      """
+      Retrieving branch information from gitcycle.
+      Creating GitHub pull request.
+      You must push code before opening a pull request.
+      """
     And redis entries valid
 
 Scenario: Discuss commits w/ no parameters and something committed
@@ -108,11 +123,12 @@ Scenario: Discuss commits w/ no parameters and something committed
     And I commit something
     And I execute gitcycle with "discuss"
   Then gitcycle runs
-    And 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
+      """
+      Retrieving branch information from gitcycle.
+      Creating GitHub pull request.
+      """
     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
 
@@ -154,20 +170,20 @@ Scenario: Reviewed issue w/ parameters
   Then gitcycle runs
     And 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 gitcycle runs
-#     And output includes
-#       """
-#       Retrieving branch information from gitcycle.
-#       Deleting old QA branch 'qa_master'.
-#       Creating QA branch 'qa_master'.
-#       Adding remote repo 'br/gitcycle_test'.
-#       Fetching remote branch '200-test-ticket'.
-#       Merging remote branch '200-test-ticket' from 'br/gitcycle_test'.
-#       Pushing QA branch 'qa_master'.
-#       Type 'gitc qa pass' to approve all issues in this branch.
-#       Type 'gitc qa fail' to reject all issues in this branch.
-#       """
+Scenario: QA issue
+  When I cd to the owner repo
+    And I checkout master
+    And I execute gitcycle with "qa issue.id"
+  Then gitcycle runs
+    And output includes
+      """
+      Retrieving branch information from gitcycle.
+      Deleting old QA branch 'qa_master'.
+      Creating QA branch 'qa_master'.
+      Adding remote repo 'config.user/gitcycle_test'.
+      Fetching remote repo 'config.user'.
+      Merging remote branch 'ticket.id' from 'config.user/gitcycle_test'.
+      Pushing QA branch 'qa_master'.
+      Type 'gitc qa pass' to approve all issues in this branch.
+      Type 'gitc qa fail' to reject all issues in this branch.
+      """

data/features/steps/gitcycle_steps.rb

@@ -87,7 +87,7 @@ def run_gitcycle(cmd)
   @gitcycle = Gitcycle.new
   @gitcycle.stub(:puts) do |str|
     str = str.gsub(/\e\[\d{1,2}m/, '')
-    @output << str
+    @output << "#{str}\n"
     puts str
   end
   if cmd
@@ -197,12 +197,12 @@ end
 
 Then /^output includes$/ do |expected|
   expected = gsub_variables(expected)
-  @output.include?(expected).should == true
+  @output.gsub(/\n+/, "\n").include?(expected).should == true
 end
 
 Then /^output does not include \"([^\"]*)"$/ do |expected|
   expected = gsub_variables(expected)
-  @output.gsub(/\n+/, "\n").include?(expected).should == false
+  @output.include?(expected).should == false
 end
 
 Then /^redis entries valid$/ do

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -56,18 +56,21 @@ class Gitcycle
     branch = get('branch', params)
 
     name = branch['name']
+    owner, repo = branch['repo'].split(':')
 
     unless branch['exists']
       branch['home'] = @git_login
       branch['source'] = branches(:current => true)
 
-      # unless yes?("Would you like to eventually merge this feature into #{branch['source']}?")
-      #   branch['source'] = q("What branch would you like to eventually merge this feature into?")
-      # end
+      unless yes?("Your work will eventually merge into '#{branch['source']}'. Is this correct?")
+        branch['source'] = q("What branch would you like to eventually merge into?")
+      end
 
-      # unless branches(:match => branch['source'])
-        
-      # end
+      checkout_remote_branch(
+        :owner => owner,
+        :repo => repo,
+        :branch => branch['source']
+      )
 
       unless yes?("Would you like to name your branch '#{name}'?")
         name = q("\nWhat would you like to name your branch?")
@@ -89,7 +92,7 @@ class Gitcycle
     end
 
     unless branch['exists']
-      puts "Pushing '#{name}'.".green
+      puts "Pushing '#{name}'.\n".green
       run("git push origin #{name}")
 
       puts "Sending branch information to gitcycle.".green
@@ -173,11 +176,13 @@ class Gitcycle
 
         puts "Checking out #{qa_branch['source']}.".green
         run("git checkout #{qa_branch['source']}")
+        run("git pull origin #{qa_branch['source']}")
 
         if issues[1..-1].empty?
           if issues.first == 'pass'
             puts "Merging '#{branch}' into '#{qa_branch['source']}'.\n".green
             run("git merge #{branch}")
+            run("git pull origin #{qa_branch['source']}")
             run("git push origin #{qa_branch['source']}")
           end
           
@@ -329,6 +334,23 @@ class Gitcycle
 
   private
 
+  def add_remote_and_fetch(options={})
+    owner = options[:owner]
+    repo = options[:repo]
+
+    $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 repo '#{owner}'.\n".green
+    run("git fetch #{owner}")
+  end
+
   def branches(options={})
     b = `git branch#{" -a" if options[:all]}`
     if options[:current]
@@ -345,20 +367,22 @@ class Gitcycle
     repo = options[:repo]
     branch = options[:branch]
 
-    $remotes ||= {}
+    add_remote_and_fetch(options)
+    
+    puts "\nChecking out remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
 
-    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")
+    if branches(:match => branch)
+      run("git checkout #{branch}")
+    else
+      run("git checkout -b #{branch} #{owner}/#{branch}")
     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}")
+    if branches(:current => true) == branch
+      run("git pull #{owner} #{branch}")
+    else
+      puts "Oops. Something bad happened.\n".red
+      exit
+    end
   end
 
   def create_pull_request
@@ -408,6 +432,8 @@ class Gitcycle
             run("git fetch && git checkout -b #{source} origin/#{source}")
           end
 
+          run("git pull origin #{source}")
+
           if branches(:match => name, :all => true)
             puts "Deleting old QA branch '#{name}'.\n".green
             run("git branch -D #{name}")
@@ -507,17 +533,7 @@ class Gitcycle
     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}")
+    add_remote_and_fetch(options)
 
     puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
     run("git merge #{owner}/#{branch}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 -08:00
+date: 2012-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency