gitcycle 0.1.13 → 0.1.14

data/README.md

@@ -19,6 +19,19 @@ Type `gitc` + your ticket URL to create a new branch:
 
 	gitc https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
 
+Reset Branch
+------------
+
+If you associate the wrong branch with a ticket, use `git reset` to fix it.
+
+Checkout the branch that you will eventually merge your feature into:
+
+	git checkout master
+
+Type `gitc reset` + your ticket URL to reset the branch:
+
+	gitc reset https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
+
 Pull Changes from Upstream
 --------------------------
 
@@ -101,4 +114,5 @@ Todo
 
 * Instead of detecting CONFLICT, use error status $? != 0
 * Add comment on lighthouse with issue URL
-* Label issues with ticket milestone?
+* Label issues with ticket milestone?
+* gitc qa pass, should not set ticket to pending-approval if its already resolved

data/features/gitcycle.feature

@@ -62,6 +62,27 @@ Scenario: Feature branch
       """
     And redis entries valid
 
+Scenario: Reset feature branch
+  Given a fresh set of repositories
+  When I cd to the user repo
+    And I execute gitcycle reset with the Lighthouse ticket URL
+    And I enter "y"
+    And I enter "y"
+  Then gitcycle runs
+    And output includes
+      """
+      Retrieving branch information from gitcycle.
+      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'.
+      Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
+      Pulling 'origin/ticket.id'.
+      Pushing 'origin/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

data/features/steps/gitcycle_steps.rb

@@ -143,6 +143,10 @@ When /^I execute gitcycle with the Lighthouse ticket URL$/ do
   $execute << $ticket.url
 end
 
+When /^I execute gitcycle reset with the Lighthouse ticket URL$/ do
+  $execute << "reset #{$ticket.url}"
+end
+
 When /^I cd to the (.*) repo$/ do |user|
   if ENV['REPO']
     puts "(overiding repo as #{ENV['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.13'
+  s.version     = '0.1.14'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -35,7 +35,7 @@ class Gitcycle
     start(args) if args
   end
 
-  def create_branch(url_or_title)
+  def create_branch(url_or_title, reset=false)
     require_git && require_config
 
     params = {}
@@ -53,6 +53,8 @@ class Gitcycle
       }
     end
 
+    params['reset'] = '1' if reset
+
     puts "\nRetrieving branch information from gitcycle.\n".green
     branch = get('branch', params)
 
@@ -283,6 +285,10 @@ class Gitcycle
     end
   end
 
+  def reset(ticket_or_url)
+    create_branch(ticket_or_url, true)
+  end
+
   def reviewed(*issues)
     require_git && require_config
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Winton Welsh