gitcycle 0.1.19 → 0.1.20

data/README.md

@@ -116,12 +116,10 @@ Todo
 ----
 
 * On pass or fail, send email to Github email
-* Change QA branch name to qa_login_branch
 * Note you can use gitc with a string
 * gitc qa pass, should not set ticket to pending-approval if its already resolved
 * 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
+* gitc LH-ticket should not created a redis record right away, what happens if someone control-c

data/features/gitcycle.feature

@@ -8,7 +8,7 @@ Scenario: No command given
 Scenario: Non-existent command
   When I execute gitcycle with "blah blah"
   Then gitcycle runs
-    And output includes "Command 'blah' not found"
+    And output includes "Command not recognized."
 
 Scenario: Setup
   When I execute gitcycle setup
@@ -227,6 +227,6 @@ Scenario: QA issue list
   Then gitcycle runs
     And output includes
       """
-      qa_master
+      qa_config.user_master
         issue #issue.id\tconfig.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.19'
+  s.version     = '0.1.20'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+
 require 'fileutils'
 require 'open-uri'
 require 'uri'
@@ -158,7 +160,7 @@ class Gitcycle
     if issues.empty?
       puts "\n"
       get('qa_branch').each do |branches|
-        puts "qa_#{branches['source']}".green
+        puts "qa_#{branches['user']}_#{branches['source']}".green
         branches['branches'].each do |branch|
           puts "  #{"issue ##{branch['issue']}".yellow}\t#{branch['user']}/#{branch['branch']}"
         end
@@ -234,7 +236,7 @@ class Gitcycle
           run("git add . && git add . -u && git commit -a -F .git/MERGE_MSG")
 
           puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
-          run("git push origin qa_#{qa_branch['source']}")
+          run("git push origin qa_#{qa_branch['user']}_#{qa_branch['source']}")
 
           puts "\nDe-conflicting on gitcycle.\n".green
           get('qa_branch',
@@ -330,12 +332,14 @@ class Gitcycle
     command = args.shift
     if command.nil?
       puts "\nNo command specified\n".red
+    elsif command[0..0] == '-'
+      command_not_recognized
     elsif self.respond_to?(command)
       send(command, *args)
     elsif args.empty?
       create_branch(command)
     else
-      puts "\nCommand '#{command}' not found.\n".red
+      command_not_recognized
     end
   end
 
@@ -431,6 +435,13 @@ class Gitcycle
     run("git push origin #{target}")
   end
 
+  def command_not_recognized
+    readme = "https://github.com/winton/gitcycle/blob/master/README.md"
+    puts "\nCommand not recognized.".red
+    puts "\nOpening #{readme}\n".green
+    Launchy.open(readme)
+  end
+
   def create_pull_request
     puts "\nRetrieving branch information from gitcycle.\n".green
       
@@ -464,7 +475,7 @@ class Gitcycle
       end
 
       source = qa_branch['source']
-      name = "qa_#{source}"
+      name = "qa_#{qa_branch['user']}_#{source}"
 
       unless qa_branch['branches'].empty?
         unless options[:preserve]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - Winton Welsh