gitcycle 0.2.4 → 0.2.5

data/README.md

@@ -142,13 +142,7 @@ Todo
 * If gitc reset happens on branch with Github issue, close the existing issue
 * Add comment on lighthouse with issue URL
 * Instead of detecting CONFLICT, use error status $? != 0
-* Label issues with ticket milestone?
-* gitc LH-ticket should not created a redis record right away, what happens if someone control-c
-* gitc -h or gitc help
+* Label issues with ticket milestone
 * 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
-* gitc pull doesnt work in rc: https://gist.github.com/7e508977fbb762d186a6
-* Tag issue with milestone
-* 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 discuss should tag issue with 'Discuss'
-* gitc ready - possibly do syntax checks
-* gitc commands should not track branches, so that they have to use the gitc push vs using git push
+* 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 ready - possibly do syntax checks

data/features/gitcycle.feature

@@ -62,10 +62,10 @@ Scenario: Feature branch
       """
     And redis entries valid
 
-Scenario: Reset feature branch
+Scenario: Redo 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 execute gitcycle redo with the Lighthouse ticket URL
     And I enter "y"
     And I enter "y"
   Then gitcycle runs
@@ -206,16 +206,16 @@ Scenario: QA issue
     And output includes
       """
       Retrieving branch information from gitcycle.
-      Deleting old QA branch 'qa_config.user_master'.
+      Deleting old QA branch 'qa_master_config.user'.
       Adding remote repo 'config.owner/config.repo'.
       Fetching remote 'config.owner'.
-      Checking out remote branch 'qa_config.user_master' from 'config.owner/config.repo/master'.
+      Checking out remote branch 'qa_master_config.user' from 'config.owner/config.repo/master'.
       Fetching remote 'origin'.
-      Pushing 'origin/qa_config.user_master'.
+      Pushing 'origin/qa_master_config.user'.
       Adding remote repo 'config.user/config.repo'.
       Fetching remote 'config.user'.
       Merging remote branch 'ticket.id' from 'config.user/config.repo'.
-      Pushing branch 'qa_config.user_master'.
+      Pushing branch 'qa_master_config.user'.
       Type 'gitc qa pass' to approve all issues in this branch.
       Type 'gitc qa fail' to reject all issues in this branch.
       """
@@ -227,6 +227,6 @@ Scenario: QA issue list
   Then gitcycle runs
     And output includes
       """
-      qa_config.user_master
+      qa_master_config.user
         issue #issue.id\tconfig.user/ticket.id
       """

data/features/steps/gitcycle_steps.rb

@@ -143,8 +143,8 @@ 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}"
+When /^I execute gitcycle redo with the Lighthouse ticket URL$/ do
+  $execute << "redo #{$ticket.url}"
 end
 
 When /^I cd to the (.*) repo$/ do |user|

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -626,8 +626,24 @@ class Gitcycle
     end
     params.chop! # trailing &
 
-    json = open("#{API}/#{path}.json?#{params}").read
-    Yajl::Parser.parse(json)
+    begin
+      json = open("#{API}/#{path}.json?#{params}").read
+    rescue Exception
+      puts "\nCould not connect to Gitcycle.".red
+      puts "\nPlease verify your Internet connection and try again later.\n".yellow
+      exit
+    end
+
+    error = json.match(/Gitcycle error reference code (\d+)/)[1]
+
+    if error
+      puts "\nSomething went wrong :(".red
+      puts "\nEmail error code #{error} to wwelsh@bleacherreport.com.".yellow
+      puts "\nInclude a gist of your terminal output if possible.\n".yellow
+      exit
+    else
+      Yajl::Parser.parse(json)
+    end
   end
 
   def load_config

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-03 00:00:00 -08:00
+date: 2012-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency