TicGit-ng 1.0.1.3 → 1.0.2

data/lib/ticgit-ng/base.rb

@@ -205,10 +205,10 @@ module TicGitNG
     def ticket_revparse(ticket_id)
       if ticket_id
         ticket_id = ticket_id.strip
-        
+
         if /^[0-9]*$/ =~ ticket_id
           if t = @last_tickets[ticket_id.to_i - 1]
-            return t
+           return t
           end
         else # partial or full sha
           regex = /^#{Regexp.escape(ticket_id)}/
@@ -281,15 +281,15 @@ module TicGitNG
       puts "Fetching #{repo}" if verbose
       @git.fetch(repo)
       puts "Syncing tickets with #{repo}" if verbose
-      remote_branches=@git.branches.remote.map{|b| 
-        b.full.gsub('remotes/', '')[Regexp.new("^#{Regexp.escape(repo)}/.*")] 
+      remote_branches=@git.branches.remote.map{|b|
+        b.full.gsub('remotes/', '')[Regexp.new("^#{Regexp.escape(repo)}/.*")]
       }.compact
       remote_branches.include?("#{repo}/ticgit-ng") ? r_ticgit='ticgit-ng' : r_ticgit='ticgit'
-      in_branch(false) do 
-         repo_g=git.remote(repo)
-         git.pull(repo_g, repo+'/'+r_ticgit)
-         git.push(repo_g, "#{which_branch?}:"+r_ticgit ) if push
-         puts "Tickets synchronized." if verbose
+      in_branch(false) do
+        repo_g=git.remote(repo)
+        git.pull(repo_g, repo+'/'+r_ticgit)
+        git.push(repo_g, "#{which_branch?}:"+r_ticgit ) if push
+        puts "Tickets synchronized." if verbose
       end
     end
 
@@ -302,7 +302,7 @@ module TicGitNG
 
       bs = git.lib.branches_all.map{|b| b.first }
 
-      unless (bs.include?(which_branch?) || bs.include?(which_branch?))  && 
+      unless (bs.include?(which_branch?) || bs.include?(which_branch?))  &&
               File.directory?(@tic_working)
         init_ticgitng_branch(bs.include?(which_branch?))
       end
@@ -356,7 +356,7 @@ module TicGitNG
         git.lib.change_head_branch(which_branch?)
         git.with_index(@tic_index) do
           git.with_working(@tic_working) do |wd|
-            git.lib.checkout(which_branch?) if needs_checkout && 
+            git.lib.checkout(which_branch?) if needs_checkout &&
               branch_exists
             yield wd
           end

data/lib/ticgit-ng/cli.rb

@@ -78,8 +78,9 @@ module TicGitNG
       end
     end
 
-    def get_editor_message(message_file = nil)
-      message_file = Tempfile.new('ticgitng_message').path if !message_file
+    def get_editor_message(comments = nil)
+      message_file = Tempfile.new('ticgitng_message').path
+      File.open(message_file, 'w') { |f| f.puts comments } if comments
 
       editor = ENV["EDITOR"] || 'vim'
       system("#{editor} #{message_file}");

data/lib/ticgit-ng/command/comment.rb

@@ -27,7 +27,7 @@ module TicGitNG
         elsif file
           tic.ticket_comment(File.read(file), tid)
         else
-          return unless message = get_editor_message
+          return unless message = get_editor_message(tic)
           tic.ticket_comment(message.join(''), tid)
         end
       end

data/lib/ticgit-ng/command/new.rb

@@ -13,14 +13,11 @@ module TicGitNG
           ticket_show(tic.ticket_new(title, options.to_hash))
         else
           # interactive
-          message_file = Tempfile.new('ticgit_message').path
-          File.open(message_file, 'w') do |f|
-            f.puts "\n# ---"
-            f.puts "tags:"
-            f.puts "# first line will be the title of the tic, the rest will be the first comment"
-            f.puts "# if you would like to add initial tags, put them on the 'tags:' line, comma delim"
-          end
-          if message = get_editor_message(message_file)
+          comment = "\n# ---\ntags:\n"
+          comment += "# first line will be the title of the tic, the rest will be the first comment\n"
+          comment += "# if you would like to add initial tags, put them on the 'tags:' line, comma delim"
+
+          if message = get_editor_message(comment)
             title = message.shift
             if title && title.chomp.length > 0
               title = title.chomp

data/lib/ticgit-ng/ticket.rb

@@ -7,8 +7,14 @@ module TicGitNG
     attr_accessor :comments, :tags, :attachments # arrays
 
     def initialize(base, options = {})
-      options[:user_name] ||= base.git.config('user.name')
-      options[:user_email] ||= base.git.config('user.email')
+      # FIXME: what/where/who/how changed config to hash?
+      if (cfg = base.git.config).is_a? Hash
+        options[:user_name] ||= cfg["user.name"]
+        options[:user_email] ||= cfg["user.email"]
+      else
+        options[:user_name] ||= cfg("user.name")
+        options[:user_email] ||= cfg("user.email")
+      end
 
       @base = base
       @opts = options || {}

data/lib/ticgit-ng/version.rb

@@ -1,3 +1,3 @@
 module TicGitNG
-  VERSION = '1.0.1.3'
+  VERSION = '1.0.2'
 end

data/lib/ticgit-ng.rb

@@ -13,9 +13,28 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'rubygems'
 # requires git >= 1.0.5
 require 'git'
+
+#Only redefine if we are not using 1.9
+unless Config::CONFIG["ruby_version"][/^\d\.9/]
+  # FIXME: Monkeypatch git until fixed upstream
+  module Git
+    class Lib
+      def config_get(name)
+        do_get = lambda do |name|
+          command('config', ['--get', name])
+        end
+        if @git_dir
+          Dir.chdir(@git_dir, &do_get)
+        else
+          build_list.call
+        end
+      end
+    end
+  end
+end
+
 require 'ticgit-ng/base'
 require 'ticgit-ng/cli'
-
 module TicGitNG
   autoload :VERSION, 'ticgit-ng/version'
   autoload :Comment, 'ticgit-ng/comment'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: TicGit-ng
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  - 3
-  version: 1.0.1.3
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Scott Chacon
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -05:00
+date: 2011-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency