gitcycle 0.2.16 → 0.2.17

data/README.md

@@ -152,27 +152,24 @@ Gitcycle automatically knows if you are checking out an upstream branch:
 Todo
 ----
 
+Nice to haves:
+* gitc branch [lh]
+* gitc branch [gitissue]
+* gitc ready # switch me back to rc or master
+* gitc ready - issue already closed, will open a new issue
+
 * Conflict recording not working
-* Add comment on lighthouse with issue URL
-* 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.
+* gitc qa pass [issue] should use a qa_rc_tongueroo_temp branch so it doesnt blow away the changes in the qa_rc_tongueroo branch
+	* not working : https://gist.github.com/819c99281f5d6492de47
+* gitc qa pass (all), doesnt update lighthouse to state pending-approval 
+* Collaborator mode = work on same ticket, gitc ready readys ticket no matter who is working on it, if more than one ticket then we should have a feature branch that people are basing tickets off of
 * 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
 * On pass or fail, send email to Github email
 * Note you can use gitc with a string (and get this working)
 * gitc qa pass, should not set ticket to pending-approval if its already resolved
-* If gitc redo happens on branch with Github issue, close the existing issue
-* Instead of detecting CONFLICT, use error status $? != 0
-* gitc ready - possibly do syntax checks
+* Everything before colon in ticket name, make shorter somehow
 $ gitc st - shortcut
-* 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 clean # to clean up old branches
-* gitc qa pass # if ticket resolved, it should stay resolved
-* gitc ready # if pull requests already created, it should prompt and explain that a new branch and issue is being created, consider effect of multiple developers
-* If feature branch changed between QA branch creation and QA merge, alert QA engineer
+* gitc clean # to clean up old branches
+* fail should change to inactive
+* gitc pull: shouldnt matter who does it, it should update the latest br/rc, not working https://gist.github.com/22b1e248e8dba7a32288

data/features/discuss.feature

@@ -1,6 +1,6 @@
 Feature: Discuss
 
-Scenario: No parameters and nothing committed
+Scenario: (Discuss) No parameters and nothing committed
   Given a fresh set of repositories
   When I cd to the user repo
     And I execute gitcycle branch with a new URL or string
@@ -15,7 +15,7 @@ Scenario: No parameters and nothing committed
     """
     And redis entries valid
 
-Scenario: No parameters and something committed
+Scenario: (Discuss) No parameters and something committed
   Given a fresh set of repositories
   When I cd to the user repo
     And I execute gitcycle branch with a new URL or string

data/features/steps/gitcycle_steps.rb

@@ -327,7 +327,8 @@ Then /^redis entries valid$/ do
     'user' => config['user'],
     'source' => collab ? 'some_branch' : 'master'
   }
-  if @scenario_title == 'No parameters and something committed'
+  if @scenario_title.include?("(Discuss)") && @scenario_title.include?("something committed")
+    should['labels'] = 'Branch - master'
     should['issue_url'] = $github_url
   end
   branch.should == should

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -550,12 +550,12 @@ class Gitcycle
 
     if branches(:match => target)
       if yes?("You already have a branch called '#{target}'. Overwrite?")
-        run("git push origin :#{target} -q")
-        run("git checkout master -q")
-        run("branch -D #{target}")
+        run_safe("git push origin :#{target} -q")
+        run_safe("git checkout master -q")
+        run_safe("git branch -D #{target}")
       else
-        run("git checkout #{target} -q")
-        run("git pull origin #{target} -q")
+        run_safe("git checkout #{target} -q")
+        run_safe("git pull origin #{target} -q")
         return
       end
     end
@@ -859,6 +859,14 @@ class Gitcycle
     end
   end
 
+  def run_safe(cmd)
+    run(cmd)
+    if $? != 0
+      puts "The last command was supposed to run without error, but it didn't :(\n".red
+      puts "Please copy this session's output and send it to gitcycle@bleacherreport.com.\n".yellow
+    end
+  end
+
   def yes?(question)
     q(question, " (#{"y".green}/#{"n".red})").downcase[0..0] == 'y'
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 2
-  - 16
-  version: 0.2.16
+  - 17
+  version: 0.2.17
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 -08:00
+date: 2012-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency