gitcycle 0.1.15 → 0.1.16

data/README.md

@@ -115,14 +115,13 @@ If you are working in a fork, it is easy to track upstream branches:
 Todo
 ----
 
-* Instead of detecting CONFLICT, use error status $? != 0
-* Add comment on lighthouse with issue URL
-* Label issues with ticket milestone?
-* gitc qa pass, should not set ticket to pending-approval if its already resolved
-* gitc pull before gitc ready
+* Fix git fatal error (related to pull?)
+* On pass or fail, send email to Github email
+* Change QA branch name to qa_login_branch
 * Note you can use gitc with a string
 * Tag issue with Lighthouse tags (if == backend or frontend)
-* On pass or fail, send email to Github email
+* gitc qa pass, should not set ticket to pending-approval if its already resolved
 * If gitc reset happens on branch with Github issue, close the existing issue
-* Change QA branch name to qa_login_branch
-* LH states aren't being updated to pending-* states, the active state update works, reported by Jimmy
+* Add comment on lighthouse with issue URL
+* Instead of detecting CONFLICT, use error status $? != 0
+* Label issues with ticket milestone?

data/features/gitcycle.feature

@@ -32,9 +32,9 @@ Scenario: Feature branch w/ custom branch name
       Would you like to name your branch 'ticket.id'? (y/n)
       What would you like to name your branch?
       Adding remote repo 'config.owner/config.repo'.
-      Fetching remote repo 'config.owner/config.repo'.
+      Fetching remote 'config.owner'.
       Checking out remote branch 'ticket.id-rename' from 'config.owner/config.repo/master'.
-      Pulling 'origin/ticket.id-rename'.
+      Fetching remote 'origin'.
       Pushing 'origin/ticket.id-rename'.
       Sending branch information to gitcycle.
       """
@@ -54,9 +54,9 @@ Scenario: Feature branch
       Your work will eventually merge into 'master'. Is this correct? (y/n)
       Would you like to name your branch 'ticket.id'? (y/n)
       Adding remote repo 'config.owner/config.repo'.
-      Fetching remote repo 'config.owner/config.repo'.
+      Fetching remote 'config.owner'.
       Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
-      Pulling 'origin/ticket.id'.
+      Fetching remote 'origin'.
       Pushing 'origin/ticket.id'.
       Sending branch information to gitcycle.
       """
@@ -75,8 +75,9 @@ Scenario: Reset feature branch
       Your work will eventually merge into 'master'. Is this correct? (y/n)
       Would you like to name your branch 'ticket.id'? (y/n)
       Adding remote repo 'config.owner/config.repo'.
-      Fetching remote repo 'config.owner/config.repo'.
+      Fetching remote 'config.owner'.
       Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
+      Fetching remote 'origin'.
       Pulling 'origin/ticket.id'.
       Pushing 'origin/ticket.id'.
       Sending branch information to gitcycle.
@@ -118,7 +119,7 @@ Scenario: Pull changes from upstream
       """
       Retrieving branch information from gitcycle.
       Adding remote repo 'config.owner/config.repo'.
-      Fetching remote repo 'config.owner/config.repo'.
+      Fetching remote 'config.owner'.
       Merging remote branch 'master' from 'config.owner/config.repo'.
       """
     And git log should contain the last commit
@@ -168,7 +169,15 @@ Scenario: Ready issue w/ no parameters
     And I checkout ticket.id
     And I execute gitcycle with "ready"
   Then gitcycle runs
-    And output includes "Labeling issue as 'Pending Review'."
+    And 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'.
+      Retrieving branch information from gitcycle.
+      Labeling issue as 'Pending Review'.
+      """
 
 Scenario: Ready issue w/ parameters
   When I cd to the user repo
@@ -199,12 +208,12 @@ Scenario: QA issue
       Retrieving branch information from gitcycle.
       Deleting old QA branch 'qa_master'.
       Adding remote repo 'config.owner/config.repo'.
-      Fetching remote repo 'config.owner/config.repo'.
+      Fetching remote 'config.owner'.
       Checking out remote branch 'qa_master' from 'config.owner/config.repo/master'.
-      Pulling 'origin/qa_master'.
+      Fetching remote 'origin'.
       Pushing 'origin/qa_master'.
       Adding remote repo 'config.user/config.repo'.
-      Fetching remote repo 'config.user/config.repo'.
+      Fetching remote 'config.user'.
       Merging remote branch 'ticket.id' from 'config.user/config.repo'.
       Pushing branch 'qa_master'.
       Type 'gitc qa pass' to approve all issues in this branch.
@@ -219,5 +228,5 @@ Scenario: QA issue list
     And output includes
       """
       qa_master
-        issue #issue.id config.user/ticket.id
+        issue #issue.id\tconfig.user/ticket.id
       """

data/features/steps/gitcycle_steps.rb

@@ -200,7 +200,7 @@ Then /^output includes \"([^\"]*)" with URL$/ do |expected|
 end
 
 Then /^output includes$/ do |expected|
-  expected = gsub_variables(expected)
+  expected = gsub_variables(expected).gsub('\t', "\t")
   @output.gsub(/\n+/, "\n").include?(expected).should == true
 end
 

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -261,6 +261,7 @@ class Gitcycle
     require_git && require_config
 
     if issues.empty?
+      pull
       branch = create_pull_request
 
       if branch == false
@@ -365,12 +366,12 @@ class Gitcycle
       run("git remote add #{owner} git@github.com:#{owner}/#{repo}.git")
     end
     
-    puts "Fetching remote repo '#{owner}/#{repo}'.\n".green
+    puts "Fetching remote '#{owner}'.\n".green
     run("git fetch -q #{owner}")
   end
 
   def branches(options={})
-    b = `git branch#{" -a" if options[:all]}`
+    b = `git branch#{" -a" if options[:all]}#{" -r" if options[:remote]}`
     if options[:current]
       b.match(/\*\s+(.+)/)[1]
     elsif options[:match]
@@ -390,7 +391,7 @@ class Gitcycle
     else
       puts "Tracking branch '#{remote}/#{name}'.\n".green
       run("git fetch -q #{remote}")
-      run("git checkout -b #{name} #{remote}/#{name}")
+      run("git checkout --track -b #{name} #{remote}/#{name}")
     end
 
     run("git pull #{remote} #{name}")
@@ -416,10 +417,15 @@ 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 --track -b #{target} #{owner}/#{branch}")
 
-    puts "Pulling 'origin/#{target}'.\n".green
-    run("git pull origin #{target}")
+    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}")
+    end
 
     puts "Pushing 'origin/#{target}'.\n".green
     run("git push origin #{target}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 1
-  - 15
-  version: 0.1.15
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 -08:00
+date: 2012-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency