git-whistles 0.7.4 → 0.7.5

data/.gitignore

@@ -6,3 +6,4 @@
 pkg
 rdoc
 tmp
+nbproject

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-whistles (0.7.4)
+    git-whistles (0.7.5)
       pivotal-tracker (~> 0.5.6)
       term-ansicolor
 

data/HISTORY

@@ -1,2 +1,6 @@
+# 2013-07-18: 0.7.5
+* [FEATURE] git pivotal-branch <story-id> Creates a branch name suggestion from the specified Pivotal Tracker story ID. [dncrht]
+* [FEATURE] git outstanding-features -o allows to view all features to be deployed in one single line
+
 # 2013-06-18: 0.7.4
 * [FIX] Adjusted git-pull-request to play with the new GitHub pull request user interface

data/README.md

@@ -12,13 +12,14 @@ Use it with:
 
 - `git ff-all-branches [-f] [-p] [-v]`. Fast-forward all local tracking branches to their remote counterpart (where possible). Very useful on big projects.
 - `git stash-and-checkout [branch]` As the name implies: stash and checkout another branch.
-- `git-pull-request [--from your-branch] [--to target-branch]` Open your browser at a Github pull-request page for the specified branch (defaults to the current `head`). If you're using Pivotal Tracker and your branch has a story number in its name, populates your pull request with story details.
-- `git outstanding-features [-f from-branch] [-t to-branch]` List the pull requests merged in `[to-branch]` but not in `[from-branch]`. Useful to prepare a list of stuff you're going to deploy. Defaults to listing what's on `origin/master` but not on `origin/production`. [[PedroCunha](https://github.com/PedroCunha)] 
-- `git chop [branch]` Delete the local and origin copy of a branch. Useful to close feature branches once a feature is completed.
+- `git pull-request [--from your-branch] [--to target-branch]` Open your browser at a Github pull-request page for the specified branch (defaults to the current `head`). If you're using Pivotal Tracker and your branch has a story number in its name, populates your pull request with story details.
+- `git outstanding-features [-f from-branch] [-t to-branch] [--oneline]` List the pull requests merged in `[to-branch]` but not in `[from-branch]`. Useful to prepare a list of stuff you're going to deploy. Defaults to listing what's on `origin/master` but not on `origin/production`. By default lists one feature per line, if `--oneline` or `-o` is specified features will be separated by spaces instead. [[PedroCunha](https://github.com/PedroCunha)] 
+- `git chop [branch]` Delete the local and origin copy of a branch. Useful to close feature branches once a feature is completed. 
 - `git list-branches [-l] [-r] [-i integration-branch]` Colourful listing of all local or origin branches, and their distance to an integration branch (`master` by default).
 - `git merge-po <ancestor> <left> <right>` Merge engine for GetText PO files.
 - `git select <story-id>` Checkout a local branch with the matching number. If not found, lists remote branches
 - `git latest-pushes [-n NR_RESULTS] [-p PATTERN]` Show latest pushed branches to origin. Defaults to 20 results. Pattern is appended to refs/remotes/origin/ so include the team or project name to filter results. [[PedroCunha](https://github.com/PedroCunha)]
+- `git pivotal-branch <story-id>` Creates a branch name suggestion from the specified Pivotal Tracker story ID. [[dncrht](https://github.com/dncrht)]
 
 ### More details on some of the commands
 

data/bin/git-outstanding-features

@@ -20,13 +20,16 @@ class App < Git::Whistles::App
     super
     parse_args!(args)
 
-    puts `git log --oneline #{options.from} ^#{options.to} | grep 'Merge pull request' | sed  -e 's:.*from [^/]*/::'`
+    output = `git log --oneline #{options.from} ^#{options.to} | grep 'Merge pull request' | sed  -e 's:.*from [^/]*/::'`
+    return output if output.nil?
+    puts options.oneline ? output.gsub(/\s+/, ' ') : output
   end
 
   def defaults
     {
-      :from => 'origin/master',
-      :to   => 'origin/production'
+      :from    => 'origin/master',
+      :to      => 'origin/production',
+      :oneline => false
     }
   end
 
@@ -42,6 +45,10 @@ class App < Git::Whistles::App
         options.to = to
       end
 
+      op.on("-o", "--oneline", "Output features in one line separated by spaces") do |oneline|
+        options.oneline = true
+      end
+
       op.on_tail("-h", "--help", "Show this message") do
         puts op
         exit

data/bin/git-pivotal-branch

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+#
+# git-pivotal-branch
+# 
+#   Suggest a branch name from the given Pivotal Tracker story ID
+# 
+#   Assumes the branches are named as:
+#   <team>/<branch-title>-<story-id>
+# 
+require 'rubygems'
+require 'optparse'
+require 'pivotal-tracker'
+require 'readline'
+require 'term/ansicolor'
+require 'git-whistles/app'
+
+
+class App < Git::Whistles::App
+
+  def initialize
+    super
+  end
+
+  def main(args)
+    super
+    parse_args!(args)
+
+    if args.count < 1
+      show_and_exit usage
+    end
+
+    story_id = args[0]
+
+    # get PT info
+    story, project = get_pivotal_info(story_id)
+
+    branch_name_suggested = "#{project.name}/#{story.name}-#{story_id}".downcase
+    branch_name_suggested.gsub!(/[^\w\d\/]/, '-').gsub!(/-+/, '-')
+
+    puts 'The suggested branch name is: ' << Term::ANSIColor.yellow(branch_name_suggested)
+    puts '    Press ENTER if you agree'
+    puts ' or Write any other name and press ENTER'
+    puts ' or Press CTRL-D to cancel'
+
+    branch_name = Readline.readline '  > ', false
+
+    if branch_name.nil?
+      log.warn "\nCancelled by user"
+      exit 2
+    end
+
+    branch_name = branch_name.empty? ? branch_name_suggested : branch_name
+
+    # create branch
+    `cd #{ENV['PWD']} && git co -b #{branch_name}`
+
+    # comment and start on PT
+    story.notes.create :text => "Created branch #{branch_name}"
+    story.update :current_state => 'started'
+
+    puts Term::ANSIColor.green('Created branch and started PT story')
+  end
+
+  private
+  
+  def usage
+    'Usage: git pivotal-branch PIVOTAL_TRACKER_STORY_ID'
+  end
+  
+  def show_and_exit(message)
+    puts message
+    exit 1
+  end
+  
+  def option_parser
+    @option_parser ||= OptionParser.new do |op|
+      op.banner = usage
+
+      op.on_tail('-h', '--help', 'Show this message') do
+        show_and_exit op
+      end
+    end
+  end
+
+  def get_pivotal_info(story_id)
+    token = `git config pivotal-tracker.token`.strip
+    if token.empty?
+      puts Term::ANSIColor.yellow %Q{
+        Your branch appears to have a story ID,
+        but I don't know your Pivotal Tracker token!
+        Please set it with:
+        $ git config [--global] pivotal-tracker.token <token>
+      }
+      die "Aborting."
+    end
+
+    log.info "Finding your project and story¬"
+
+    PivotalTracker::Client.token = token
+    story, project = PivotalTracker::Project.all.find do |project|
+      log.info '.¬'
+      story = project.stories.find(story_id) and break story, project
+    end
+    log.info '.'
+
+    if story.nil?
+      log.warn "Apologies... I could not find story #{story_id}."
+      exit 1
+    end
+
+    log.info "Found story #{story_id} in '#{project.name}'"
+
+    [story, project]
+  end
+
+
+end
+
+############################################################################
+
+App.run!

data/git-whistles.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/git-whistles/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Julien Letessier"]
+  gem.authors       = ["Julien Letessier", "Pedro Cunha"]
   gem.email         = ["julien.letessier@gmail.com"]
   gem.description   = %q{A few helpers for classic Git workflows}
   gem.summary       = %q{

data/lib/git-whistles/version.rb

@@ -4,7 +4,7 @@ require 'pathname'
 
 module Git
   module Whistles
-    VERSION = "0.7.4"
+    VERSION = "0.7.5"
     GEMDIR = Pathname.new(__FILE__).parent.parent.parent
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: git-whistles
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
 - Julien Letessier
+- Pedro Cunha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +118,7 @@ executables:
 - git-list-branches
 - git-merge-po
 - git-outstanding-features
+- git-pivotal-branch
 - git-pull-request
 - git-select
 - git-stash-and-checkout
@@ -136,6 +138,7 @@ files:
 - bin/git-list-branches
 - bin/git-merge-po
 - bin/git-outstanding-features
+- bin/git-pivotal-branch
 - bin/git-pull-request
 - bin/git-select
 - bin/git-stash-and-checkout
@@ -164,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4357258647200684610
+      hash: 1077237623234121323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: