git-trac 0.0.20071211 → 0.0.20080127

data/lib/git/trac/attachment.rb

@@ -12,19 +12,23 @@ module Git
 
       def self.from_hpricot(ticket, html)
         collection = []
+        last = nil
         return collection unless html
         html.children.each do |element|
           if !element.elem?
           elsif element.name == "dd"
             str = ""
             element.traverse_text {|t| str << t.to_s}
-            collection.last.description = str
+            last.description = str if last
           elsif element.name = "dt"
             texts = []
             element.traverse_text {|x| texts << x.to_s}
             if texts.first =~ /\A([\w-]*)(\.\d+)?\.(diff|patch)\Z/
               time = Time.parse("#{texts[3]} +0000").utc
               collection << new(ticket, texts[0], texts[2], time)
+              last = collection.last
+            else
+              last = nil
             end
           end
         end
@@ -66,7 +70,7 @@ module Git
       end
 
       def tag_name
-        "trac/#{ticket.number}/#{filename.gsub(/[^A-Za-z0-9]+/,"_")}"
+        "trac/#{ticket.number}/#{filename}"
       end
 
       def tag_path

data/lib/git/trac/runner.rb

@@ -58,7 +58,7 @@ Available commands:
         end
 
         klass_name = command.capitalize.gsub(/-(.)/) { $1.upcase }
-        if self.class.const_defined?(klass_name)
+        if klass_name =~ /^[A-Z]\w*$/ && self.class.const_defined?(klass_name)
           klass = self.class.const_get(klass_name)
           if klass < Base
             return klass.new(@argv, @repository)
@@ -75,7 +75,7 @@ Available commands:
 
         def initialize(argv, repo)
           @argv, @repository = argv, repo
-          @options = {}
+          @options = repo.config("trac")
           @opts = OptionParser.new
           @opts.banner = "Usage: git-trac #{command} #{banner_arguments}\n#{"\n" if description}#{description}"
           @opts.separator("")
@@ -103,13 +103,24 @@ Available commands:
           end
         end
 
+        def each_ticket_argument
+          if @argv.empty?
+            yield get_ticket_number, nil
+          elsif @argv.any? {|a| a !~ /\b\d+\b/}
+            abort "ticket number required"
+          end
+          @argv.each do |arg|
+            match_data = arg.match(/\b(\d+)\b(?:\/([^?\/]+))?/)
+            yield Integer(match_data[1]), match_data[2]
+          end
+        end
+
         def require_ticket_number
           @opts.separator("Ticket number is required unless it can be derived from the current branch.\n")
         end
 
         def abort(message)
           $stderr.puts "Error: #{message}"
-          # $stderr.puts @opts
           exit(1)
         end
 
@@ -136,13 +147,13 @@ directory.
         end
 
         def banner_arguments
-          "[options] [ticket]"
+          "[options] [ticket[/filename]] ..."
         end
 
         def add_options(opts)
           require_ticket_number
           opts.separator("Options:")
-          opts.on("--filter PATTERN","only download filenames matching PATTERN") do |pattern|
+          opts.on("--filter PATTERN","only get matching filenames (deprecated)") do |pattern|
             options[:filter] = pattern
           end
           opts.on("--root DIR","prefix patch paths with DIR") do |dir|
@@ -151,11 +162,17 @@ directory.
         end
 
         def run
-          number = get_ticket_number
-          @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.patch_with_root(options[:root])
+          each_ticket_argument do |number, filename|
+            filter = if filename
+                       "\\A#{Regexp.escape(filename)}"
+                     else
+                       options[:filter]
+                     end
+            @repository.ticket(number).attachments.each do |attach|
+              next if filter && attach.filename !~ /#{filter}/
+              File.open(attach.filename, "w") do |f|
+                f.puts attach.patch_with_root(options[:root])
+              end
             end
           end
         end
@@ -193,7 +210,7 @@ Show a crude ticket summary.
       class Fetch < Base #:nodoc:
 
         def banner_arguments
-          "[ticket]"
+          "[options] [ticket[/filename]] ..."
         end
 
         def description
@@ -216,29 +233,37 @@ potentially remove conflicted branches first.
           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|
+          opts.on("--filter PATTERN","only fetch matching filenames (deprecated)") do |pattern|
             options[:filter] = pattern
           end
           opts.on("--root DIR","apply patches relative to DIR") do |dir|
             options[:root] = dir
           end
-          opts.on("--[no-]update","automatically run git-svn fetch") do |bool|
-            options[:update] = bool
+          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
-          if options[:update]
+          unless options[:local]
             @repository.in_work_tree do
               system("git-svn","fetch")
             end
           end
-          @repository.ticket(number).fetch(options) do |attachment, branch|
-            if branch
-              puts "#{attachment.filename}: #{branch}"
-            else
-              $stderr.puts "#{attachment.filename} FAILED"
+          each_ticket_argument do |number, filename|
+            loop_opts = options.dup
+            if filename
+              loop_opts[:filter] = "\\A#{Regexp.escape(filename)}"
+            end
+            @repository.ticket(number).fetch(loop_opts) do |attachment, branch|
+              if branch
+                puts "#{attachment.filename}: #{branch}"
+              else
+                $stderr.puts "#{attachment.filename} FAILED"
+              end
             end
           end
         end
@@ -248,7 +273,7 @@ potentially remove conflicted branches first.
       class Cleanup < Base #:nodoc:
 
         def banner_arguments
-          "[options] [ticket] [ticket] ..."
+          "[options] [ticket[/filename]] ..."
         end
 
         def description
@@ -271,12 +296,9 @@ been closed, but you can also specify ticket numbers explicitly or use --all.
               t.cleanup
             end
           elsif @argv.any?
-            begin
-              @argv.each do |a|
-                @repository.ticket(Integer(a)).cleanup
-              end
-            rescue TypeError
-              abort "invalid ticket number"
+            each_ticket_argument do |number, filename|
+              filter = "\\A#{Regexp.escape(filename.to_s)}"
+              @repository.ticket(number).cleanup(:filter => filter)
             end
           else
             @repository.working_tickets.each do |t|
@@ -311,14 +333,17 @@ it against a production trac server.
           opts.on("--[no-]force", "do not prompt before uploading") do |force|
             options[:force] = force
           end
-          opts.on("--[no-]update","automatically run git-svn fetch") do |bool|
-            options[:update] = bool
+          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
-          if options[:update]
+          unless options[:local]
             @repository.in_work_tree do
               system("git-svn","fetch")
             end

data/lib/git/trac/ticket.rb

@@ -119,11 +119,13 @@ module Git
         %w(new reopened).include?(c["status"])
       end
 
-      def cleanup
+      def cleanup(options = {})
         revs = []
         repository.each_ref("refs/remotes/trac/#{number}") do |object, ref|
-          revs << object
-          repository.exec("git-update-ref","-d",ref,object)
+          if File.basename(ref) =~ /#{options[:filter]}/
+            revs << object
+            repository.exec("git-update-ref","-d",ref,object)
+          end
         end
         unless revs.empty?
           repository.each_ref("refs/heads") do |object, ref|
@@ -136,7 +138,7 @@ module Git
       end
 
       def fetch(options = {})
-        cleanup
+        cleanup(options)
         seen = {}
         repository.with_index("tracindex#{$$}") do
           FileUtils.mkdir_p(trac_dir)
@@ -163,7 +165,8 @@ module Git
               parents = " -p #{parent}"
             end
             commit = repository.popen3("git-commit-tree #{tree}#{parents}") do |i,o,e|
-              i.puts attachment.description || attachment.filename
+              i.puts "#{number}/#{attachment.filename}"
+              i.puts "\n#{attachment.description}" if attachment.description
               i.close
               o.read.chomp
             end

metadata

@@ -1,33 +1,34 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: git-trac
 version: !ruby/object:Gem::Version 
-  version: 0.0.20071211
-date: 2007-12-11 00:00:00 -06:00
-summary: Interact with trac from a git repository pulled from svn
-require_paths: 
-- lib
-email: ruby@tpope.info
-homepage: http://git-trac.rubyforge.org
-rubyforge_project: git-trac
-description: git-trac takes the repetition out of working with trac and git-svn.  Among other features is the ability to easily attach a patch to a ticket and to pull all patches from a ticket and turn them into git branches.  Created for (but not limited to) work on the Ruby on Rails core.
-autorequire: 
-default_executable: git-trac
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.20080127
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Tim Pope
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-01-27 00:00:00 -06:00
+default_executable: git-trac
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mechanize
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.8
+    version: 
+description: git-trac takes the repetition out of working with trac and git-svn.  Among other features is the ability to easily attach a patch to a ticket and to pull all patches from a ticket and turn them into git branches.  Created for (but not limited to) work on the Ruby on Rails core.
+email: ruby@tpope.info
+executables: 
+- git-trac
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - Rakefile
 - README
@@ -39,25 +40,31 @@ files:
 - lib/git/trac/runner.rb
 - lib/git/trac/ticket.rb
 - test/execution_test.rb
-test_files: []
-
+has_rdoc: true
+homepage: http://git-trac.rubyforge.org
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- git-trac
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mechanize
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.8
-    version: 
+rubyforge_project: git-trac
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Interact with trac from a git repository pulled from svn
+test_files: []
+