git-trac 0.0.20080206 → 0.1.0

data/lib/git/trac/runner/show.rb

@@ -4,8 +4,12 @@ module Git
 
       class Show < Base #:nodoc:
 
+        def self.summary
+          "Show an attachment or a list of attachments"
+        end
+
         def banner_arguments
-          "[ticket[/filename]]"
+          "[<ticket> | <attachment> | branches | rebased | today]"
         end
 
         def description
@@ -13,6 +17,11 @@ module Git
 Show the given ticket attachment.  The patch will be highlighted in a manner
 If the filename is omitted, show a list of attachments for the ticket.
 
+If the literal word "branches" is given, a list of all remote heads is output,
+followed by the branches that refer to them.  A literal "rebased" also shows
+branches that appear to be rebased attachments.  These rebased branches will be
+shown in brackets.
+
 Attachments can be downloaded by redirecting to a file.  The following example
 shows how one might download all patches for a given ticket:
 
@@ -23,21 +32,59 @@ shows how one might download all patches for a given ticket:
         end
 
         def run
-          each_ticket_argument do |number, filename|
-            ticket = @repository.ticket(number)
-            if filename
-              attachment = ticket.attachment(filename)
-              @repository.pager(attachment.body, filename =~ /\.(diff|patch)$/)
+          if [[], %w(branches), %w(rebased)].include?(@argv)
+            puts branches(@argv == %w(rebased))
+            return
+          elsif %w(today) == @argv
+            Pager.new.page(today)
+            return
+          end
+          each_ticket_or_attachment do |ticket|
+            if ticket.respond_to?(:body)
+              repository.pager(ticket.body, %w(.diff .patch).include?(ticket.extension))
             else
               body = ticket.attachments.map do |attachment|
-                "#{number}/#{attachment.filename}\n"
+                "#{attachment.ticket.number}/#{attachment.filename}\n"
               end.join
               exit(1) if body.empty?
-              @repository.pager(body)
+              repository.pager(body)
             end
           end
         end
 
+        def branches(rebased = false)
+          output = ""
+          current_checkout = repository.current_checkout
+          branches = []
+          repository.each_ref("refs/heads") do |object, ref|
+            branches << [ref.sub(/^refs\/heads\//,''), object]
+            branches.last << (rebased ? repository.diff_hash(object) : nil)
+          end
+          repository.each_ref("refs/remotes/trac") do |object, ref|
+            current = (object == current_checkout)
+            line = ref.sub(/^refs\/remotes\//,'')
+            diff_hash = rebased && repository.diff_hash(object)
+            branches.each do |(branch,branch_object,branch_hash)|
+              if object == branch_object
+                line << " <#{branch}>"
+              elsif diff_hash == branch_hash
+                line << " [#{branch}]"
+                current ||= (branch == current_checkout)
+              end
+            end
+            output << (current ? "* " : "  ") + line + "\n"
+          end
+          output
+        end
+
+        def today(days_back = 2)
+          require 'hpricot'
+          response = repository.get_response("#{repository.url}/timeline?ticket_details=on&max=#{50*days_back}&daysback=#{days_back}&format=rss")
+          response.error! unless response.kind_of?(Net::HTTPSuccess)
+          h = Hpricot(response.body)
+          (h/:title).map {|y| y.inner_text.match(/^(.*) attached to ticket #(\d+)$/) && "#$2/#$1\n"}.compact.join
+        end
+
       end
 
     end

data/lib/git/trac/ticket.rb

@@ -24,14 +24,8 @@ module Git
         "#{@repository.url}/attachment/ticket/#{@number}"
       end
 
-      def get_response(uri)
-        require 'net/http'
-        require 'uri'
-        Net::HTTP.get_response(URI.parse(uri))
-      end
-
       def csv
-        response = get_response(url(:tab))
+        response = repository.get_response(url(:tab))
         no_such_ticket  if     response.kind_of?(Net::HTTPInternalServerError)
         response.error! unless response.kind_of?(Net::HTTPSuccess)
         body = response.body
@@ -53,7 +47,7 @@ module Git
       attr_reader :number
 
       def attachments
-        response = get_response(attachment_url)
+        response = repository.get_response(attachment_url)
         if html = response.body[/<dl class="attachments">.*?<\/dl>/m]
           return Attachment.from_html(self,html)
         elsif response.kind_of?(Net::HTTPSuccess)
@@ -77,26 +71,6 @@ module Git
         "#{repository.git_dir}/refs/remotes/trac/#{number}"
       end
 
-      class Form
-        def initialize(mech_form)
-          @mech_form = mech_form
-        end
-
-        def submit(*args)
-          @mech_form.submit
-        end
-
-        def method_missing(method,*args,&block)
-          if method.to_s[-1] == "=" && @mech_form.fields.name(method.to_s[0..-2]).any?
-            @mech_form.fields.name(method.to_s[0..-2]).send(:value=,*args,&block)
-          elsif @mech_form.fields.name(method.to_s).any?
-            @mech_form.fields.name(method.to_s).send(:value,*args,&block)
-          else
-            super(method,*args,&block)
-          end
-        end
-      end
-
       def form
         repository.agent.get(url).forms.last
       end
@@ -124,8 +98,9 @@ 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")
+        upstream = options[:upstream] || "refs/remotes/trunk"
+        upstream += "...HEAD" unless upstream.include?(".")
+        diff = repository.exec("git","diff",upstream)
         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
@@ -143,29 +118,20 @@ module Git
       def cleanup(options = {})
         revs = []
         repository.each_ref("refs/remotes/trac/#{number}") do |object, ref|
-          if File.basename(ref) == options[:attachment] || !options[:attachment]
-            revs << object
-            repository.exec("git","update-ref","-d",ref,object)
-          end
+          revs << object
+          repository.exec("git","update-ref","-d",ref,object) unless options[:only_branches]
+        end
+        begin
+          Dir.unlink("#{repository.git_dir}/refs/remotes/trac/#{number}")
+        rescue Errno::ENOENT, Errno::ENOTEMPTY
         end
-        repository.cleanup_branches(*revs)
         revs.any?
       end
 
-      def fetch(options = {})
+      def fetch(options = {}, &block)
         cleanup(options)
-        seen = {}
-        attachments.select do |attachment|
-          attachment.filename =~ /#{options[:filter] || "\\.(diff|patch)$"}/
-        end.map do |attachment|
-          commit, applied = attachment.fetch(options)
-          yield attachment, applied if block_given?
-          seen[attachment.name] = commit if commit
-        end
-        seen.each do |k,v|
-          if !File.exists?(path = "#{repository.git_dir}/refs/heads/#{k}")
-            File.open(path, "w") {|f| f.puts v}
-          end
+        attachments.each do |attachment|
+           attachment.fetch(options,&block)
         end
       end
 

data/lib/git/trac/version.rb

@@ -0,0 +1,11 @@
+module Git
+  module Trac
+    module VERSION #:nodoc:
+      MAJOR = 0
+      MINOR = 1
+      TINY  = 0
+
+      STRING = [MAJOR, MINOR, TINY].join('.')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-trac
 version: !ruby/object:Gem::Version 
-  version: 0.0.20080206
+  version: 0.1.0
 platform: ruby
 authors: 
 - Tim Pope
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-06 00:00:00 -06:00
+date: 2008-02-11 00:00:00 -06:00
 default_executable: git-trac
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
       - !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.
+description: git-trac takes the repetition out of working with trac and git-svn.  Easily download a patch, apply it at the right point in time, turn it into a commit with useful metadata, and check it out into a branch, all in one command.  Created for (but not limited to) work on the Ruby on Rails core.
 email: ruby@tpope.info
 executables: 
 - git-trac
@@ -36,19 +36,21 @@ files:
 - bin/git-trac
 - lib/git/trac.rb
 - lib/git/trac/attachment.rb
-- lib/git/trac/repository.rb
-- lib/git/trac/runner.rb
-- lib/git/trac/ticket.rb
 - lib/git/trac/pager.rb
 - lib/git/trac/patch.rb
-- lib/git/trac/runner/download.rb
-- lib/git/trac/runner/show.rb
-- lib/git/trac/runner/fetch.rb
-- lib/git/trac/runner/cleanup.rb
-- lib/git/trac/runner/upload_patch.rb
+- lib/git/trac/repository.rb
+- lib/git/trac/runner.rb
 - lib/git/trac/runner/apply.rb
-- test/execution_test.rb
+- lib/git/trac/runner/cleanup.rb
+- lib/git/trac/runner/fetch.rb
+- lib/git/trac/runner/help.rb
+- lib/git/trac/runner/push.rb
+- lib/git/trac/runner/show.rb
+- lib/git/trac/runner/checkout.rb
+- lib/git/trac/ticket.rb
+- lib/git/trac/version.rb
 - test/attachment_test.rb
+- test/execution_test.rb
 has_rdoc: true
 homepage: http://git-trac.rubyforge.org
 post_install_message: 

data/lib/git/trac/runner/download.rb

@@ -1,44 +0,0 @@
-module Git
-  module Trac
-    class Runner
-
-      class Download < Base #:nodoc:
-
-        def description
-          <<-EOF
-Download all attachments that look like patches to the current working
-directory.
-
-This command is a candidate for removal.  Individual patches can be downloaded
-by redirecting git-trac show to a file.
-          EOF
-        end
-
-        def banner_arguments
-          "[options] [ticket[/filename]] ..."
-        end
-
-        def add_options(opts)
-          require_ticket_number
-          opts.separator("Options:")
-          opts.on("--root DIR","prefix patch paths with DIR") do |dir|
-            options[:root] = dir
-          end
-        end
-
-        def run
-          each_ticket_argument do |number, filename|
-            @repository.ticket(number).attachments.each do |attach|
-              next if filename && attach.filename != filename
-              File.open(attach.filename, "w") do |f|
-                f.puts attach.patch.with_root(options[:root])
-              end
-            end
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/git/trac/runner/upload_patch.rb

@@ -1,62 +0,0 @@
-module Git
-  module Trac
-    class Runner
-
-      class UploadPatch < Base #:nodoc:
-
-        def banner_arguments
-          "[options] [ticket]"
-        end
-
-        def description
-          <<-EOF
-Do a `git diff` against trunk (or another branch) and upload the result as an
-attachment to a ticket.  The potential patch will be shown in a pager and you
-will be given the opportunity to cancel.
-          EOF
-        end
-
-        def add_options(opts)
-          require_ticket_number
-          opts.on("--branch BRANCH", "git diff BRANCH (default trunk...HEAD)") do |b|
-            options[:branch] = b
-          end
-          opts.on("--description TEXT", "use TEXT as description") do |text|
-            options[:description] = text
-          end
-          opts.on("--[no-]force", "do not prompt before uploading") do |force|
-            options[:force] = force
-          end
-          add_local_option(opts)
-        end
-
-        def run
-          number = get_ticket_number
-          fetch_unless_local
-          ticket = @repository.ticket(number)
-          if $stdin.tty? && !options[:force]
-            block = lambda do
-              @repository.in_work_tree do
-                system("git","diff", options[:branch] || "trunk...HEAD")
-              end
-              description = "##{number} (#{ticket.csv["summary"]}"
-              cols = ENV["COLUMNS"].to_i
-              cols = 80 if cols.zero?
-              description.sub!(/^(.{#{cols-22}}).{4,}/,"\\1...")
-              print "#{description}) Proceed? [yN] "
-              $stdin.gets[0,1] == "y"
-            end
-          else
-            block = lambda { true }
-          end
-          if uri = ticket.upload_patch(options,&block)
-            puts uri
-          else
-            exit 1
-          end
-        end
-      end
-
-    end
-  end
-end