git-whistles 0.6.3 → 0.7.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-whistles (0.6.3)
+    git-whistles (0.7.0)
       pivotal-tracker (~> 0.5.6)
       term-ansicolor
 
@@ -13,7 +13,7 @@ GEM
     crack (0.3.2)
     happymapper (0.4.0)
       libxml-ruby (~> 2.0)
-    libxml-ruby (2.6.0)
+    libxml-ruby (2.5.0)
     method_source (0.8)
     mime-types (1.21)
     nokogiri (1.5.6)

data/README.md

@@ -13,7 +13,7 @@ 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 [from-branch] [to-branch]` List the pull requests merged in `[to-branch]` but not in `[from-branch]`. Useful to prepare a list of stuff you're oging to deploy. Defaults to listing what's on `origin/master` but not on `origin/production`.
+- `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 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.

data/bin/git-outstanding-features

@@ -1,17 +1,53 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 #
-# runner.rb --
+# git-outstanding-features --
 #
-#   Run shell scripts from a gem.
-#   Symlink to this script to run a script with the same name living in
-#   libexec/.
+# List merged pull requests.
 #
-require 'pathname'
 require 'rubygems'
-require 'git-whistles'
+require 'optparse'
+require 'term/ansicolor'
+require 'git-whistles/app'
 
-target_script = Pathname.new($0).basename
-script_path = Git::Whistles::GEMDIR.join('libexec', "#{target_script}.sh").cleanpath.to_s
+class App < Git::Whistles::App
 
-Kernel.exec script_path, *ARGV
+  def initialize
+    super
+  end
+
+  def main(args)
+    super
+    parse_args!(args)
+
+    `git log --oneline #{options.to} ^#{options.from} | grep 'Merge pull request' | sed  -e 's:.*from [^/]*/::'`
+  end
+
+  def defaults
+    {
+      :from => 'origin/master',
+      :to   => 'origin/production'
+    }
+  end
+
+  def option_parser
+    @option_parser ||= OptionParser.new do |op|
+      op.banner = "Usage: git outstanding-features --from [FROM-BRANCH] --to [TO-BRANCH]"
+
+      op.on("-f", "--from [BRANCH]", "From branch") do |from|
+        options.from = from
+      end
+
+      op.on("-t", "--to [BRANCH]", "To branch") do |to|
+        options.to = to
+      end
+
+      op.on_tail("-h", "--help", "Show this message") do
+        puts op
+        exit
+      end
+    end
+  end
+end
+
+App.run!

data/lib/git-whistles/version.rb

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

metadata

@@ -1,116 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: git-whistles
-version: !ruby/object:Gem::Version
-  version: 0.6.3
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
-authors:
+authors: 
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2013-03-03 00:00:00 +00:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bundler
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pivotal-tracker
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 5
+        - 6
         version: 0.5.6
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: pivotal-tracker
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.6
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   name: term-ansicolor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id006
 description: A few helpers for classic Git workflows
-email:
+email: 
 - julien.letessier@gmail.com
-executables:
+executables: 
 - git-chop
 - git-ff-all-branches
 - git-list-branches
@@ -120,8 +119,10 @@ executables:
 - git-select
 - git-stash-and-checkout
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -145,35 +146,43 @@ files:
 - libexec/git-chop.sh
 - libexec/git-list-branches.sh
 - libexec/git-merge-po.sh
-- libexec/git-outstanding-features.sh
 - libexec/git-stash-and-checkout.sh
 - libexec/runner.rb
+has_rdoc: true
 homepage: http://github.com/mezis/git-whistles
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4013642806970746288
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.9.5
 signing_key: 
 specification_version: 3
-summary: ! 'A few helpers for classic Git workflows: makes branching and merging,
-  PO file handling, issuing pull requests slightly simpler.'
+summary: "A few helpers for classic Git workflows: makes branching and merging, PO file handling, issuing pull requests slightly simpler."
 test_files: []
+

data/libexec/git-outstanding-features.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# git-outstanding-features --
-# 
-# List merged pull requests.
-#
-
-from=${1:-origin/production}
-to=${2:-production}
-
-git log --oneline ${to} ^${from} | grep 'Merge pull request' | sed  -e 's:.*from [^/]*/::'