@@ -13,17 +13,6 @@ module Grit self.git_dir = git_dir end - # Converstion hash from Ruby style options to git command line - # style options - TRANSFORM = {:max_count => "--max-count=", - :skip => "--skip=", - :pretty => "--pretty=", - :sort => "--sort=", - :format => "--format=", - :since => "--since=", - :p => "-p", - :s => "-s"} - # Run the given git command with the specified arguments and return # the result as a String # +cmd+ is the command @@ -52,12 +41,19 @@ module Grit def transform_options(options) args = [] options.keys.each do |opt| - if TRANSFORM[opt] + if opt.to_s.size == 1 + if options[opt] == true + args << "-#{opt}" + else + val = options.delete(opt) + args << "-#{opt.to_s} #{val}" + end + else if options[opt] == true - args << TRANSFORM[opt] + args << "--#{opt.to_s.gsub(/_/, '-')}" else val = options.delete(opt) - args << TRANSFORM[opt] + val.to_s + args << "--#{opt.to_s.gsub(/_/, '-')}=#{val}" end end end lib/grit/git.rb @@ -10,6 +10,12 @@ class TestGit < Test::Unit::TestCase end def test_transform_options + assert_equal ["-s"], @git.transform_options({:s => true}) + assert_equal ["-s 5"], @git.transform_options({:s => 5}) + + assert_equal ["--max-count"], @git.transform_options({:max_count => true}) assert_equal ["--max-count=5"], @git.transform_options({:max_count => 5}) + + assert_equal ["-t", "-s"], @git.transform_options({:s => true, :t => true}) end end \ No newline at end of file test/test_git.rb b5d4f15a4dd41646405f11fb107aa8efb16c98a4 Tom Preston-Werner tom@mojombo.com http://github.com/mojombo/grit/commit/8c7f4e1d8cb66590825701b758160e3721003dde 8c7f4e1d8cb66590825701b758160e3721003dde 2007-10-25T09:13:03-07:00 2007-10-25T09:13:03-07:00 dynamically rewrite ruby style git options acc8645713a107f3b755d6c721aa9e0a3fd658d9 Tom Preston-Werner tom@mojombo.com