git-trac 0.0.20071106 → 0.0.20071107

data/Rakefile

@@ -70,7 +70,7 @@ spec = Gem::Specification.new do |s|
 
   s.files = [ "Rakefile", "README", "setup.rb" ]
   s.files = s.files + Dir.glob( "lib/**/*.rb" )
-  s.files = s.files + Dir.glob( "test/**/*" ).reject { |item| item.include?( "\.svn" ) }
+  s.files = s.files + Dir.glob( "test/**/*" ).reject { |item| item[-1] == ?~ || item.include?( "\.svn" ) }
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/git/trac/attachment.rb

@@ -13,7 +13,7 @@ module Git
       def self.from_hpricot(ticket, html)
         collection = []
         return collection unless html
-        (html.children).each do |element|
+        html.children.each do |element|
           if !element.elem?
           elsif element.name == "dd"
             str = ""
@@ -22,7 +22,7 @@ module Git
           elsif element.name = "dt"
             texts = []
             element.traverse_text {|x| texts << x.to_s}
-            if texts.first =~ /\A(\w*)(\.\d+)?\.(diff|patch)\Z/
+            if texts.first =~ /\A([\w-]*)(\.\d+)?\.(diff|patch)\Z/
               time = Time.parse("#{texts[3]} +0000").utc
               collection << new(ticket, texts[0], texts[2], time)
             end
@@ -89,9 +89,22 @@ module Git
         ticket.repository
       end
 
-      def apply!
+      def patch_with_root(root = nil)
+        if root && !root.empty? && p_value.zero?
+          patch = ""
+          body.each_line do |line|
+            line.sub!(/^([+-]{3} |Index: )([^\/].*)$/) { $1 + File.join(root, $2) }
+            patch << line
+          end
+          patch
+        else
+          body
+        end
+      end
+
+      def apply(options = {})
         repository.popen3("git-apply", "-p#{p_level}", :cached => true, :whitespace => "nowarn") do |inn,out,err|
-          inn.puts body
+          inn.puts patch_with_root(options[:root])
           inn.close
           err.read.empty?
         end

data/lib/git/trac/repository.rb

@@ -11,18 +11,21 @@ module Git
         options, dir = dir, nil if dir.kind_of?(Hash)
         dir ||= ENV["GIT_DIR"]
         dir ||= Dir.getwd
-        @git_dir = Dir.chdir(dir) do
-          Open3.popen3("git","rev-parse","--git-dir") do |i,o,e|
+        Dir.chdir(dir) do
+          @git_dir = Open3.popen3("git","rev-parse","--git-dir") do |i,o,e|
             e.read.empty? ? o.read.chomp("\n") : nil
           end
+          raise Git::Trac::Error, "Not a git repository" unless @git_dir
+          @git_dir = File.join(".",@git_dir) if @git_dir[0] == ?~
+          @git_dir = File.expand_path(@git_dir)
         end
-        raise Git::Trac::Error, "Not a git repository" unless @git_dir
-        @git_dir = File.join(".",@git_dir) if @git_dir[0] == ?~
-        @git_dir = File.expand_path(@git_dir)
-        @options = (config("trac")||{}).merge(options)
-        unless url
-          # raise Git::Trac::Error, "missing trac url: consider `git config trac.url http://tracurl`"
-        end
+        @options = options
+        reload
+      end
+
+      def reload #:nodoc:
+        @config = nil
+        @options = (config("trac")||{}).merge(@options)
       end
 
       def inspect
@@ -150,6 +153,9 @@ module Git
 
       def agent
         unless defined?(@agent)
+          unless url
+            raise Git::Trac::Error, "missing trac url: consider `git config trac.url http://tracurl`"
+          end
           require 'mechanize'
           @agent = WWW::Mechanize.new {|a| a.log = nil}
           url = "#{url()}/login"
@@ -206,7 +212,7 @@ module Git
           return number.to_i
         else
           hash = generated_commits
-          exec("git-rev-list", "HEAD", :maxcount => 25) do |line|
+          exec("git-rev-list", "HEAD", :max_count => 25) do |line|
             number = hash[line.chomp] and return number
           end
           nil

data/lib/git/trac/runner.rb

@@ -142,7 +142,7 @@ directory.
         def add_options(opts)
           require_ticket_number
           opts.separator("Options:")
-          opts.on("--filter PATTERN","only download patches matching PATTERN") do |pattern|
+          opts.on("--filter PATTERN","only download filenames matching PATTERN") do |pattern|
             options[:filter] = pattern
           end
         end
@@ -152,7 +152,7 @@ directory.
           @repository.ticket(number).attachments.each do |attach|
             next if options[:filter] && attach.filename !~ /#{options[:filter]}/
             File.open(attach.filename, "w") do |f|
-              f.puts attach.body
+              f.puts attach.patch_with_root(options[:root])
             end
           end
         end
@@ -173,6 +173,9 @@ Show a crude ticket summary.
 
         def add_options(opts)
           require_ticket_number
+          opts.on("--root DIR","apply patches relative to DIR") do |dir|
+            options[:root] = dir
+          end
         end
 
         def run
@@ -210,11 +213,20 @@ potentially remove conflicted branches first.
 
         def add_options(opts)
           require_ticket_number
+          opts.on("--branch BRANCH","apply against branch BRANCH") do |b|
+            options[:branch] = b
+          end
+          opts.on("--filter PATTERN","only fetch filenames matching PATTERN") do |pattern|
+            options[:filter] = pattern
+          end
+          opts.on("--root DIR","apply patches relative to DIR") do |dir|
+            options[:root] = dir
+          end
         end
 
         def run
           number = get_ticket_number
-          @repository.ticket(number).fetch do |attachment, branch|
+          @repository.ticket(number).fetch(options) do |attachment, branch|
             if branch
               puts "#{attachment.filename}: #{branch}"
             else
@@ -285,6 +297,9 @@ it against a production trac server.
           opts.on("--branch BRANCH", "git diff BRANCH (default trunk)") do |b|
             options[:branch] = b
           end
+          opts.on("--description TEXT", "use TEXT as description") do |text|
+            options[:description] = text
+          end
         end
 
         def run

data/lib/git/trac/ticket.rb

@@ -97,9 +97,7 @@ module Git
         attachment = form.file_uploads.name("attachment").first
         attachment.file_name = filename
         attachment.file_data = body
-        p form.fields
         submission = form.submit
-        puts submission.instance_variable_get(:@body)
         submission.instance_variable_get(:@uri)
       end
 
@@ -139,10 +137,12 @@ module Git
         seen = {}
         repository.with_index("tracindex#{$$}") do
           FileUtils.mkdir_p(trac_dir)
-          attachments.map do |attachment|
+          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)
-            unless attachment.apply!
+            unless attachment.apply(options)
               yield attachment, false if block_given?
               next
             end

data/test/execution_test.rb

@@ -37,4 +37,13 @@ class ExecutionTest < Test::Unit::TestCase
     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.reload
+    assert_equal "http://dev.rubyonrails.org", @repo.url
+    @repo.exec("git-config","trac.url","http://foo/trac.cgi")
+    @repo.reload
+    assert_equal "http://foo/trac.cgi", @repo.url
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: git-trac
 version: !ruby/object:Gem::Version 
-  version: 0.0.20071106
-date: 2007-11-06 00:00:00 -06:00
+  version: 0.0.20071107
+date: 2007-11-07 00:00:00 -06:00
 summary: Interact with trac from a git repository pulled from svn
 require_paths: 
 - lib
@@ -39,7 +39,6 @@ files:
 - lib/git/trac/runner.rb
 - lib/git/trac/ticket.rb
 - test/execution_test.rb
-- test/execution_test.rb~
 test_files: []
 
 rdoc_options: []

data/test/execution_test.rb~

@@ -1,40 +0,0 @@
-require 'fileutils'
-require 'tempfile'
-require 'test/unit'
-
-$: << File.join(File.dirname(File.dirname(__FILE__)),'lib')
-require 'git/trac'
-
-class ExecutionTest < Test::Unit::TestCase
-
-  def create_empty_repository(directory = nil)
-    if directory.nil?
-      file = Tempfile.new("git-trac-test")
-      directory = file.path
-      file.unlink
-    end
-    at_exit { FileUtils.rm_rf(directory) }
-    FileUtils.mkdir_p(directory)
-    Dir.chdir(directory) do
-      `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
-  end
-
-  def setup
-    @repo = create_empty_repository
-  end
-
-  def test_rev_parse
-    assert_match(/^[0-9a-f]{40}$/, @repo.rev_parse("HEAD"))
-  end
-
-  def test_stderr_should_raise
-    assert_nothing_raised                   {@repo.exec("git-diff","HEAD")}
-    assert_raise(Git::Trac::ExecutionError) {@repo.exec("git-diff","TAIL")}
-  end
-end