git_pr 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7968f62060b92b884f997995272104332c1030e7
-  data.tar.gz: 71f6a543bb64d27d0f938a695997ee3492d91629
+  metadata.gz: f8cc6ae5ee1b8542c6604e93b867b02f2ad50b3b
+  data.tar.gz: 2c5cba47012e107e6abcfded23dfeaf2854b7d75
 SHA512:
-  metadata.gz: f820bb0fe822c56a9ee7c4545ec48c0e35639830f1e50d7d50a7ea3554a878611490c74f2fc491d176f8abec409207c5659a2eb822ba3e4468b62586ca408dbf
-  data.tar.gz: f87879e59f11b490d89c360589ec0fb47f096b48003137593441be80bf4fb4c3be1f8e4da3af33b5727b99c3e1c4cf114c21c64d203ff2a4d0ac33b8f0ca46ba
+  metadata.gz: 932da4da4bdc06625caa8a4db56343a703e0e06bb4418e6643d08b2acb1a28e7b8426ad9ef839d500eb239ae8bd8ba0b43b501762672fb709eade05d91ab89e9
+  data.tar.gz: f4cdb8e73c7e3eae5375186f9f4eefd1df25ed02c31e3213456df13577b956e41f3c8cab376dd80e8408ac2c1c2bf3b681b839301f6730fb3eab3e93b73587c5

data/bin/git-pr

@@ -125,6 +125,24 @@ eos
   end
 }
 
+def alias_to_subcommand(subcommand)
+  case subcommand
+  when "dt", /^difft/
+    "difftool"
+  when "d", /^d/
+    "diff"
+  when "web", /^o/
+    "open"
+  when "ls", /^l/
+    "list"
+  when "ci", /^m/
+    "merge"
+  else
+    subcommand
+  end
+end
+
+# Parse global options. Print help if any unrecognized
 begin
   global_options.order!
 rescue OptionParser::InvalidOption => e
@@ -133,12 +151,26 @@ rescue OptionParser::InvalidOption => e
   exit
 end
 
-command = ARGV.shift
+command = alias_to_subcommand(ARGV.shift)
+
+# Check for the special command help. Support "git pr help" and "git pr help <subcommand>"
+if command == "help"
+  command = alias_to_subcommand(ARGV.shift)
+  if subcommands[command]
+    puts subcommands[command]
+  else
+    puts global_options
+  end
+  exit
+end
+
+# Unrecognized command? Print help and exit
 if !subcommands[command]
   puts global_options
   exit
 end
 
+# Parse subcommand options. Print help if any unrecognized
 begin
   options[command].additional_arguments = subcommands[command].permute!
 rescue OptionParser::InvalidOption => e

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize