gitcycle 0.1.11 → 0.1.13

data/README.md

@@ -99,8 +99,6 @@ This will add a "pass" label to the issue and will complete the pull request by
 Todo
 ----
 
-* Check for conflict whenever merge happens
-* Add conflict check when calling "qa pass [ticket]"
 * Instead of detecting CONFLICT, use error status $? != 0
 * Add comment on lighthouse with issue URL
 * Label issues with ticket milestone?

data/features/gitcycle.feature

@@ -34,7 +34,8 @@ Scenario: Feature branch w/ custom branch name
       Adding remote repo 'config.owner/config.repo'.
       Fetching remote repo 'config.owner/config.repo'.
       Checking out remote branch 'ticket.id-rename' from 'config.owner/config.repo/master'.
-      Pushing 'ticket.id-rename'.
+      Pulling 'origin/ticket.id-rename'.
+      Pushing 'origin/ticket.id-rename'.
       Sending branch information to gitcycle.
       """
     And redis entries valid
@@ -55,7 +56,8 @@ Scenario: Feature branch
       Adding remote repo 'config.owner/config.repo'.
       Fetching remote repo 'config.owner/config.repo'.
       Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
-      Pushing 'ticket.id'.
+      Pulling 'origin/ticket.id'.
+      Pushing 'origin/ticket.id'.
       Sending branch information to gitcycle.
       """
     And redis entries valid
@@ -79,7 +81,7 @@ Scenario: Checkout via ticket w/ fresh repo
     And output includes
       """
       Retrieving branch information from gitcycle.
-      Tracking branch 'ticket.id'.
+      Tracking branch 'origin/ticket.id'.
       """
     And current branch is "ticket.id"
 
@@ -178,7 +180,8 @@ Scenario: QA issue
       Adding remote repo 'config.owner/config.repo'.
       Fetching remote repo 'config.owner/config.repo'.
       Checking out remote branch 'qa_master' from 'config.owner/config.repo/master'.
-      Pushing 'qa_master'.
+      Pulling 'origin/qa_master'.
+      Pushing 'origin/qa_master'.
       Adding remote repo 'config.user/config.repo'.
       Fetching remote repo 'config.user/config.repo'.
       Merging remote branch 'ticket.id' from 'config.user/config.repo'.

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -81,13 +81,7 @@ class Gitcycle
     end
 
     if branch['exists']
-      if branches(:match => name)
-        puts "Checking out branch '#{name}'.\n".green
-        run("git checkout #{name}")
-      else
-        puts "Tracking branch '#{name}'.\n".green
-        run("git fetch && git checkout -b #{name} origin/#{name}")
-      end
+      checkout_or_track(:name => name, :remote => 'origin')
     else
       puts "Sending branch information to gitcycle.".green
       get('branch',
@@ -172,10 +166,7 @@ class Gitcycle
         issues = issues[1..-1]
 
         if pass_fail == 'pass'
-          puts "Checking out #{qa_branch['source']}.".green
-          run("git checkout #{qa_branch['source']}")
-          run("git pull origin #{qa_branch['source']}")
-          # TODO: track if source branch doesn't exist
+          checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
         end
 
         if issues.empty? 
@@ -355,7 +346,7 @@ class Gitcycle
     end
     
     puts "Fetching remote repo '#{owner}/#{repo}'.\n".green
-    run("git fetch #{owner}")
+    run("git fetch -q #{owner}")
   end
 
   def branches(options={})
@@ -369,6 +360,22 @@ class Gitcycle
     end
   end
 
+  def checkout_or_track(options={})
+    name = options[:name]
+    remote = options[:remote]
+
+    if branches(:match => name)
+      puts "Checking out branch '#{name}'.\n".green
+      run("git checkout #{name}")
+    else
+      puts "Tracking branch '#{remote}/#{name}'.\n".green
+      run("git fetch -q #{remote}")
+      run("git checkout --track -b #{name} #{remote}/#{name}")
+    end
+
+    run("git pull #{remote} #{name}")
+  end
+
   def checkout_remote_branch(options={})
     owner = options[:owner]
     repo = options[:repo]
@@ -376,9 +383,12 @@ class Gitcycle
     target = options[:target] || branch
 
     if branches(:match => target)
-      unless yes?("You already have a branch called '#{target}'. Overwrite?")
+      if yes?("You already have a branch called '#{target}'. Overwrite?")
+        run("git push origin :#{target}")
+        run("branch -D #{target}")
+      else
         run("git checkout #{target}")
-        run("git pull #{owner} #{target}")
+        run("git pull origin #{target}")
         return
       end
     end
@@ -386,9 +396,12 @@ 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 "Pushing '#{target}'.\n".green
+    puts "Pushing 'origin/#{target}'.\n".green
     run("git push origin #{target}")
   end
 

metadata

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