From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Duy Nguyen <pclouds@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v8 6/6] contrib: related: implement custom option parser
Date: Fri, 31 May 2013 02:37:44 -0500 [thread overview]
Message-ID: <1369985864-31922-7-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369985864-31922-1-git-send-email-felipe.contreras@gmail.com>
Ruby's option parser is not extensible enough to keep unknown options.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/related/git-related | 83 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 71 insertions(+), 12 deletions(-)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index 585572b..c933898 100755
--- a/contrib/related/git-related
+++ b/contrib/related/git-related
@@ -3,26 +3,85 @@
# This script finds people that might be interested in a patch
# usage: git related <file>
-require 'optparse'
-
$since = '5-years-ago'
$min_percent = 10
$files = []
$rev_args = []
-OptionParser.new do |opts|
- opts.program_name = 'git related'
- opts.banner = 'usage: git related [options] <files | rev-list options>'
+class SimpleParser
+ attr_writer :usage
+
+ class Option
+ attr_reader :short, :long, :help
+
+ def initialize(short, long, help, &block)
+ @block = block
+ @short = short
+ @long = long
+ @help = help
+ end
+
+ def call(v)
+ @block.call(v)
+ end
+ end
- opts.on('-p', '--min-percent N', Integer,
- 'Minium percentage of role participation') do |v|
- $min_percent = v
+ def initialize
+ @list = {}
+ end
+
+ def on(short=nil, long=nil, help=nil, &block)
+ opt = Option.new(short, long, help, &block)
+ @list[short] = opt if short
+ @list[long] = opt if long
+ end
+
+ def parse
+ i = 0
+ if ARGV.member?('-h') or ARGV.member?('--help')
+ usage
+ exit 1
+ end
+ while cur = ARGV[i] do
+ if cur =~ /^(-.+?)(?:=(.*))?$/
+ opt = @list[$1]
+ if opt
+ v = $2 || ARGV.delete_at(i + 1)
+ opt.call(v)
+ ARGV.delete_at(i)
+ next
+ end
+ end
+ i += 1
+ end
end
- opts.on('-d', '--since DATE',
- 'How far back to search for relevant commits') do |v|
- $since = v
+
+ def usage
+ puts 'usage: %s' % @usage
+ @list.values.uniq.each do |opt|
+ s = ' '
+ s << [opt.short, opt.long].compact.join(', ')
+ s << '%*s%s' % [26 - s.size, '', opt.help] if opt.help
+ puts s
+ end
end
-end.parse!
+
+end
+
+opts = SimpleParser.new
+opts.usage = 'usage: git related [options] <files | rev-list options>'
+
+opts.on('-p', '--min-percent',
+ 'Minium percentage of role participation') do |v|
+ $min_percent = v.to_i
+end
+
+opts.on('-d', '--since',
+ 'How far back to search for relevant commits') do |v|
+ $since = v
+end
+
+opts.parse
class Commit
--
1.8.3.358.g5a91d05
next prev parent reply other threads:[~2013-05-31 7:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-31 7:37 [PATCH v8 0/6] New git-related helper Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 1/6] Add new git-related helper to contrib Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 2/6] contrib: related: add option parsing Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 3/6] contrib: related: add support for multiple patches Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 4/6] contrib: related: add option to parse from committish Felipe Contreras
2013-05-31 7:37 ` [PATCH v8 5/6] contrib: related: parse committish like format-patch Felipe Contreras
2013-05-31 7:37 ` Felipe Contreras [this message]
2013-05-31 7:48 ` [PATCH v8 0/6] New git-related helper Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369985864-31922-7-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).