git-trac 0.1.0 → 0.1.1

data/lib/git/trac/attachment.rb

@@ -101,7 +101,7 @@ module Git
           ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] = email
           ENV["GIT_AUTHOR_DATE"] = ENV["GIT_COMMITTER_DATE"] = timestamp
           commit = repository.popen3("git commit-tree #{tree} -p #{parent}") do |i,o,e|
-            i.puts "#{ticket.number}/#{filename}"
+            i.puts "trac/#{ticket.number}/#{filename}"
             i.puts "\n#{description}" if description
             i.close
             o.read.chomp

data/lib/git/trac/patch.rb

@@ -16,7 +16,7 @@ module Git
       alias to_s body
 
       def git?
-        body[0,10] == "diff --git" || body[0,6] == "--- a/"
+        body[0,1024] =~ /^diff --git / || body[0,6] == "--- a/"
       end
 
       # Rewrite filenames in a patch to be relative to +root+.  For each .. at

data/lib/git/trac/repository.rb

@@ -25,7 +25,7 @@ module Git
 
       def reload #:nodoc:
         @config = nil
-        @options = (config("trac")||{}).merge(@options)
+        @options = (config("trac")||{}).merge(config("trac-remote.trac")||{}).merge(@options)
       end
 
       def inspect
@@ -207,7 +207,6 @@ module Git
             if revs.include?(object)
               exec("git","branch","-D",File.basename(ref))
             elsif diff_hashes && diff_hashes.include?(dh = diff_hash(ref))
-              p "wooo!"
               exec("git","branch","-D",File.basename(ref))
             end
           end
@@ -262,8 +261,8 @@ module Git
               return local.sub(/\*/,$1)
             end
           end
-          svn["branches"].to_s
         end
+        nil
       end
 
       # Fetch a ticket object by number.

data/lib/git/trac/runner.rb

@@ -120,7 +120,7 @@ See `git-trac help` for details.
         def repository
           @repository ||= Git::Trac::Repository.new(@repository_option)
           unless @repository.url
-            abort "no URL.  Try `git config trac.url http://trac-url`"
+            abort "no URL.  Try `git config trac-remote.trac.url http://trac-url`"
           end
           @repository
         end
@@ -134,7 +134,7 @@ See `git-trac help` for details.
 
         def system(*args)
           repository.in_work_tree do
-            Kernel.system(*args) or exit $?.exitstatus
+            Kernel.system(*args) or exit $?.exitstatus || 1
           end
         end
 
@@ -226,7 +226,7 @@ See `git-trac help` for details.
               system(options[:fetch_command])
             elsif repository.config("svn-remote.svn")
               system("git svn fetch")
-            elsif repository.config("origin")
+            elsif repository.config("remote.origin")
               system("git fetch origin")
             end
           end

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

@@ -71,16 +71,21 @@ Show help for a given topic or command.
         TOPICS = {}
 
         TOPICS["config"] = ["Configuration"] << <<-EOF
-The following configuration options control git-trac:
-  trac.url            The root URL to the Trac website
-  trac.username       Username (if required by site)
-  trac.password       Password (if required by site)
+The following configuration options relate to the general operation of
+git-trac:
   trac.depth          Default --depth for commands which accept it
   trac.fetch-command  Update command to use in lieu of git svn fetch
 
+The following configuration options specify the trac site to scrape.  They
+are still also read from the trac section for backwards compatibility, but
+this is deprecated.
+  trac-remote.trac.url          The root URL to the Trac website
+  trac-remote.trac.username     Username (if required by site)
+  trac-remote.trac.password     Password (if required by site)
+
 They may be set either by editing the git config file or with git config.
   $ vim .git/config
-  $ git config trac.url http://my.trac.url
+  $ git config trac-remote.trac.url http://my.trac.url
 
 Additionally, the following options can affect git-trac's behavior:
   core.pager
@@ -102,9 +107,9 @@ Example for usage on the Ruby on Rails repository:
   $ git gc
 
   # Setup git-trac (see git-trac help config)
-  $ git config trac.url http://dev.rubyonrails.org
-  $ git config trac.username myaccount
-  $ git config trac.password mypassword
+  $ git config trac-remote.trac.url http://dev.rubyonrails.org
+  $ git config trac-remote.trac.username myaccount
+  $ git config trac-remote.trac.password mypassword
 
   # Have fun
   $ git-trac checkout 1234567/new_feature_with_failing_tests.patch

data/lib/git/trac/version.rb

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

data/test/execution_test.rb

@@ -42,7 +42,7 @@ class ExecutionTest < Test::Unit::TestCase
     @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-remote.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.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tim Pope
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-11 00:00:00 -06:00
+date: 2008-02-13 00:00:00 -06:00
 default_executable: git-trac
 dependencies: 
 - !ruby/object:Gem::Dependency