git-whistles 0.6.2 → 0.6.3

data/Gemfile.lock

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

data/bin/git-select

@@ -7,69 +7,119 @@
 #   the story-id and checkout it
 #
 require 'rubygems'
+require 'optparse'
 require 'term/ansicolor'
+require 'git-whistles/app'
 
-# Helper functions
-def git_dir?
-  `git config --get remote.origin.url`.strip == ''
-end
+class App < Git::Whistles::App
 
-def process(branches)
-  branches.split("\n").map { |branch| branch.strip.gsub(%r(\* ), '')}
-end
+  def initialize
+    super
+  end
 
-def select(branches, story_id)
-  branches.select { |branch| branch =~ /#{story_id}/ }
-end
+  def main(args)
+    super
+    parse_args!(args)
 
+    die "Missing story id", :usage => true     if args.count == 0
+    die "Too many arguments", :usage => true   if args.count > 1
 
-if git_dir?
-  puts "Not a valid git repo"
-  exit 1
-end
+    story_id = args.first
 
-if ARGV[0] && ARGV[0] =~ /^\d+$/
-  story_id = ARGV[0]
-else
-  puts "story-id is not a number"
-  exit 1
-end
+    unless story_id.match(/^\d+$/)
+      die "Story ID is not a number", :usage => true 
+    end
 
+    # Find locally first
+    locals = process(`git branch`)
 
-# Find locally first
-locals = process(`git branch`)
+    # Select matching locals
+    found  = select(locals, story_id)
 
-# Select matching locals
-found  = select(locals, story_id)
+    case found.size
+    when 0
+      puts yellow 'failed lookup on local branches'
+      puts ""
+    when 1
+      `git checkout #{found.first}`
+      exit 0
+    else
+      puts "found #{found.size} matches on locals:"
+      found.each do |branch|
+        puts green("  #{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 yellow 'failed lookup on remote branches'
+    when 1
+      if options.remote_checkout
+        `git checkout #{branch_name(found.first)}`
+        exit 0
+      else
+        puts "found #{green(branch_name(found.first))} on remote"
+        puts "by default remote branches are not checked out" 
+        puts "if you want to checkout do: #{green "git select -r #{story_id}"}"
+        exit 1
+      end
+    else
+      puts "Found #{found.size} matches on remotes:"
+      found.each do |branch|
+        puts green("  #{branch_name(branch)}")
+      end
+      exit 1
+    end
 
-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`)
+  def defaults
+    {
+      :remote_checkout => false
+    }
+  end
 
-# Select matching remotes
-found   = select(remotes, story_id)
+  def option_parser
+    @option_parser ||= OptionParser.new do |op|
+      op.banner = "Usage: git select [options] STORY_ID"
+
+      op.on("-r", "--remote", "Checkout branch from remote if not present locally") do |v|
+        options.remote_checkout = true
+      end
+
+      op.on_tail("-h", "--help", "Show this message") do
+        puts op
+        exit
+      end
+    end
+  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
+  
+  def branch_name(branch_ref)
+    branch_ref.gsub(%r(^remotes/origin/), "")
+  end
+
+  def green(text)
+    Term::ANSIColor.green(text)
+  end
 
-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/), "")}"
+  def yellow(text)
+    Term::ANSIColor.yellow(text)
   end
-  exit 1
 end
 
+App.run!

data/lib/git-whistles/version.rb

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

metadata

@@ -1,115 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-whistles
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.6.3
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-08 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: pry-nav
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: pivotal-tracker
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  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
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 5
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.5.6
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.6
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -119,10 +120,8 @@ executables:
 - git-select
 - git-stash-and-checkout
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -149,41 +148,32 @@ 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4013642806970746288
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 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: []
-