gitcycle 0.2.12 → 0.2.13

data/README.md

@@ -29,7 +29,7 @@ Branch From Ticket
 
 First, checkout the branch that you will eventually merge your code into:
 
-	gitc checkout <branch>
+	gitc checkout [BRANCH]
 
 Type `gitc branch` + your ticket URL to create a new branch:
 
@@ -81,55 +81,49 @@ Code Review
 
 Periodically check for "Pending Review" issues on GitHub.
 
-Once reviewed, label the issue as reviewed:
+### Pass
+
+	gitc review pass [GITHUB ISSUE #] [...]
+
+Label the issue "Pending QA".
 
-	gitc reviewed [GITHUB ISSUE #] [...]
+### Fail
+
+	gitc review fail [GITHUB ISSUE #] [...]
+
+Label the issue "Fail".
 
 Quality Assurance
 -----------------
 
 Periodically check for "Pending QA" issues on Github.
 
-To create a new QA branch:
+### Create QA Branch
 
 	gitc qa [GITHUB ISSUE #] [...]
 
 Now you have a QA branch containing all commits from the specified Github issue numbers.
 
-QA Fail
--------
-
-If a feature does not pass QA:
-
-	gitc qa fail [GITHUB ISSUE #] [...]
-
-To fail all issues:
-
-	gitc qa fail
-
-This adds a "fail" label to the issue.
+### Fail
 
-QA Pass
-------- 
+	gitc qa fail [GITHUB ISSUE #]
 
-If a feature passes QA:
+Label the issue with "Fail" and regenerate the QA branch without the failing issue.
 
-	gitc qa pass [GITHUB ISSUE #] [...]
-
-To pass all issues:
+### Pass
 
 	gitc qa pass
 
-This adds a "pass" label to the issue and completes the pull request by merging the feature branch into the target branch.
+Label all issues "Pass" and the merge the QA branch into target branch.
 
-More
-----
+### Status
 
-### Checkout Upstream Branch
+See who is QA'ing what:
 
-If you are working in a fork, it is easy to checkout upstream branches:
+	gitc qa
 
-	gitc checkout [BRANCH]
+Checkout
+--------
 
 ### Collaborate
 
@@ -137,35 +131,30 @@ Checkout branches from other forks:
 
 	gitc checkout [USER] [BRANCH]
 
-### QA Status
+### From Ticket
 
-See who is QA'ing what:
+Checkout a branch from a ticket URL:
 
-	gitc qa
+	gitc checkout [TICKET URL]
 
-### Redo Branch
+### Upstream Branch
 
-If you associate the wrong branch with a ticket, use `gitc redo` to fix it.
+Gitcycle automatically knows if you are checking out an upstream branch:
 
-	gitc redo https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
+	gitc checkout [BRANCH]
 
 Todo
 ----
 
 * Label issues with ticket milestone
-* Add ability to associate multiple branches/pull requests with one Lighthouse ticket
+* Issues aren't assigned to people
 * Add comment on lighthouse with issue URL
-* gitc discuss should tag issue with 'Discuss'
 * On pass or fail, send email to Github email
-* Note you can use gitc with a string
+* 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
-* Add comment on lighthouse with issue URL
 * Instead of detecting CONFLICT, use error status $? != 0
-* 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
-* 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 discuss should tag issue with 'Discuss'
 * gitc ready - possibly do syntax checks
 $ 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
+* 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

data/features/gitcycle.feature

@@ -62,31 +62,9 @@ Scenario: Feature branch
       """
     And redis entries valid
 
-Scenario: Redo feature branch
-  Given a fresh set of repositories
-  When I cd to the user repo
-    And I execute gitcycle redo 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 'config.owner'.
-      Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
-      Fetching remote 'origin'.
-      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 branch with the Lighthouse ticket URL
+    And I execute gitcycle checkout with the Lighthouse ticket URL
   Then gitcycle runs
     And output includes
       """
@@ -98,7 +76,7 @@ Scenario: Checkout via ticket w/ existing branch
 Scenario: Checkout via ticket w/ fresh repo
   Given a fresh set of repositories
   When I cd to the user repo
-    And I execute gitcycle branch with the Lighthouse ticket URL
+    And I execute gitcycle checkout with the Lighthouse ticket URL
   Then gitcycle runs
     And output includes
       """
@@ -147,6 +125,7 @@ Scenario: Discuss commits w/ no parameters and something committed
       """
       Retrieving branch information from gitcycle.
       Creating GitHub pull request.
+      Labeling issue as 'Discuss'.
       """
     And output includes "Opening issue" with URL
     And URL is a valid issue
@@ -190,13 +169,13 @@ Scenario: Ready issue w/ parameters
 Scenario: Reviewed issue w/ no parameters
   When I cd to the user repo
     And I checkout ticket.id
-    And I execute gitcycle with "reviewed"
+    And I execute gitcycle with "review pass"
   Then gitcycle runs
     And output includes "Labeling issue as 'Pending QA'."
 
 Scenario: Reviewed issue w/ parameters
   When I cd to the user repo
-    And I execute gitcycle with "reviewed issue.id"
+    And I execute gitcycle with "review pass issue.id"
   Then gitcycle runs
     And output includes "Labeling issues as 'Pending QA'."
 

data/features/steps/gitcycle_steps.rb

@@ -140,12 +140,8 @@ When /^I execute gitcycle setup$/ do
   ].join(' ')
 end
 
-When /^I execute gitcycle branch with the Lighthouse ticket URL$/ do
-  $execute << "branch #{$ticket.url}"
-end
-
-When /^I execute gitcycle redo with the Lighthouse ticket URL$/ do
-  $execute << "redo #{$ticket.url}"
+When /^I execute gitcycle (.*) with the Lighthouse ticket URL$/ do |cmd|
+  $execute << "#{cmd} #{$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.12'
+  s.version     = '0.2.13'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -65,34 +65,29 @@ class Gitcycle
       exec_git(:branch, args)
     end
 
-    params['reset'] = '1' if args.include?('--redo')
-
     puts "\nRetrieving branch information from gitcycle.\n".green
     branch = get('branch', params)
     name = branch['name']
 
     begin
       owner, repo = branch['repo'].split(':')
+      branch['home'] = @git_login
 
-      unless branch['exists']
-        branch['home'] = @git_login
-
-        unless yes?("\nYour work will eventually merge into '#{branch['source']}'. Is this correct?")
-          branch['source'] = q("What branch would you like to eventually merge into?")
-        end
-
-        unless yes?("Would you like to name your branch '#{name}'?")
-          name = q("\nWhat would you like to name your branch?")
-          name = name.gsub(/[\s\W]/, '-')
-        end
+      unless yes?("\nYour work will eventually merge into '#{branch['source']}'. Is this correct?")
+        branch['source'] = q("What branch would you like to eventually merge into?")
+      end
 
-        checkout_remote_branch(
-          :owner => owner,
-          :repo => repo,
-          :branch => branch['source'],
-          :target => name
-        )
+      unless yes?("Would you like to name your branch '#{name}'?")
+        name = q("\nWhat would you like to name your branch?")
+        name = name.gsub(/[\s\W]/, '-')
       end
+
+      checkout_remote_branch(
+        :owner => owner,
+        :repo => repo,
+        :branch => branch['source'],
+        :target => name
+      )
     rescue SystemExit, Interrupt
       puts "\nDeleting branch from gitcycle.\n".green
       branch = get('branch',
@@ -102,17 +97,13 @@ class Gitcycle
       )
     end
 
-    if branch['exists']
-      checkout_or_track(:name => name, :remote => 'origin')
-    else
-      puts "Sending branch information to gitcycle.".green
-      get('branch',
-        'branch[home]' => branch['home'],
-        'branch[name]' => branch['name'],
-        'branch[rename]' => name != branch['name'] ? name : nil,
-        'branch[source]' => branch['source']
-      )
-    end
+    puts "Sending branch information to gitcycle.".green
+    get('branch',
+      'branch[home]' => branch['home'],
+      'branch[name]' => branch['name'],
+      'branch[rename]' => name != branch['name'] ? name : nil,
+      'branch[source]' => branch['source']
+    )
 
     puts "\n"
   end
@@ -124,39 +115,45 @@ class Gitcycle
 
     require_git && require_config
 
-    remote, branch = args
-    remote, branch = nil, remote if branch.nil?
+    if args.length == 1 && args[0] =~ /^https?:\/\//
+      puts "\nRetrieving branch information from gitcycle.\n".green
+      branch = get('branch', 'branch[lighthouse_url]' => args[0])
+      checkout_or_track(:name => branch['name'], :remote => 'origin')
+    else
+      remote, branch = args
+      remote, branch = nil, remote if branch.nil?
 
-    unless branches(:match => branch)
-      collab = branch && remote
+      unless branches(:match => branch)
+        collab = branch && remote
 
-      unless collab
-        puts "\nRetrieving repo information from gitcycle.\n".green
-        repo = get('repo')
-        remote = repo['owner']
-      end
-      
-      add_remote_and_fetch(
-        :owner => remote,
-        :repo => @git_repo
-      )
-      
-      puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
-      run("git branch --no-track #{branch} #{remote}/#{branch}")
-
-      if collab
-        puts "Sending branch information to gitcycle.".green
-        get('branch',
-          'branch[home]' => remote,
-          'branch[name]' => branch,
-          'branch[collab]' => 1,
-          'create' => 1
+        unless collab
+          puts "\nRetrieving repo information from gitcycle.\n".green
+          repo = get('repo')
+          remote = repo['owner']
+        end
+        
+        add_remote_and_fetch(
+          :owner => remote,
+          :repo => @git_repo
         )
+        
+        puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
+        run("git branch --no-track #{branch} #{remote}/#{branch}")
+
+        if collab
+          puts "Sending branch information to gitcycle.".green
+          get('branch',
+            'branch[home]' => remote,
+            'branch[name]' => branch,
+            'branch[collab]' => 1,
+            'create' => 1
+          )
+        end
       end
-    end
 
-    puts "Checking out '#{branch}'.\n".green
-    run("git checkout #{branch}")
+      puts "Checking out '#{branch}'.\n".green
+      run("git checkout #{branch}")
+    end
   end
   alias :co :checkout
 
@@ -202,6 +199,12 @@ class Gitcycle
       if branch == false
         puts "Branch not found.\n".red
       elsif branch['issue_url']
+        puts "\nLabeling issue as 'Discuss'.\n".green
+        get('label',
+          'branch[name]' => branch['name'],
+          'labels' => [ 'Discuss' ]
+        )
+
         puts "Opening issue: #{branch['issue_url']}\n".green
         Launchy.open(branch['issue_url'])
       else
@@ -403,7 +406,7 @@ class Gitcycle
       elsif branch['issue_url']
         puts "\nLabeling issue as 'Pending Review'.\n".green
         get('label',
-          'branch[name]' => branches(:current => true),
+          'branch[name]' => branch['name'],
           'labels' => [ 'Pending Review' ]
         )
 
@@ -422,19 +425,12 @@ class Gitcycle
     end
   end
 
-  def redo(*args)
-    args << "--redo"
-    branch(*args)
-  end
-
-  def reviewed(*issues)
+  def review(pass_fail, *issues)
     require_git && require_config
 
-    if issues.include?("fail")
-      issues = issues.reject{|x| x=='fail'}
+    if pass_fail == 'fail'
       label = 'Fail'
     else
-      issues = issues.reject{|x| x=='pass'}
       label = 'Pending QA'
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Winton Welsh