git-whistles 0.7.7 → 0.8.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-whistles (0.7.7)
+    git-whistles (0.8.0)
       pivotal-tracker (~> 0.5.6)
       term-ansicolor
 
@@ -12,17 +12,18 @@ GEM
     coderay (1.0.9)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
-    happymapper (0.4.0)
+    happymapper (0.4.1)
       libxml-ruby (~> 2.0)
     libxml-ruby (2.7.0)
     method_source (0.8.2)
-    mime-types (1.24)
-    mini_portile (0.5.1)
+    mime-types (2.0)
+    mini_portile (0.5.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    nokogiri-happymapper (0.5.7)
+    nokogiri-happymapper (0.5.8)
       nokogiri (~> 1.5)
-    pivotal-tracker (0.5.10)
+    pivotal-tracker (0.5.12)
+      builder
       builder
       crack
       happymapper (>= 0.3.2)
@@ -30,6 +31,7 @@ GEM
       nokogiri (>= 1.5.5)
       nokogiri-happymapper (>= 0.5.4)
       rest-client (~> 1.6.0)
+      rest-client (~> 1.6.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -39,11 +41,11 @@ GEM
     rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    safe_yaml (0.9.5)
+    safe_yaml (0.9.7)
     slop (3.4.6)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    tins (0.9.0)
+    tins (0.13.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,4 @@
-This repository is about sharing helper scripts for the [Git](http://git-scm.com/)
-version control system.
+This repository is about sharing helper scripts for the [Git](http://git-scm.com/) version control system.
 
 Install with:
 
@@ -10,16 +9,20 @@ Otherwise strange load issues may happen.
 
 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] [--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. It also comments on the story the branch name created and starts the story [[dncrht](https://github.com/dncrht)]
+
+| Command | Description|
+|---------|------------|
+| `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] [--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 ...]` | Deletes the local and origin copy of a branch. Useful to close feature branches once a feature is completed. It also accepts multiple branches separated by spaces [[David Silva](https://github.com/Davidslv)] |
+| `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. It also comments on the story the branch name created and starts the story [[dncrht](https://github.com/dncrht)] |
+
 
 ### More details on some of the commands
 

data/bin/git-outstanding-features

@@ -20,9 +20,16 @@ class App < Git::Whistles::App
     super
     parse_args!(args)
 
-    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
+    merges = `git log --merges --first-parent #{options.from} ^#{options.to} | grep 'Merge pull request'`
+    return if merges.nil?
+
+    output = []
+    merges.lines.each do |merge|
+      merge.match(/(#\d+).*from.*\/(.*)/)
+      output << $1 + ' ' + $2
+    end
+
+    puts options.oneline ? output.join(', ') : output
   end
 
   def defaults

data/git-whistles.gemspec

@@ -20,6 +20,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
 
+  if RUBY_VERSION < "1.9"
+    gem.add_dependency "nokogiri",        "~> 1.5.10"
+    gem.add_dependency "mime-types",      "~> 1.24"
+  end
+ 
   gem.add_dependency "pivotal-tracker", "~> 0.5.6"
   gem.add_dependency "term-ansicolor"
 

data/lib/git-whistles/version.rb

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

data/libexec/git-chop.sh

@@ -12,13 +12,14 @@ die() {
 head=$(git symbolic-ref HEAD 2> /dev/null || git log -1 --format=%h)
 current_branch=${head#refs/heads/}
 
-branch="$1"
-: ${branch:-$head}
-echo "Closing feature branch $branch"
+for branch in "$@" ; do
+  : ${branch:-$head}
+  echo "Closing feature branch $branch"
 
-if [ "$branch" = "$current_branch" ] ; then
-  git checkout master || die
-fi
+  if [ "$branch" = "$current_branch" ] ; then
+    git checkout master || die
+  fi
 
-git branch -D "$branch" || die
-git push origin ":$branch" || die
+  git branch -D "$branch" || die
+  git push origin ":$branch" || die
+done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-whistles
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2593086754161782454
+      hash: -85854206902681188
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: