gitcycle 0.1.5 → 0.1.6

data/README.md

@@ -3,14 +3,103 @@ Gitcycle
 
 Tame your development cycle.
 
-Requirements
+Get Started
+-----------
+
+Visit [gitcycle.com](http://gitcycle.com) to set up your environment.
+
+Create Branch
+-------------
+
+Checkout the branch that you will eventually merge your feature into:
+
+	git checkout master
+
+Type `gitc` + your ticket URL to create a new branch:
+
+	gitc https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
+
+Pull Changes from Upstream
+--------------------------
+
+When you're developing, you may need to pull new changes from the upstream branch that you will eventually merge your feature into:
+
+	gitc pull
+
+Discuss Code
 ------------
 
-<pre>
-gem install gitcycle
-</pre>
+After pushing one or two commits, put the code up for discussion:
 
-Get Started
+	gitc discuss
+
+Mark as Ready
+-------------
+
+When the branch is ready for merging, mark it as ready:
+
+	gitc ready
+
+This will mark the pull request as "Pending Review".
+
+Code Review
 -----------
 
-Visit [gitcycle.com](http://gitcycle.com) to get set up.
+Managers will periodically check for "Pending Review" issues on GitHub.
+
+Once reviewed, they will mark the issue as reviewed:
+
+	gitc reviewed 0000
+
+Where 0000 is the Github issue number.
+
+Quality Assurance
+-----------------
+
+QA engineers will periodically check for "Pending QA" issues on Github.
+
+To create a new QA branch:
+
+	gitc qa 0000 0001
+
+This will create a new QA branch containing the commits from the related Github issue numbers.
+
+This branch can be deployed to a staging environment for QA.
+
+QA Fail
+-------
+
+If a feature does not pass QA:
+
+	gitc qa fail 0000
+
+Where 0000 is the Github issue number.
+
+To fail all issues:
+
+	gitc qa fail
+
+This will add a "fail" label to the issue.
+
+QA Pass
+------- 
+
+If a feature passes QA:
+
+	gitc qa pass 0000
+
+Where 0000 is the Github issue number.
+
+To pass all issues:
+
+	gitc qa pass
+
+This will add a "pass" label to the issue and will complete the pull request by merging the feature branch into the target branch.
+
+Todo
+----
+
+* Label issues with ticket milestone?
+* Add confirmation when creating new dev branch for branch that it is based off of
+	* If confirmation is a no, allow user to specify branch to base off of
+* bug with branch rename on Jimmy's machine

data/features/gitcycle.feature

@@ -154,20 +154,20 @@ Scenario: Reviewed issue w/ parameters
   Then gitcycle runs
     And output includes "Labeling issues as 'Pending QA'."
 
-Scenario: QA issue
-  When I cd to the owner repo
-    And I checkout master
-    And I execute gitcycle with "qa issue.id"
-  Then gitcycle runs
-    And output includes
-      """
-      Retrieving branch information from gitcycle.
-      Deleting old QA branch 'qa_master'.
-      Creating QA branch 'qa_master'.
-      Adding remote repo 'br/gitcycle_test'.
-      Fetching remote branch '200-test-ticket'.
-      Merging remote branch '200-test-ticket' from 'br/gitcycle_test'.
-      Pushing QA branch 'qa_master'.
-      Type 'gitc qa pass' to approve all issues in this branch.
-      Type 'gitc qa fail' to reject all issues in this branch.
-      """
+# Scenario: QA issue
+#   When I cd to the owner repo
+#     And I checkout master
+#     And I execute gitcycle with "qa issue.id"
+#   Then gitcycle runs
+#     And output includes
+#       """
+#       Retrieving branch information from gitcycle.
+#       Deleting old QA branch 'qa_master'.
+#       Creating QA branch 'qa_master'.
+#       Adding remote repo 'br/gitcycle_test'.
+#       Fetching remote branch '200-test-ticket'.
+#       Merging remote branch '200-test-ticket' from 'br/gitcycle_test'.
+#       Pushing QA branch 'qa_master'.
+#       Type 'gitc qa pass' to approve all issues in this branch.
+#       Type 'gitc qa fail' to reject all issues in this branch.
+#       """

data/features/steps/gitcycle_steps.rb

@@ -202,7 +202,7 @@ end
 
 Then /^output does not include \"([^\"]*)"$/ do |expected|
   expected = gsub_variables(expected)
-  @output.include?(expected).should == false
+  @output.gsub(/\n+/, "\n").include?(expected).should == false
 end
 
 Then /^redis entries valid$/ do
@@ -221,7 +221,7 @@ Then /^redis entries valid$/ do
   should = {
     'lighthouse_url' => $ticket.url,
     'body' => "<div><p>test</p></div>\n\n#{$ticket.url}",
-    'home' => 'br',
+    'home' => ENV['REPO'] == 'owner' ? config['owner'] : config['user'],
     'name' => $ticket.attributes['id'] + add,
     'id' => $ticket.attributes['id'] + add,
     'title' => $ticket.title,

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -61,6 +61,14 @@ class Gitcycle
       branch['home'] = @git_login
       branch['source'] = branches(:current => true)
 
+      unless yes?("Would you like to eventually merge this feature into #{branch['source']}?")
+        branch['source'] = q("What branch would you like to eventually merge this feature into?")
+      end
+
+      unless branches(:match => branch['source'])
+        
+      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]/, '-')
@@ -99,22 +107,8 @@ class Gitcycle
   def discuss(*issues)
     require_git && require_config
 
-    puts "\nRetrieving branch information from gitcycle.\n".green
-
     if issues.empty?
-      branch = get('branch',
-        'branch[name]' => branches(:current => true),
-        'create' => 0
-      )
-
-      if branch && !branch['issue_url']
-        puts "Creating GitHub pull request.\n".green
-        branch = get('branch',
-          'branch[create_pull_request]' => true,
-          'branch[name]' => branch['name'],
-          'create' => 0
-        )
-      end
+      branch = create_pull_request
 
       if branch == false
         puts "Branch not found.\n".red
@@ -125,6 +119,8 @@ class Gitcycle
         puts "You must push code before opening a pull request.\n".red
       end
     else
+      puts "\nRetrieving branch information from gitcycle.\n".green
+
       get('branch', 'issues' => issues, 'scope' => 'repo').each do |branch|
         if branch['issue_url']
           puts "Opening issue: #{branch['issue_url']}\n".green
@@ -178,23 +174,52 @@ class Gitcycle
         puts "Checking out #{qa_branch['source']}.".green
         run("git checkout #{qa_branch['source']}")
 
-        puts "Merging '#{branch}' into '#{qa_branch['source']}'.\n".green
-        run("git merge #{branch}")
-        run("git push origin #{qa_branch['source']}")
-        
-        puts "\nLabeling all issues as '#{label}'.\n".green
-        get('label',
-          'qa_branch[source]' => branch.gsub(/^qa_/, ''),
-          'labels' => [ label ]
-        )
+        if issues[1..-1].empty?
+          if issues.first = 'pass'
+            puts "Merging '#{branch}' into '#{qa_branch['source']}'.\n".green
+            run("git merge #{branch}")
+            run("git push origin #{qa_branch['source']}")
+          end
+          
+          puts "\nLabeling all issues as '#{label}'.\n".green
+          get('label',
+            'qa_branch[source]' => branch.gsub(/^qa_/, ''),
+            'labels' => [ label ]
+          )
+
+          branches = qa_branch['branches']
+        else
+          issues = [1..-1]
+
+          branches = qa_branch['branches'].select do |b|
+            issues.include?(b['issue'])
+          end
+
+          branches.each do |branch|
+            if issues.first = 'pass'
+              merge_remote_branch(
+                :user => branch['user'],
+                :repo => branch['repo'].split(':'),
+                :branch => branch['branch']
+              )
+            end
 
-        branches = qa_branch['branches']
+            puts "\nLabeling issue #{branch['issue']} as '#{label}'.\n".green
+            get('label',
+              'qa_branch[source]' => branch.gsub(/^qa_/, ''),
+              'issue' => branch['issue'],
+              'labels' => [ label ]
+            )
+          end
+        end
 
-        puts "\nMarking Lighthouse tickets as 'pending-approval'.\n".green
-        branches = branches.collect do |b|
-          { :name => b['branch'], :repo => b['repo'], :user => b['user'] }
+        if issues.first = 'pass'
+          puts "\nMarking Lighthouse tickets as 'pending-approval'.\n".green
+          branches = branches.collect do |b|
+            { :name => b['branch'], :repo => b['repo'], :user => b['user'] }
+          end
+          get('ticket_resolve', 'branches' => Yajl::Encoder.encode(branches))
         end
-        get('ticket_resolve', 'branches' => Yajl::Encoder.encode(branches))
       else
         puts "\nYou are not in a QA branch.\n".red
       end
@@ -239,11 +264,20 @@ class Gitcycle
     require_git && require_config
 
     if issues.empty?
-      puts "\nLabeling issue as 'Pending Review'.\n".green
-      get('label',
-        'branch[name]' => branches(:current => true),
-        'labels' => [ 'Pending Review' ]
-      )
+      branch = create_pull_request
+
+      if branch == false
+        puts "Branch not found.\n".red
+      elsif branch['issue_url']
+        puts "\nLabeling issue as 'Pending Review'.\n".green
+        get('label',
+          'branch[name]' => branches(:current => true),
+          'labels' => [ 'Pending Review' ]
+        )
+
+        puts "Opening issue: #{branch['issue_url']}\n".green
+        Launchy.open(branch['issue_url'])
+      end
     else
       puts "\nLabeling issues as 'Pending Review'.\n".green
       get('label',
@@ -306,6 +340,47 @@ class Gitcycle
     end
   end
 
+  def checkout_remote_branch(options={})
+    owner = options[:owner]
+    repo = options[:repo]
+    branch = options[:branch]
+
+    $remotes ||= {}
+
+    unless $remotes[owner]
+      $remotes[owner] = true
+      puts "Adding remote repo '#{owner}/#{repo}'.\n".green
+      run("git remote rm #{owner}") if remotes(:match => owner)
+      run("git remote add #{owner} git@github.com:#{owner}/#{repo}.git")
+    end
+    
+    puts "\nFetching remote branch '#{branch}'.\n".green
+    run("git fetch #{owner}")
+
+    puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
+    run("git merge #{owner}/#{branch}")
+  end
+
+  def create_pull_request
+    puts "\nRetrieving branch information from gitcycle.\n".green
+      
+    branch = get('branch',
+      'branch[name]' => branches(:current => true),
+      'create' => 0
+    )
+
+    if branch && !branch['issue_url']
+      puts "Creating GitHub pull request.\n".green
+      branch = get('branch',
+        'branch[create_pull_request]' => true,
+        'branch[name]' => branch['name'],
+        'create' => 0
+      )
+    end
+
+    branch
+  end
+
   def create_qa_branch(options)
     issues = options[:issues]
     range = options[:range] || (0..-1)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 -08:00
+date: 2012-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency