gitcycle 0.2.13 → 0.2.14

data/README.md

@@ -146,6 +146,13 @@ Gitcycle automatically knows if you are checking out an upstream branch:
 Todo
 ----
 
+* Conflict recording not working
+* Add comment on lighthouse with issue URL
+* Allow QA branches to be created from any branch and allow any issue to merge into it
+* Collab fork should change gitc ready to auo merge to the parent fork.  gitc pull should pull from br and parent fork.  gitc push should push to your same fork.
+	Lighthouse ticket changes to pending-qa if ticket is not the same as the parent.
+* Hook to run after gitc qa pass, so I can write a script for amit that will auto merge master into rc
+* gitc merge chrisped/branch-with-reverts # to quickly revert changes
 * Label issues with ticket milestone
 * Issues aren't assigned to people
 * Add comment on lighthouse with issue URL
@@ -156,5 +163,8 @@ Todo
 * Instead of detecting CONFLICT, use error status $? != 0
 * gitc ready - possibly do syntax checks
 $ gitc st - shortcut
-* There's still a Tagging Issue I tried to fix parseLabel http://d.pr/8eOS , Pass should remove Pending *, but remove the Branch Name.  Also, when I gitc reviewed failed [issue number] it marks it pending-qa and failed.. not correct.  I'll take a look at this over the weekend -Tung
-* gitc qa pass # since we're changing this to pass all the tickets, we need to loop through all the merged issues and update the lighthouse state to pending-qa
+* issues aren't assigned to people
+* There's still a Tagging Issue I tried to fix parseLabel http://d.pr/8eOS , Pass should remove Pending, but remove the Branch Name
+* gitc qa pass 1234 # doesnt update lighthouse and screws up git issue tags
+* [issue number] it marks it pending-qa and failed.. not correct.  I'll take a look at this over the weekend -Tung
+* gitc qa pass # since we're changing this to pass all the tickets, we need to loop through all the merged issues and update the lighthouse state to pending-qa

data/features/gitcycle.feature

@@ -183,9 +183,11 @@ Scenario: QA issue
   When I cd to the owner repo
     And I checkout master
     And I execute gitcycle with "qa issue.id"
+    And I enter "y"
   Then gitcycle runs
     And output includes
       """
+      Do you want to create a QA branch from 'master'? (y/n)
       Retrieving branch information from gitcycle.
       Deleting old QA branch 'qa_master_config.user'.
       Adding remote repo 'config.owner/config.repo'.
@@ -201,6 +203,22 @@ Scenario: QA issue
       Type 'gitc qa fail' to reject all issues in this branch.
       """
 
+Scenario: QA issue pass
+  When I cd to the owner repo
+    And I checkout qa_master_config.user
+    And I execute gitcycle with "qa pass"
+  Then gitcycle runs
+    And output includes
+      """
+      Retrieving branch information from gitcycle.
+      Checking out branch 'master'.
+      Adding remote repo 'config.user/config.repo'.
+      Fetching remote 'config.user'.
+      Merging remote branch 'ticket.id' from 'config.user/config.repo'.
+      Pushing branch 'master'.
+      Labeling all issues as 'Pass'.
+      """
+
 Scenario: QA issue list
   When I cd to the owner repo
     And I checkout master

data/features/steps/gitcycle_steps.rb

@@ -175,6 +175,12 @@ Then /^gitcycle runs$/ do
   end
 end
 
+Then /^gitcycle runs with exit$/ do
+  $execute.each do |cmd|
+    lambda { run_gitcycle(cmd) }.should raise_error SystemExit
+  end
+end
+
 Then /^gitcycle\.yml should be valid$/ do
   gitcycle = YAML.load(File.read(GITCYCLE))
 

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -595,8 +595,14 @@ class Gitcycle
       if options[:qa_branch]
         qa_branch = options[:qa_branch]
       else
+        source = branches(:current => true)
+        
+        unless yes?("\nDo you want to create a QA branch from '#{source}'?")
+          source = q("What branch would you like to base this QA branch off of?")
+        end
+        
         puts "\nRetrieving branch information from gitcycle.\n".green
-        qa_branch = get('qa_branch', 'issues' => issues)
+        qa_branch = get('qa_branch', 'issues' => issues, 'source' => source)
       end
 
       source = qa_branch['source']
@@ -623,16 +629,22 @@ class Gitcycle
           puts "\n"
         end
 
+        warnings = {}
+
         qa_branch['branches'][range].each do |branch|
           issue = branch['issue']
           owner, repo = branch['repo'].split(':')
           home = branch['home']
-          branch = branch['branch']
+
+          if source != branch['source']
+            warnings[branch['source']] ||= []
+            warnings[branch['source']] << branch['issue']
+          end
 
           output = merge_remote_branch(
             :owner => home,
             :repo => repo,
-            :branch => branch,
+            :branch => branch['branch'],
             :issue => issue,
             :issues => qa_branch['branches'].collect { |b| b['issue'] },
             :type => :to_qa
@@ -641,6 +653,17 @@ class Gitcycle
 
         puts "\nType '".yellow + "gitc qa pass".green + "' to approve all issues in this branch.\n".yellow
         puts "Type '".yellow + "gitc qa fail".red + "' to reject all issues in this branch.\n".yellow
+
+        unless warnings.empty?
+          puts "\n#{"WARNING:".red} If you pass this QA branch, the following branches will merge into '#{source.yellow}':\n"
+          
+          warnings.each do |(branch, issues)|
+            issues.collect! { |issue| "##{issue}" }
+            puts "  #{branch.yellow} (#{issues.join(', ')})"
+          end
+          
+          puts "\nBe sure this is correct!\n".yellow
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 -08:00
+date: 2012-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency