git-trac 0.0.20080127 → 0.0.20080204

data/lib/git/trac/attachment.rb

@@ -116,7 +116,7 @@ module Git
       end
 
       def apply(options = {})
-        repository.popen3("git-apply", "-p#{p_level}", :cached => true, :whitespace => "nowarn") do |inn,out,err|
+        repository.popen3("git","apply", "-p#{p_level}", "--cached", "--whitespace=nowarn") do |inn,out,err|
           inn.puts patch_with_root(options[:root])
           inn.close
           err.read.empty?

data/lib/git/trac/repository.rb

@@ -37,23 +37,10 @@ module Git
         Dir.chdir(File.dirname(@git_dir),&block)
       end
 
-      # Open3.popen3 in the current working tree.  An optional hash in the last
-      # argument is converted to flags that precede the arguments.
-      # <tt>:foo_bar => "baz"</tt> becomes <tt>--foo-bar=baz</tt>
+      # Open3.popen3 in the current working tree.
       def popen3(*args,&block)
         args.flatten!
         cmd = args.shift
-        if args.last.kind_of?(Hash)
-          args.pop.each do |k,v|
-            k = k.to_s.tr('-_','_-')
-            opt = case v
-                  when true  then "#{k}"
-                  when false then "no-#{k}"
-                  else            "#{k}=#{v}"
-                  end
-            args.unshift "--#{opt}"
-          end
-        end
         in_work_tree { Open3.popen3(cmd,*args,&block) }
       end
 
@@ -87,11 +74,11 @@ module Git
       # Call git-rev-parse on a revision, returning nil if nothing is found.
       def rev_parse(rev)
         if rev.kind_of?(String)
-          exec("git-rev-parse","--verify",rev).chomp
+          exec("git","rev-parse","--verify",rev).chomp
         elsif rev.kind_of?(Array)
           hash = {}
           return hash if rev.empty?
-          exec("git-rev-parse",*rev) do |rev|
+          exec("git","rev-parse",*rev) do |rev|
             hash[name] = rev.chomp if rev.chomp =~ /^[0-9a-f]{40}$/
           end
           hash
@@ -100,7 +87,7 @@ module Git
 
       def each_ref(*args)
         pattern = args.empty? ? "refs" : args.join("/")
-        exec("git-for-each-ref", pattern, :format => "%(objectname) %(refname)") do |line|
+        exec("git","for-each-ref", "--format=%(objectname) %(refname)", pattern) do |line|
           yield *line.chomp.split(" ",2)
         end
       end
@@ -127,7 +114,7 @@ module Git
       def config(arg1 = nil, arg2 = nil)
         unless @config
           @config = {}
-          exec("git-config","-l") do |line|
+          exec("git","config","-l") do |line|
             key, value = line.chomp.split("=",2)
             superkey, subkey = key.match(/(.*)\.(.*)/).to_a[1,2]
             @config[superkey] ||= {}
@@ -212,7 +199,7 @@ module Git
           return number.to_i
         else
           hash = generated_commits
-          exec("git-rev-list", "HEAD", :max_count => 25) do |line|
+          exec("git","rev-list", "--max-count=25", "HEAD") do |line|
             number = hash[line.chomp] and return number
           end
           nil

data/lib/git/trac/runner.rb

@@ -75,7 +75,7 @@ Available commands:
 
         def initialize(argv, repo)
           @argv, @repository = argv, repo
-          @options = repo.config("trac")
+          @options = repo.config("trac") || {}
           @opts = OptionParser.new
           @opts.banner = "Usage: git-trac #{command} #{banner_arguments}\n#{"\n" if description}#{description}"
           @opts.separator("")
@@ -242,15 +242,12 @@ potentially remove conflicted branches first.
           opts.on("--[no-]local","don't run git-svn fetch") do |bool|
             options[:local] = bool
           end
-          opts.on("--[no-]update","run git-svn fetch (deprecated)") do |bool|
-            options[:local] = !bool
-          end
         end
 
         def run
           unless options[:local]
             @repository.in_work_tree do
-              system("git-svn","fetch")
+              system("git","svn","fetch")
             end
           end
           each_ticket_argument do |number, filename|
@@ -336,23 +333,20 @@ it against a production trac server.
           opts.on("--[no-]local","don't run git-svn fetch") do |bool|
             options[:local] = bool
           end
-          opts.on("--[no-]update","run git-svn fetch (deprecated)") do |bool|
-            options[:local] = !bool
-          end
         end
 
         def run
           number = get_ticket_number
           unless options[:local]
             @repository.in_work_tree do
-              system("git-svn","fetch")
+              system("git","svn","fetch")
             end
           end
           ticket = @repository.ticket(number)
           if $stdin.tty? && !options[:force]
             block = lambda do
               @repository.in_work_tree do
-                system("git-diff", options[:branch] || "trunk...HEAD")
+                system("git","diff", options[:branch] || "trunk...HEAD")
               end
               description = "##{number} (#{ticket.csv["summary"]}"
               cols = ENV["COLUMNS"].to_i

data/lib/git/trac/ticket.rb

@@ -104,7 +104,7 @@ module Git
       def upload_patch(options = {})
         filename = options[:filename] || "#{File.basename(repository.current_checkout)}.patch"
         # diff = repository.exec("git-diff","#{options[:branch] || "trunk"}...HEAD")
-        diff = repository.exec("git-diff", options[:branch] || "trunk...HEAD")
+        diff = repository.exec("git","diff", options[:branch] || "trunk...HEAD")
         return false if diff.empty?
         # Don't upload the exact same patch that was pulled down
         return false if repository.generated_commits[repository.rev_parse("HEAD")] == number
@@ -124,13 +124,13 @@ module Git
         repository.each_ref("refs/remotes/trac/#{number}") do |object, ref|
           if File.basename(ref) =~ /#{options[:filter]}/
             revs << object
-            repository.exec("git-update-ref","-d",ref,object)
+            repository.exec("git","update-ref","-d",ref,object)
           end
         end
         unless revs.empty?
           repository.each_ref("refs/heads") do |object, ref|
             if revs.include?(object) && repository.current_checkout != File.basename(ref)
-              repository.exec("git-branch","-D",File.basename(ref))
+              repository.exec("git","branch","-D",File.basename(ref))
             end
           end
           true
@@ -145,13 +145,13 @@ module Git
           attachments.select do |attachment|
             attachment.filename =~ /#{options[:filter]}/
           end.map do |attachment|
-            parent = repository.exec("git-rev-list","--max-count=1","--before=#{attachment.timestamp}",options[:branch] || 'trunk').chomp
-            repository.exec("git-read-tree",parent)
+            parent = repository.exec("git","rev-list","--max-count=1","--before=#{attachment.timestamp}",options[:branch] || 'trunk').chomp
+            repository.exec("git","read-tree",parent)
             unless attachment.apply(options)
               yield attachment, false if block_given?
               next
             end
-            tree = repository.exec("git-write-tree").chomp
+            tree = repository.exec("git","write-tree").chomp
             ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] = attachment.username
             ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] = attachment.email
             ENV["GIT_AUTHOR_DATE"] = ENV["GIT_COMMITTER_DATE"] = attachment.timestamp
@@ -164,7 +164,7 @@ module Git
             else
               parents = " -p #{parent}"
             end
-            commit = repository.popen3("git-commit-tree #{tree}#{parents}") do |i,o,e|
+            commit = repository.popen3("git commit-tree #{tree}#{parents}") do |i,o,e|
               i.puts "#{number}/#{attachment.filename}"
               i.puts "\n#{attachment.description}" if attachment.description
               i.close

data/test/execution_test.rb

@@ -16,12 +16,12 @@ class ExecutionTest < Test::Unit::TestCase
     at_exit { FileUtils.rm_rf(directory) }
     FileUtils.mkdir_p(directory)
     Dir.chdir(directory) do
-      `git-init`
+      `git init`
     end
     FileUtils.touch(File.join(directory,".gitignore"))
     repo = Git::Trac::Repository.new(directory)
-    repo.exec("git-add",".gitignore")
-    repo.exec("git-commit","-m","Initial revision")
+    repo.exec("git","add",".gitignore")
+    repo.exec("git","commit","-m","Initial revision")
     repo
   end
 
@@ -34,15 +34,15 @@ class ExecutionTest < Test::Unit::TestCase
   end
 
   def test_stderr_should_raise
-    assert_nothing_raised                   { @repo.exec("git-diff","HEAD") }
-    assert_raise(Git::Trac::ExecutionError) { @repo.exec("git-diff","TAIL") }
+    assert_nothing_raised                   { @repo.exec("git","diff","HEAD") }
+    assert_raise(Git::Trac::ExecutionError) { @repo.exec("git","diff","TAIL") }
   end
 
   def test_should_determine_url
-    @repo.exec("git-config","svn-remote.svn.url","http://dev.rubyonrails.org/svn/rails")
+    @repo.exec("git","config","svn-remote.svn.url","http://dev.rubyonrails.org/svn/rails")
     @repo.reload
     assert_equal "http://dev.rubyonrails.org", @repo.url
-    @repo.exec("git-config","trac.url","http://foo/trac.cgi")
+    @repo.exec("git","config","trac.url","http://foo/trac.cgi")
     @repo.reload
     assert_equal "http://foo/trac.cgi", @repo.url
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-trac
 version: !ruby/object:Gem::Version 
-  version: 0.0.20080127
+  version: 0.0.20080204
 platform: ruby
 authors: 
 - Tim Pope
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-27 00:00:00 -06:00
+date: 2008-02-04 00:00:00 -06:00
 default_executable: git-trac
 dependencies: 
 - !ruby/object:Gem::Dependency