gitcycle 0.1.10 → 0.1.11

data/README.md

@@ -99,11 +99,8 @@ 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?
 * 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
-* 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"
+* Label issues with ticket milestone?

data/features/gitcycle.feature

@@ -29,13 +29,11 @@ Scenario: Feature branch w/ custom branch name
       """
       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'.
+      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'.
       Sending branch information to gitcycle.
       """
@@ -53,12 +51,10 @@ Scenario: Feature branch
       """
       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'.
+      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'.
       Sending branch information to gitcycle.
       """
@@ -99,7 +95,7 @@ Scenario: Pull changes from upstream
       """
       Retrieving branch information from gitcycle.
       Adding remote repo 'config.owner/config.repo'.
-      Fetching remote repo 'config.owner'.
+      Fetching remote repo 'config.owner/config.repo'.
       Merging remote branch 'master' from 'config.owner/config.repo'.
       """
     And git log should contain the last commit
@@ -179,11 +175,25 @@ Scenario: QA issue
       """
       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'.
+      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'.
+      Adding remote repo 'config.user/config.repo'.
+      Fetching remote repo 'config.user/config.repo'.
+      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.
       Type 'gitc qa fail' to reject all issues in this branch.
+      """
+
+Scenario: QA issue list
+  When I cd to the owner repo
+    And I checkout master
+    And I execute gitcycle with "qa"
+  Then gitcycle runs
+    And output includes
+      """
+      qa_master
+        issue #issue.id config.user/ticket.id
       """

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -63,39 +63,32 @@ class Gitcycle
       branch['home'] = @git_login
       branch['source'] = branches(:current => true)
 
-      unless yes?("Your work will eventually merge into '#{branch['source']}'. Is this correct?")
+      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?")
       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?")
         name = name.gsub(/[\s\W]/, '-')
       end
 
-      unless branches(:match => name)
-        puts "\nCreating '#{name}' from '#{branch['source']}'.\n".green
-        run("git branch #{name}")
-      end
+      checkout_remote_branch(
+        :owner => owner,
+        :repo => repo,
+        :branch => branch['source'],
+        :target => name
+      )
     end
 
-    if branches(:match => name)
-      puts "Checking out branch '#{name}'.\n".green
-      run("git checkout #{name}")
+    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
     else
-      puts "Tracking branch '#{name}'.\n".green
-      run("git fetch && git checkout -b #{name} origin/#{name}")
-    end
-
-    unless branch['exists']
-      puts "Pushing '#{name}'.\n".green
-      run("git push origin #{name}")
-
       puts "Sending branch information to gitcycle.".green
       get('branch',
         'branch[home]' => branch['home'],
@@ -175,52 +168,56 @@ class Gitcycle
         puts "\nRetrieving branch information from gitcycle.\n".green
         qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
 
-        puts "Checking out #{qa_branch['source']}.".green
-        run("git checkout #{qa_branch['source']}")
-        run("git pull origin #{qa_branch['source']}")
+        pass_fail = issues.first
+        issues = issues[1..-1]
 
-        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
-          
-          puts "\nLabeling all issues as '#{label}'.\n".green
-          get('label',
-            'qa_branch[source]' => branch.gsub(/^qa_/, ''),
-            'labels' => [ label ]
-          )
+        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
+        end
 
+        if issues.empty? 
           branches = qa_branch['branches']
         else
-          issues = [1..-1]
-
           branches = qa_branch['branches'].select do |b|
             issues.include?(b['issue'])
           end
+        end
 
-          branches.each do |branch|
-            if issues.first == 'pass'
-              merge_remote_branch(
-                :user => branch['user'],
-                :repo => branch['repo'].split(':'),
-                :branch => branch['branch']
-              )
-            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 !issues.empty? || pass_fail == 'pass'
             puts "\nLabeling issue #{branch['issue']} as '#{label}'.\n".green
             get('label',
-              'qa_branch[source]' => branch.gsub(/^qa_/, ''),
+              'qa_branch[source]' => qa_branch['source'],
               'issue' => branch['issue'],
               'labels' => [ label ]
             )
           end
         end
 
-        if issues.first == 'pass'
-          puts "\nMarking Lighthouse tickets as 'pending-approval'.\n".green
+        if issues.empty? && pass_fail == 'fail'
+          puts "\nLabeling all issues as '#{label}'.\n".green
+          get('label',
+            'qa_branch[source]' => qa_branch['source'],
+            'labels' => [ label ]
+          )
+        end
+
+        if pass_fail == 'pass'
+          puts "Marking Lighthouse tickets as 'pending-approval'.\n".green
           branches = branches.collect do |b|
             { :name => b['branch'], :repo => b['repo'], :user => b['user'] }
           end
@@ -235,26 +232,27 @@ class Gitcycle
       if branch =~ /^qa_/
         puts "\nRetrieving branch information from gitcycle.\n".green
         qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
+        
+        branches = qa_branch['branches']
+        conflict = branches.detect { |branch| branch['conflict'] }
 
-        if qa_branch
-          branches = qa_branch['branches']
-          conflict = branches.detect { |branch| branch['conflict'] }
+        if qa_branch && conflict
+          puts "Committing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
+          run("git add . && git add . -u && git commit -a -F .git/MERGE_MSG")
 
-          if conflict
-            puts "Committing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
-            run("git add . && git add . -u && git commit -a -m 'Merge conflict resolution of #{conflict['branch']} (issue ##{conflict['issue']})'")
+          puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
+          run("git push origin qa_#{qa_branch['source']}")
 
-            puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
-            run("git push origin qa_#{qa_branch['source']}")
+          puts "\nDe-conflicting on gitcycle.\n".green
+          get('qa_branch',
+            'issues' => branches.collect { |branch| branch['issue'] }
+          )
 
-            create_qa_branch(
-              :preserve => true,
-              :range => (branches.index(conflict)+1..-1),
-              :qa_branch => qa_branch
-            )
-          else
-            puts "Couldn't find record of a conflicted merge.\n".red
-          end
+          create_qa_branch(
+            :preserve => true,
+            :range => (branches.index(conflict)+1..-1),
+            :qa_branch => qa_branch
+          )
         else
           puts "Couldn't find record of a conflicted merge.\n".red
         end
@@ -297,17 +295,25 @@ class Gitcycle
   def reviewed(*issues)
     require_git && require_config
 
+    if issues.include?("fail")
+      issues = issues.reject{|x| x=='fail'}
+      label = 'Fail'
+    else
+      issues = issues.reject{|x| x=='pass'}
+      label = 'Pending QA'
+    end
+
     if issues.empty?
-      puts "\nLabeling issue as 'Pending QA'.\n".green
+      puts "\nLabeling issue as '#{label}'.\n".green
       get('label',
         'branch[name]' => branches(:current => true),
-        'labels' => [ 'Pending QA' ]
+        'labels' => [ label ]
       )
     else
-      puts "\nLabeling issues as 'Pending QA'.\n".green
+      puts "\nLabeling issues as '#{label}'.\n".green
       get('label',
         'issues' => issues,
-        'labels' => [ 'Pending QA' ],
+        'labels' => [ label ],
         'scope' => 'repo'
       )
     end
@@ -348,7 +354,7 @@ class Gitcycle
       run("git remote add #{owner} git@github.com:#{owner}/#{repo}.git")
     end
     
-    puts "\nFetching remote repo '#{owner}'.\n".green
+    puts "Fetching remote repo '#{owner}/#{repo}'.\n".green
     run("git fetch #{owner}")
   end
 
@@ -367,23 +373,23 @@ class Gitcycle
     owner = options[:owner]
     repo = options[:repo]
     branch = options[:branch]
+    target = options[:target] || branch
+
+    if branches(:match => target)
+      unless yes?("You already have a branch called '#{target}'. Overwrite?")
+        run("git checkout #{target}")
+        run("git pull #{owner} #{target}")
+        return
+      end
+    end
 
     add_remote_and_fetch(options)
     
-    puts "\nChecking out remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
+    puts "Checking out remote branch '#{target}' from '#{owner}/#{repo}/#{branch}'.\n".green
+    run("git checkout -b #{target} #{owner}/#{branch}")
 
-    if branches(:match => branch)
-      run("git checkout #{branch}")
-    else
-      run("git checkout -b #{branch} #{owner}/#{branch}")
-    end
-
-    if branches(:current => true) == branch
-      run("git pull #{owner} #{branch}")
-    else
-      puts "Oops. Something bad happened.\n".red
-      exit
-    end
+    puts "Pushing '#{target}'.\n".green
+    run("git push origin #{target}")
   end
 
   def create_pull_request
@@ -423,27 +429,19 @@ class Gitcycle
 
       unless qa_branch['branches'].empty?
         unless options[:preserve]
-          if branches(:current => source)
-            # Do nothing
-          elsif branches(:match => source)
-            puts "Checking out source branch '#{source}'.\n".green
-            run("git checkout #{source}")
-          else
-            puts "Tracking source branch '#{source}'.\n".green
-            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}")
+            run("git branch -D #{name}") if branches(:match => name)
             run("git push origin :#{name}")
           end
-          
-          puts "Creating QA branch '#{name}'.\n".green
-          run("git branch #{name} && git checkout #{name}")
 
+          checkout_remote_branch(
+            :owner => @git_login,
+            :repo => @git_repo,
+            :branch => source,
+            :target => name
+          )
+          
           puts "\n"
         end
 
@@ -456,32 +454,11 @@ class Gitcycle
           output = merge_remote_branch(
             :owner => home,
             :repo => repo,
-            :branch => branch
+            :branch => branch,
+            :issue => issue,
+            :issues => qa_branch['branches'].collect { |b| b['issue'] },
+            :type => :to_qa
           )
-
-          if output.include?('CONFLICT')
-            puts "Conflict occurred when merging '#{branch}' (issue ##{issue}).\n".red
-            answer = q("Would you like to (s)kip or (r)esolve?")
-
-            issues = qa_branch['branches'].collect { |b| b['issue'] }
-
-            if answer.downcase[0..0] == 's'
-              run("git reset --hard HEAD")
-              issues.delete(issue)
-
-              puts "\nSending QA branch information to gitcycle.\n".green
-              get('qa_branch', 'issues' => issues, 'conflict' => issue)
-            else
-              puts "\nSending conflict information to gitcycle.\n".green
-              get('qa_branch', 'issues' => issues, 'conflict' => issue)
-
-              puts "Type 'gitc qa resolved' when finished resolving.\n".yellow
-              exit
-            end
-          else
-            puts "Pushing QA branch '#{name}'.\n".green
-            run("git push origin #{name}")
-          end
         end
 
         puts "\nType '".yellow + "gitc qa pass".green + "' to approve all issues in this branch.\n".yellow
@@ -490,6 +467,33 @@ class Gitcycle
     end
   end
 
+  def fix_conflict(options)
+    owner = options[:owner]
+    repo = options[:repo]
+    branch = options[:branch]
+    issue = options[:issue]
+    issues = options[:issues]
+    type = options[:type]
+
+    if $? != 0
+      puts "Conflict occurred when merging '#{branch}'#{" (issue ##{issue})" if issue}.\n".red
+      
+      if type # from_qa or to_qa
+        puts "Please resolve this conflict with '#{owner}'.\n".yellow
+      
+        puts "\nSending conflict information to gitcycle.\n".green
+        get('qa_branch', 'issues' => issues, "conflict_#{type}" => issue)
+
+        puts "Type 'gitc qa resolved' when finished resolving.\n".yellow
+        exit
+      end
+    elsif type # from_qa or to_qa
+      branch = branches(:current => true)
+      puts "Pushing branch '#{branch}'.\n".green
+      run("git push origin #{branch}")
+    end
+  end
+
   def get(path, hash={})
     hash.merge!(
       :login => @login,
@@ -538,6 +542,8 @@ class Gitcycle
 
     puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
     run("git merge #{owner}/#{branch}")
+
+    fix_conflict(options)
   end
 
   def remotes(options={})

metadata

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