git-whistles 0.5.1 → 0.6.1

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 pkg
 rdoc
 tmp

data/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: .
+  specs:
+    git-whistles (0.6.1)
+      pivotal-tracker (~> 0.5.6)
+      term-ansicolor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.1.3)
+    coderay (1.0.7)
+    happymapper (0.4.0)
+      libxml-ruby (~> 2.0)
+    libxml-ruby (2.3.3)
+    method_source (0.8)
+    mime-types (1.19)
+    nokogiri (1.5.5)
+    pivotal-tracker (0.5.6)
+      builder
+      builder
+      happymapper (>= 0.3.2)
+      happymapper (>= 0.3.2)
+      nokogiri (>= 1.4.3)
+      nokogiri (~> 1.4)
+      rest-client (~> 1.6.0)
+      rest-client (~> 1.6.0)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    pry-nav (0.2.2)
+      pry (~> 0.9.10)
+    rake (0.9.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    slop (3.3.2)
+    term-ansicolor (1.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  git-whistles!
+  pry
+  pry-nav
+  rake

data/README.md

@@ -12,11 +12,12 @@ 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 [your-branch] [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-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 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
 
 ### More details on some of the commands
 

data/bin/git-ff-all-branches

@@ -6,53 +6,25 @@
 # 
 require 'ostruct'
 require 'optparse'
-require 'logger'
 require 'term/ansicolor'
+require 'git-whistles/logger'
+require 'git-whistles/app'
 
 ############################################################################
 
 
-class App
-
-  DEFAULTS = {
-    :fetch    => false,
-    :dry_run  => false,
-    :remote   => 'origin',
-    :loglevel => Logger::WARN
-  }
-
-  class Logger < ::Logger
-    Colors = {
-      'DEBUG'   => :reset,
-      'INFO'    => :green,
-      'WARN'    => :yellow,
-      'ERROR'   => :red,
-      'FATAL'   => :red,
-      'UNKNOWN' => :red
-    }
-    
-    def initialize(*args)
-      super
-      self.formatter = self.method(:custom_formatter)
-    end
-
-    def custom_formatter(severity, time, progname, msg)
-      Term::ANSIColor.send(Colors[severity], "#{msg}\n")
-    end
-  end
-
+class App < Git::Whistles::App
 
   def initialize
-    @options = OpenStruct.new(DEFAULTS)
+    super
     @local_branches  = {}
     @remote_branches = {}
     @current_branch  = nil
-    @log = Logger.new($stderr)
   end
 
 
   def main(args)
-    parse_args!(args)
+    super
     log.level = options.loglevel
 
     if options.fetch
@@ -69,11 +41,19 @@ class App
 
   private
 
-  attr :options
+  def defaults
+    {
+      :fetch    => false,
+      :dry_run  => false,
+      :remote   => 'origin',
+      :loglevel => Logger::WARN
+    }
+  end
+
+
   attr :local_branches
   attr :remote_branches
   attr :current_branch
-  attr :log
 
 
   def process_branch(branch_name)
@@ -90,20 +70,20 @@ class App
     end
 
     if branch_name == current_branch
-      if run('git status --porcelain').strip.empty?
+      if run!('git status --porcelain').strip.empty?
         flag = (options.loglevel > Logger::INFO) ? '-q' : ''
-        run("git merge --ff-only #{flag} #{new_head}") unless options.dry_run
+        run!("git merge --ff-only #{flag} #{new_head}") unless options.dry_run
       else
         log.warn('not merging current branch as it has local changes')
         return
       end
     else
-      merge_base = run("git merge-base #{old_head} #{new_head}").strip
+      merge_base = run!("git merge-base #{old_head} #{new_head}").strip
       if merge_base != old_head
         log.warn("cannot fast-forward #{branch_name}")
         return
       end
-      run("git update-ref refs/heads/#{branch_name} #{new_head} #{old_head}")
+      run!("git update-ref refs/heads/#{branch_name} #{new_head} #{old_head}")
     end
 
     log.info("#{branch_name}: #{short_sha old_head} -> #{short_sha new_head}")
@@ -138,39 +118,18 @@ class App
 
 
   def parse_args!(args)
-    begin
-      option_parser.parse!(args)
-    rescue OptionParser::InvalidOption => error
-      die error.message, :usage => true
-    end
+    super
 
-    if ARGV.any?
+    if args.any?
       die "this command does not take any argument besides flags", :usage => true
     end
   end
 
 
-  def run(command)
-    result = %x(#{command})
-    return result if $? == 0
-    die "command '#{command}' failed"
-  end
-
-
-  def die(message, options = {})
-    puts Term::ANSIColor.red(message)
-    if options[:usage]
-      puts 
-      puts option_parser.help
-    end
-    exit 1
-  end
-
-
   def load_refs
-    @current_branch = run("git symbolic-ref HEAD").strip.gsub(%r(^refs/heads/), '')
+    @current_branch = run!("git symbolic-ref HEAD").strip.gsub(%r(^refs/heads/), '')
 
-    run('git show-ref').strip.split(/\n+/).each do |line|
+    run!('git show-ref').strip.split(/\n+/).each do |line|
       line =~ %r(([a-f0-9]{40}) refs/(remotes/#{options.remote}|heads)/(.*)) or next
       if $2 == 'heads'
         @local_branches[$3] = $1
@@ -187,4 +146,4 @@ end
 
 ############################################################################
 
-App.new.main(ARGV)
+App.run!

data/bin/git-pull-request

@@ -7,114 +7,160 @@
 #   Assumes the branches are named
 #   <team>/<branch-title>-<story-id>
 # 
-# Copyright (C) 2012 Julien Letessier
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# require 'CGI'
 require 'rubygems'
 require 'pivotal-tracker'
+require 'optparse'
+require 'cgi'
 require 'term/ansicolor'
+require 'git-whistles/app'
 
-origin_url = `git config --get remote.origin.url`.strip
-unless origin_url =~ /github\.com/
-  puts "origin does not have a Github URL !"
-  exit 1
-end
 
-repo = origin_url.sub(/.*github\.com[\/:]/,'').sub(/\.git$/,'')
+class App < Git::Whistles::App
 
-if ARGV[0]
-  branch = ARGV[0]
-else
-  branch = `git symbolic-ref HEAD`.gsub(%r(^refs/heads/), "")
-  exit $? unless $? == 0
-end
+  Browsers = %w(xdg-open open firefox iceweasel)
 
-if branch == 'master'
-  puts "You cannot issue a pull request for master !"
-  exit 1
-end
+  def initialize
+    super
+  end
 
-against = ARGV[1] || 'master'
 
-# build the base query
-query = {
-  :base_repo => repo,
-  :base_ref  => against,
-  :head_ref  => branch
-}
+  def main(args)
+    super
+    parse_args!(args)
 
-# guess team name
-if branch =~ %r{^(\w+)/.*}
-  team = $1.capitalize
-end
+    if args.count > 0
+      die "Too many arguments", :usage => true
+    end
 
-# guess title.
-title = branch.split('/').last.split(/[_-]/).delete_if { |word| word =~ /^\d+$/ }.join(' ').capitalize
-query[:title] = "#{team}: #{title}"
-
-# find the PT story, or fall back to the branch-name-based titling
-if branch =~ /(\d+)$/
-  story_id = $1.to_i
-  token = `git config pivotal-tracker.token`.strip
-  if token.empty?
-    puts Term::ANSIColor.yellow %Q{
-      I don't know your Pivotal Tracker token!
-      Please set it with:
-      $ git config pivotal-tracker.token <token>
+    if options.from == options.to
+      die "You cannot issue a pull request to the same branch (#{options.from})."
+    end
+
+    # build the base query
+    query = {
+      :base_repo => repo,
+      :base_ref  => options.to,
+      :head_ref  => options.from
     }
-    exit 1
-  else
-    $stdout.write Term::ANSIColor.green "Finding your project and story "
-    $stdout.flush
+
+    # guess team name
+    if options.from =~ %r{^(\w+)/.*}
+      team = $1.capitalize
+    else
+      team = nil
+    end
+
+    # guess title.
+    title = options.from.split('/').last.split(/[_-]/).delete_if { |word| word =~ /^\d+$/ }.join(' ').capitalize
+    query[:title] = team ? "#{team}: #{title}" : title
+
+    # add Pivotal infos
+    add_pivotal_info(query, $1.to_i) if options.from =~ /(\d+)$/
+
+    query_string = query.map { |key,value|
+      "#{CGI.escape key.to_s}=#{CGI.escape value}"
+    }.join('&')
+    url = "https://github.com/#{repo}/pull/new?#{query_string}"
+    puts "Preparing a pull request for branch #{options.from}"
+    
+    unless launch_browser(url)
+      log.warn "Sorry, I don't know how to launch a web browser on your system. You can open it yourself and paste this URL:\n#{url}"
+    end
+  end
+
+
+  private
+
+
+  def defaults
+    {
+      :from   => run!('git symbolic-ref HEAD').strip.gsub(%r(^refs/heads/), ""),
+      :to     => 'master',
+      :remote => 'origin'
+    }
+  end
+
+  def option_parser
+    @option_parser ||= OptionParser.new do |op|
+      op.banner = "Usage: git pull-request [options]"
+
+      op.on("-f", "--from YOUR_BRANCH", "Branch to issue pull request for [head]") do |v|
+        options.from = v
+      end
+
+      op.on("-to", "--to UPSTREAM_BRANCH", "Branch into which you want your code merged [master]") do |v|
+        options.to = v
+      end
+
+      op.on("-r", "--remote NAME", "The remote you're sending this to [origin]") do |v|
+        options.to = v
+      end
+    end
+  end
+
+
+  def origin_url
+    @origin_url ||= begin
+      run!("git config --get remote.#{options.remote}.url").strip.tap do |url|
+        url =~ /github\.com/ or die "origin does not have a Github URL !"
+      end
+    end
+  end    
+
+
+  def repo
+    @repo ||= origin_url.sub(/.*github\.com[\/:]/,'').sub(/\.git$/,'')
+  end
+
+
+  def add_pivotal_info(query, 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|
-      $stdout.write Term::ANSIColor.green '.'
-      $stdout.flush
+      log.info '.¬'
       story = project.stories.find(story_id) and break story, project
     end
-    $stdout.puts
+    log.info '.'
 
     if story.nil?
-      puts Term::ANSIColor.yellow "Apologies... I could not find story #{story_id}."
-    else
-      $stdout.puts Term::ANSIColor.green "Found story #{story_id} in '#{project.name}'"
+      log.warn "Apologies... I could not find story #{story_id}."
+      return
+    end
+
+    log.info "Found story #{story_id} in '#{project.name}'"
 
-      headline = "Pivotal tracker story [##{story_id}](#{story.url}) in project *#{project.name}*:"
-      description = story.description.split("\n").map { |line| "> #{line}" }.join("\n")
-      body = "#{headline}\n\n#{description}"
-      title = "#{project.name}: #{story.name} [##{story.id}]"
+    headline = "Pivotal tracker story [##{story_id}](#{story.url}) in project *#{project.name}*:"
+    description = story.description.split("\n").map { |line| "> #{line}" }.join("\n")
+    body = "#{headline}\n\n#{description}"
+    title = "#{project.name}: #{story.name} [##{story.id}]"
+    query.merge! :subject => story.name, :body => body, :title => title
+    return
+  end
 
-      query.merge! :subject => story.name, :body => body, :title => title
+  def launch_browser(url)
+    Browsers.each do |command|
+      next if run("which #{command}").strip.empty?
+      system command, url
+      return true
     end
+    return false
   end
-end
 
-query_string = query.map { |key,value| "#{CGI.escape key.to_s}=#{CGI.escape value}"}.join('&')
-url = "https://github.com/#{repo}/pull/new?#{query_string}"
-puts "Preparing a pull request for branch #{branch}"
 
-# Use +xdg-open+ on Linux, +open+ on Darwin
-unless `which xdg-open`.strip.empty?
-  system "xdg-open", url
-else
-  system "open", url
 end
+
+############################################################################
+
+App.run!

data/bin/git-select

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+#
+# git-select #story-id
+#
+#   Looks up your current branches for the first occurence of
+#   the story-id and checkout it
+#
+require 'rubygems'
+require 'term/ansicolor'
+
+# Helper functions
+def git_dir?
+  `git config --get remote.origin.url`.strip == ''
+end
+
+def process(branches)
+  branches.split("\n").map { |branch| branch.strip.gsub(%r(\* ), '')}
+end
+
+def select(branches, story_id)
+  branches.select { |branch| branch =~ /#{story_id}/ }
+end
+
+
+if git_dir?
+  puts "Not a valid git repo"
+  exit 1
+end
+
+if ARGV[0] && ARGV[0] =~ /^\d+$/
+  story_id = ARGV[0]
+else
+  puts "story-id is not a number"
+  exit 1
+end
+
+
+# Find locally first
+locals = process(`git branch`)
+
+# Select matching locals
+found  = select(locals, story_id)
+
+case found.size
+when 0
+  puts Term::ANSIColor.yellow 'Failed lookup on local branches'
+when 1
+  `git checkout #{found.first}`
+  exit 0
+else
+  puts "Found #{found.size} matches on locals:"
+  found.each do |branch|
+    puts "  #{branch}"
+  end
+  exit 1
+end
+
+# Find remote branch
+remotes = process(`git branch -a`)
+
+# Select matching remotes
+found   = select(remotes, story_id)
+
+case found.size
+when 0
+  puts Term::ANSIColor.yellow 'Failed lookup on remote branches'
+else
+  puts "Found #{found.size} matches on remotes:"
+  found.each do |branch|
+    puts "  #{branch.gsub(%r(^remotes/origin/), "")}"
+  end
+  exit 1
+end
+

data/lib/git-whistles/app.rb

@@ -0,0 +1,75 @@
+require 'ostruct'
+require 'optparse'
+require 'term/ansicolor'
+require 'git-whistles/logger'
+
+
+module Git::Whistles
+  class App
+
+    def initialize
+      @options = OpenStruct.new(defaults)
+      @log = Git::Whistles::Logger.new($stderr)
+    end
+
+
+    def main(args)
+      parse_args!(args)
+    end
+
+
+    def self.run!
+      new.main(ARGV)
+    end
+
+
+    protected
+
+    # default options hash
+    def defaults
+      {}
+    end
+
+    attr :options
+    attr :log
+
+
+    def option_parser
+      @option_parser ||= OptionParser.new do |op|
+        op.banner = "Usage: #{$0}"
+      end
+    end
+
+
+
+    def parse_args!(args)
+      begin
+        option_parser.parse!(args)
+      rescue OptionParser::InvalidOption => error
+        die error.message, :usage => true
+      end
+    end
+
+
+    def run(command)
+      %x(#{command})
+    end
+
+
+    def run!(command)
+      result = %x(#{command})
+      return result if $? == 0
+      die "command '#{command}' failed"
+    end
+
+
+    def die(message, options = {})
+      puts Term::ANSIColor.red(message)
+      if options[:usage]
+        puts 
+        puts option_parser.help
+      end
+      exit 1
+    end
+  end
+end

data/lib/git-whistles/helpers.rb

@@ -0,0 +1,4 @@
+# Git command helpers
+
+module Git::Whistles::Helpers
+end

data/lib/git-whistles/logger.rb

@@ -0,0 +1,25 @@
+require 'logger'
+require 'git-whistles'
+
+module Git::Whistles
+  class Logger < ::Logger
+    Colors = {
+      'DEBUG'   => :reset,
+      'INFO'    => :green,
+      'WARN'    => :yellow,
+      'ERROR'   => :red,
+      'FATAL'   => :red,
+      'UNKNOWN' => :red
+    }
+    
+    def initialize(*args)
+      super
+      self.formatter = self.method(:custom_formatter)
+    end
+
+    def custom_formatter(severity, time, progname, msg)
+      msg = msg.sub(/([^¬])$/,"\\1\n").sub(/¬$/,'')
+      Term::ANSIColor.send(Colors[severity], msg)
+    end
+  end
+end

data/lib/git-whistles/version.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module Git
   module Whistles
-    VERSION = "0.5.1"
+    VERSION = "0.6.1"
     GEMDIR = Pathname.new(__FILE__).parent.parent.parent
   end
 end

metadata

@@ -1,128 +1,131 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: git-whistles
-version: !ruby/object:Gem::Version
-  version: 0.5.1
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
-authors:
+authors: 
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-10-29 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
 - git-merge-po
 - git-outstanding-features
 - git-pull-request
+- git-select
 - git-stash-and-checkout
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -132,9 +135,13 @@ files:
 - bin/git-merge-po
 - bin/git-outstanding-features
 - bin/git-pull-request
+- bin/git-select
 - bin/git-stash-and-checkout
 - git-whistles.gemspec
 - lib/git-whistles.rb
+- lib/git-whistles/app.rb
+- lib/git-whistles/helpers.rb
+- lib/git-whistles/logger.rb
 - lib/git-whistles/version.rb
 - libexec/git-chop.sh
 - libexec/git-list-branches.sh
@@ -142,32 +149,41 @@ files:
 - 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: 1223314009549717192
-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.24
+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: []
+