TicGit-ng 1.0.2.14 → 1.0.2.15

data/lib/ticgit-ng/attachment.rb

@@ -0,0 +1,56 @@
+module TicGitNG
+    class Attachment
+        attr_reader :user, :added, :filename, :sha, :attachment_name
+        attr_reader :original_filename
+        alias :read :initialize
+
+        def initialize( fname )
+            #FIXME expect fname to be a raw filename that needs to be converted
+            #      into a properly formatted ticket name
+            @filename=fname
+            trailing_underscore= File.basename(fname)[/_$/] ? true : false
+            trailing_underscore=false
+            temp=File.basename(fname).split('_').reverse
+            @added=Time.at(temp.pop.to_i)
+            @user= temp.pop
+            @attachment_name= temp.reverse.join('_')
+            if trailing_underscore
+              @attachment_name << '_'
+            end
+        end
+
+        #Called when attaching a new attachment and when reading/opening attachments
+        #FIXME Make a 'read' and 'create' function to differentiate between
+        #      between creation of a ticket and reading an existing ticket.
+        def self.create raw_fname, ticket, time 
+            #Attachment naming format:
+            #ticket_name/ATTACHMENTS/123456_jeff.welling@gmail.com_fubar.jpg
+            #raw_fname "/home/guy/Desktop/fubar.jpg"
+
+            #create attachment dir if first run
+            a_name= File.expand_path( File.join(
+                File.join( ticket.ticket_name, 'ATTACHMENTS' ), 
+                ticket.create_attachment_name(raw_fname, time)
+            ))
+            #create new filename from ticket
+            if File.exist?( File.dirname( a_name )  ) && 
+               !File.directory?( File.dirname(a_name) )
+
+                puts "Could not create ATTACHMENTS directory"
+                exit 1
+            elsif !File.exist?( File.dirname( a_name ) )
+                Dir.mkdir File.dirname( a_name )
+            end
+            #copy/link the raw_filename
+            Dir.chdir( File.dirname(a_name) ) do
+                FileUtils.cp( raw_fname, a_name )
+            end
+            #call init on the new file to properly populate the variables
+            a_name= File.join( 
+                              File.basename( File.dirname( a_name ) ),
+                              File.basename( a_name )
+                             )
+            return Attachment.new( a_name )
+        end
+    end
+end

data/lib/ticgit-ng/base.rb

@@ -10,6 +10,14 @@ module TicGitNG
 
     def initialize(git_dir, opts = {})
       @git = Git.open(find_repo(git_dir))
+
+      begin
+        git.lib.full_log_commits 1
+      rescue
+        puts "Git error: please check your git repository, you must have at least one commit in git"
+        exit 1
+      end
+
       @logger = opts[:logger] || Logger.new(STDOUT)
 
       #This is to accomodate for edge-cases where @logger.puts
@@ -65,6 +73,22 @@ module TicGitNG
 
       @state = File.expand_path(File.join(@tic_dir, proj, 'state'))
 
+      branches=git.lib.branches_all.map{|b|b.first}
+      unless branches.include?(which_branch?) && File.directory?(@tic_working)
+        if branches.include?(which_branch?) and !File.exist?(@tic_working)
+          #branch exists but tic_working doesn't
+          #this could be because the dir was deleted or the repo itself
+          #was moved, so recreate the dir.
+          reset_ticgitng
+        elsif @init
+          puts "Initializing TicGit-ng"
+          init_ticgitng_branch( branches.include?(which_branch?) )
+        else
+          puts "Please run `ti init` to initialize TicGit-ng for this repository before running other ti commands."
+          exit
+        end
+      end
+
       if File.file?(@state)
         load_state
       else
@@ -84,6 +108,9 @@ module TicGitNG
     # save config file
     def save_state
       state_list = [@last_tickets, @current_ticket]
+      unless File.exist? @state
+        FileUtils.mkdir_p( File.dirname(@state) )
+      end
       File.open(@state, 'w+'){|io| Marshal.dump(state_list, io) }
       File.open(@config_file, 'w+'){|io| io.write(config.to_yaml) }
     end
@@ -103,8 +130,8 @@ module TicGitNG
     end
 
     # returns new Ticket
-    def ticket_new(title, options = {})
-      t = TicGitNG::Ticket.create(self, title, options)
+    def ticket_new(title, options = {}, time=nil)
+      t = TicGitNG::Ticket.create(self, title, options, time)
       reset_ticgitng
       TicGitNG::Ticket.open(self, t.ticket_name, tickets[t.ticket_name])
     end
@@ -122,6 +149,7 @@ module TicGitNG
         ticket = TicGitNG::Ticket.open(self, t, tickets[t])
         ticket.add_comment(comment)
         reset_ticgitng
+        ticket
       end
     end
 
@@ -264,6 +292,7 @@ module TicGitNG
           ticket.add_tag(tag)
         end
         reset_ticgitng
+        ticket
       end
     end
 
@@ -273,6 +302,7 @@ module TicGitNG
           ticket = TicGitNG::Ticket.open(self, t, tickets[t])
           ticket.change_state(new_state)
           reset_ticgitng
+          ticket
         end
       end
     end
@@ -282,6 +312,7 @@ module TicGitNG
         ticket = TicGitNG::Ticket.open(self, t, tickets[t])
         ticket.change_assigned(new_assigned)
         reset_ticgitng
+        ticket
       end
     end
 
@@ -290,6 +321,7 @@ module TicGitNG
         ticket = TicGitNG::Ticket.open(self, t, tickets[t])
         ticket.change_points(new_points)
         reset_ticgitng
+        ticket
       end
     end
 
@@ -298,15 +330,10 @@ module TicGitNG
         ticket = TicGitNG::Ticket.open(self, t, tickets[t])
         @current_ticket = ticket.ticket_name
         save_state
+        ticket
       end
     end
 
-    def comment_add(ticket_id, comment, options = {})
-    end
-
-    def comment_list(ticket_id)
-    end
-
     def tic_states
       ['open', 'resolved', 'invalid', 'hold']
     end
@@ -334,30 +361,22 @@ module TicGitNG
     def read_tickets
       tickets = {}
 
-      bs = git.lib.branches_all.map{|b| b.first }
-
-      unless (bs.include?(which_branch?) || bs.include?(which_branch?))  &&
-              File.directory?(@tic_working)
-        unless @init
-          puts "Please run `ti init` to initialize TicGit-ng for this repository before running other ti commands."
-          exit
-        else
-          puts "Initializing TicGit-ng"
-          init_ticgitng_branch(
-            git.lib.branches_all.map{|b| b.first }.include?(which_branch?)
-          )
-        end
-      end
-
       tree = git.lib.full_tree(which_branch?)
       tree.each do |t|
         data, file = t.split("\t")
         mode, type, sha = data.split(" ")
         tic = file.split('/')
         if tic.size == 2  # directory depth
-          ticket, info = tic
-          tickets[ticket] ||= { 'files' => [] }
-          tickets[ticket]['files'] << [info, sha]
+            ticket, info = tic
+            tickets[ticket] ||= { 'files' => [] }
+            tickets[ticket]['files'] << [info, sha]
+        elsif tic.size == 3
+            ticket, attch_dir, filename = tic
+            if filename
+                filename = 'ATTACHMENTS_' + filename
+                tickets[ticket] ||= { 'files' => [] }
+                tickets[ticket]['files'] << [filename, sha]
+            end
         end
       end
       tickets
@@ -410,7 +429,9 @@ module TicGitNG
     def new_file(name, contents)
       File.open(name, 'w+'){|f| f.puts(contents) }
     end
+
     def which_branch?
+      #At present use the 'ticgit' branch for backwards compatibility
       branches=@git.branches.local.map {|b| b.name}
       if branches.include? 'ticgit-ng'
         return 'ticgit-ng'
@@ -436,6 +457,24 @@ module TicGitNG
     def needs_reset? cache_mtime, gitlog_mtime
       ((cache_mtime.to_i - gitlog_mtime.to_i) > 120) or ((gitlog_mtime.to_i - cache_mtime.to_i) > 120)
     end
+    
+    def ticket_attach filename, ticket_id=nil, time=nil
+        t = ticket_revparse( ticket_id )
+        ticket= TicGitNG::Ticket.open( self, t, tickets[t] )
+        ticket.add_attach( self, filename, time )
+        reset_ticgitng
+        ticket
+    end
 
+    #ticket_get_attachment()
+    #file_id -      return the attachment identified by file_id
+    #new_filename - save the attachment as new_filename
+    #ticket_id -    get the attachment from ticket_id instead of current
+    def ticket_get_attachment file_id=nil, new_filename=nil, ticket_id=nil 
+        if t = ticket_revparse(ticket_id)
+            ticket = Ticket.open( self, t, tickets[t] )
+            ticket.get_attach( file_id, new_filename )
+        end
+    end
   end
 end

data/lib/ticgit-ng/cli.rb

@@ -110,44 +110,62 @@ module TicGitNG
     end
 
     def ticket_show(t, more=nil)
-      days_ago = ((Time.now - t.opened) / (60 * 60 * 24)).round
-
-      data = [
-        ['Title',    t.title],
-        ['TicId',    t.ticket_id],
-        '',
-        ['Assigned', t.assigned],
-        ['Opened',   "#{t.opened} (#{days_ago} days)"],
-        ['State',    t.state.upcase],
-        ['Points',   t.points || 'no estimate'],
-        ['Tags',     t.tags.join(', ')],
-        ''
-      ]
-
-      data.each do |(key, value)|
-        puts(value ? "#{key}: #{value}" : key)
-      end
-
-      unless t.comments.empty?
-        puts "Comments (#{t.comments.size}):"
-        t.comments.reverse_each do |c|
-          puts "  * Added #{c.added.strftime('%m/%d %H:%M')} by #{c.user}"
-
-          wrapped = c.comment.split("\n").map{|line|
-            line.length > 80 ? line.gsub(/(.{1,80})(\s+|$)/, "\\1\n").strip : line
-          }.join("\n")
-
-          wrapped = wrapped.split("\n").map{|line| "\t#{line}" }
+        days_ago = ((Time.now - t.opened) / (60 * 60 * 24)).round
+
+        data = [
+            ['Title',    t.title],
+            ['TicId',    t.ticket_id],
+            '',
+            ['Assigned', t.assigned],
+            ['Opened',   "#{t.opened} (#{days_ago} days)"],
+            ['State',    t.state.upcase],
+            ['Points',   t.points || 'no estimate'],
+            ['Tags',     t.tags.join(', ')],
+            ''
+        ]
+
+        data.each do |(key, value)|
+            puts(value ? "#{key}: #{value}" : key)
+        end
 
-          if wrapped.size > 6 and more.nil?
-            puts wrapped[0, 6].join("\n")
-            puts "\t** more... **"
-          else
-            puts wrapped.join("\n")
-          end
-          puts
+        #FIXME display attachments inline chronologically with comments
+        unless t.comments.empty? and t.attachments.empty?
+            comments_and_attachments= Hash.new
+            puts "Comments and attachments (#{t.comments.size + t.attachments.size}):"
+            t.comments.each do |c|
+                comments_and_attachments[c.added]=c
+            end
+            
+            t.attachments.each do |a|
+                comments_and_attachments[a.added]=a
+            end
+            comments_and_attachments.sort.each {|item|
+                if item[1].class==TicGitNG::Comment
+                    #print comment
+                    puts "  * Added #{item[1].added.strftime('%m/%d %H:%M')} by #{item[1].user}"
+
+                    wrapped = item[1].comment.split("\n").map{|line|
+                        line.length > 80 ? line.gsub(/(.{1,80})(\s+|$)/, "\\1\n").strip : line
+                    }.join("\n")
+
+                    wrapped = wrapped.split("\n").map{|line| "\t#{line}" }
+
+                    if wrapped.size > 6 and more.nil?
+                        puts wrapped[0, 6].join("\n")
+                        puts "\t** more... **"
+                    else
+                        puts wrapped.join("\n")
+                    end
+                    puts
+                else
+                    #print attachment
+                    puts "  * Added #{item[1].added.strftime('%m/%d %H:%M')} by #{item[1].user}"
+                    puts "    Attachment: #{t.attachments.index(item[1]) }"
+                    puts "    Filename:   #{item[1].attachment_name}"
+                    puts
+                end
+            }
         end
-      end
     end
 
     class << self
@@ -254,4 +272,8 @@ module TicGitNG
 end
 
 TicGitNG::CLI.reset_window_width
-Signal.trap("SIGWINCH") { TicGitNG::CLI.reset_window_width }
+begin
+    Signal.trap("SIGWINCH") { TicGitNG::CLI.reset_window_width }
+rescue
+    TicGitNG::CLI.use_fallback
+end

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

@@ -0,0 +1,48 @@
+module TicGitNG
+    module Command
+        # Attach a file to a ticket
+        #
+        # Usage:
+        # ti attach                             
+        # (print help for 'ti attach')
+        #
+        # ti attach {filename}
+        # (attach {filename} to current ticket)
+        #
+        # ti attach -i {ID} {filename}          
+        # (attach file {filename} to ticket with ID {ID})
+        #
+        # ti attach -g {f_id}
+        # (retrieve attached file {f_id}, place in current dir}
+        #
+        # ti attach -g {f_id} -n {new_filename}
+        # (retrieve attached file {f_id}, place as {new_filename})
+        module Attach
+            def parser(opts)
+                opts.banner = "Usage: ti attach [options] [filename]"
+
+                opts.on_head(
+                    "-i TICKET_ID", "--id TICKET_ID", "Attach the file to this ticket"){|v|
+                    options.ticket_id = v
+                }
+                opts.on_head(
+                    "-g FILE_ID", "--get FILE_ID", "Retrieve the file FILE_ID"){|v|
+                    puts "Warning: ticket ID argument is not valid with the retrieve attachment argument" if options.ticket_id
+                    options.get_file = v
+                }
+                opts.on_head(
+                    "-n N_FILENAME", "--new-filename", "Use this filename for the retrieved attachment"){|v|
+                    raise ArgumentError, "Error: New filename argument is only valid with the retrieve arrachment argument" unless options.get_file
+                    options.new_filename = v
+                }
+            end
+            def execute
+                if options.get_file
+                    tic.ticket_get_attachment( options.get_file, options.new_filename )
+                else
+                    tic.ticket_attach( args[0], options.ticket_id )
+                end
+            end
+        end
+    end
+end

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

@@ -0,0 +1,27 @@
+module TicGitNG
+  module Command
+    # Shows help for ticgit or a particular command
+    #
+    # Usage:
+    # ti help               (show help for ticgit)
+    # ti help {command}     (show help for specified command)
+    module Help
+      def parser(opts)
+        opts.banner = "Usage: ti help [command]\n"
+      end
+      def execute
+        cli = CLI.new([])
+        if ARGV.length >= 2 # ti help {command}
+          action = ARGV[1]
+          if command = Command.get(action)
+            cli.extend(command)
+          else
+            puts "Unknown command #{action}\n\n"
+          end
+        end
+        puts cli.usage
+      end
+    end
+  end
+end
+

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

@@ -6,7 +6,7 @@ module TicGitNG
         o.banner = "Usage: ti list [options]"
         o.on_head(
           "-o ORDER", "--order ORDER",
-          "Field to order by - one of : assigned,state,date,title"){|v|
+          "Field to order by - one of : assigned,state,date,title [.desc for reverse order]"){|v|
           options.order = v
         }
 

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

@@ -13,17 +13,14 @@ module TicGitNG
           puts 'remove'
         end
 
-        if ARGV.size > 3
-          tid = ARGV[1].chomp
-          tic.ticket_tag(ARGV[3].chomp, tid, options)
-        elsif ARGV.size > 2 #tag 
-          tic.ticket_tag(ARGV[2], nil, options)
-				elsif ARGV.size == 2 #tag add 'tag_foobar'
-					tic.ticket_tag(ARGV[1], nil, options)
+        if ARGV.size > 2 # `ti tag 1234abc tagname1`
+          tic.ticket_tag(ARGV[2], ARGV[1].chomp, options)
+        elsif ARGV.size == 2 # `ti tag tagname1`
+          tic.ticket_tag(ARGV[1], nil, options)
         else
           puts 'You need to at least specify one tag to add'
           puts
-          puts parser
+          puts usage
         end
       end
     end

data/lib/ticgit-ng/command.rb

@@ -13,8 +13,9 @@ module TicGitNG
     register 'Attach', 'Attach file to ticket', 'attach'
     register 'Checkout', 'Checkout a ticket', 'checkout', 'co'
     register 'Comment', 'Comment on a ticket', 'comment'
+    register 'Help', 'Show help for a ticgit command', 'help'
     register 'List', 'List tickets', 'list'
-    register 'Milestone', 'List and modify milestones', 'milestone'
+#    register 'Milestone', 'List and modify milestones', 'milestone'
     register 'New', 'Create a new ticket', 'new'
     register 'Points', 'Assign points to a ticket', 'points'
     register 'Recent', 'List recent activities', 'recent'

data/lib/ticgit-ng/comment.rb

@@ -1,17 +1,19 @@
 module TicGitNG
   class Comment
+    attr_accessor :base, :user, :added, :comment
 
-    attr_reader :base, :user, :added, :comment
-
-    def initialize(base, file_name, sha)
-      @base = base
-      @comment = base.git.gblob(sha).contents rescue nil
+    def initialize( c, user, time=nil )
+      raise unless c
+      @comment= c
+      @user=user
+      @added= time.nil? ? Time.now : time
+      self
+    end
 
+    def self.read( base, file_name, sha )
       type, date, user = file_name.split('_')
 
-      @added = Time.at(date.to_i)
-      @user = user
+      new( (base.git.gblob(sha).contents rescue nil), user, Time.at(date.to_i) )
     end
-
   end
 end

data/lib/ticgit-ng/ticket.rb

@@ -25,10 +25,10 @@ module TicGitNG
       @attachments = []
     end
 
-    def self.create(base, title, options = {})
+    def self.create(base, title, options = {}, time=nil)
       t = Ticket.new(base, options)
       t.title = title
-      t.ticket_name = self.create_ticket_name(title)
+      t.ticket_name = self.create_ticket_name(title, time)
       t.save_new
       t
     end
@@ -42,39 +42,46 @@ module TicGitNG
       title, date = self.parse_ticket_name(ticket_name)
       t.opened = date
 
-      ticket_hash['files'].each do |fname, value|
+      ticket_hash['files'].each do |fname, sha|
         if fname == 'TICKET_ID'
-          tid = value
+          tid = sha
         elsif fname == 'TICKET_TITLE'
-          t.title = base.git.gblob(value).contents
+          t.title = base.git.gblob(sha).contents
         else
           # matching
           data = fname.split('_')
 
           case data[0]
           when 'ASSIGNED'
-            t.assigned = data[1]
-          when 'ATTACHMENT'
-            t.attachments << TicGitNG::Attachment.new(base, fname, value)
+            t.assigned = data[1..-1].join('_')
+          when 'ATTACHMENTS'
+              #Attachments dir naming format:
+              #ticket_name/ATTACHMENTS/123456_jeff.welling@gmail.com_fubar.jpg
+              #data[] format:
+              #"ATTACHMENTS_1342116799_jeff.welling@gmail.com_Rakefile".split('_')
+            filename=File.join( 'ATTACHMENTS', fname.gsub(/^ATTACHMENTS_/,'') )
+            t.attachments << TicGitNG::Attachment.new( filename )
           when 'COMMENT'
-            t.comments << TicGitNG::Comment.new(base, fname, value)
+            t.comments << TicGitNG::Comment.read(base, fname, sha)
           when 'POINTS'
-            t.points = base.git.gblob(value).contents.to_i
+            t.points = base.git.gblob(sha).contents.to_i
           when 'STATE'
             t.state = data[1]
           when 'TAG'
             t.tags << data[1]
           when 'TITLE'
-            t.title = base.git.gblob(value).contents
+            t.title = base.git.gblob(sha).contents
           end
         end
       end
 
+      if !t.attachments.class==NilClass and t.attachments.size > 1
+          t.attachments= t.attachments.sort {|a1, a2| a1.added <=> a2.added }
+      end
       t.ticket_id = tid
       t
     end
 
-
     def self.parse_ticket_name(name)
       epoch, title, rand = name.split('_')
       title = title.gsub('-', ' ')
@@ -144,6 +151,89 @@ module TicGitNG
         base.git.add File.join(ticket_name, t)
         base.git.commit("added comment to ticket #{ticket_name}")
       end
+      @comments << TicGitNG::Comment.new( comment, email )
+      self
+    end
+
+    def add_attach( base, filename, time=nil )
+        filename=File.expand_path(filename)
+        #FIXME Refactor -- Attachment.new should be called from Ticket.rb
+        #               -- Attachment filename creation should be handled
+        #                  by the Attachment.rb code
+        base.in_branch do |wd|
+            attachments << (a=TicGitNG::Attachment.create( filename, self, time))
+            base.git.add File.join( ticket_name, a.filename )
+            base.git.commit("added attachment #{File.basename(a.filename)} to ticket #{ticket_name}")
+        end
+        if attachments.class!=NilClass and attachments.size > 1
+            @attachments=attachments.sort {|a1,a2| a1.added <=> a2.added }
+        end
+        self
+    end
+
+    #file_id can be one of:
+    #  - An index number of the attachment (1,2,3,...)
+    #  - A filename (fubar.jpg)
+    #  - nil (nil) means use the last attachment
+    #
+    #if new_filename is nil, use existing filename
+    def get_attach file_id=nil, new_filename=nil
+        attachment=nil
+        pwd=Dir.pwd
+        base.in_branch do |wd|
+            if file_id.to_i==0 and (file_id=="0" or file_id.class==Fixnum)
+                if !attachments[file_id.to_i].nil?
+                    attachment= attachments[0]
+                else
+                    puts "No attachments match file id #{file_id}"
+                    exit 1
+                end
+            elsif file_id.to_i  > 0
+                if !attachments[file_id.to_i].nil?
+                    attachment= attachments[file_id.to_i]
+                else
+                    puts "No attachments match file id #{file_id}"
+                    exit 1
+                end
+            else
+                #find attachment by filename
+                attachments.each {|a|
+                    attachment=a if a.attachment_name==file_id
+                }
+                if attachment.nil?
+                  puts "No attachments match filename #{file_id}"
+                  exit 1
+                end
+            end
+
+            if !new_filename
+                #if no filename is specified...
+                filename= attachment.attachment_name
+            else
+                #if there is a new_filename given
+                if File.exist?( new_filename ) and File.directory?( new_filename )
+                    #if it is a directory, not a filename
+                    filename= File.join(
+                        new_filename,
+                        File.basename(attachment.attachment_name)
+                    )
+                else
+                    #if it is a filename, not a dir
+                    filename= new_filename
+                end
+            end
+
+            unless File.exist?( File.dirname(filename) )
+                FileUtils.mkdir_p( File.dirname(filename) )
+            end
+            #save attachment [as new_filename]
+            t=File.join( ticket_name, attachment.filename )
+            unless filename[/^\//]
+                filename=File.join( pwd, filename )
+            end
+            FileUtils.cp( t, filename )
+        end
+        self
     end
 
     def change_state(new_state)
@@ -159,6 +249,8 @@ module TicGitNG
         base.git.add File.join(ticket_name, t)
         base.git.commit("added state (#{new_state}) to ticket #{ticket_name}")
       end
+      @state=new_state
+      self
     end
 
     def change_assigned(new_assigned)
@@ -175,6 +267,8 @@ module TicGitNG
         base.git.add File.join(ticket_name,t)
         base.git.commit("assigned #{new_assigned} to ticket #{ticket_name}")
       end
+      @assigned=new_assigned
+      self
     end
 
     def change_points(new_points)
@@ -187,6 +281,8 @@ module TicGitNG
         base.git.add File.join(ticket_name, 'POINTS')
         base.git.commit("set points to #{new_points} for ticket #{ticket_name}")
       end
+      @points=new_points
+      self
     end
 
     def add_tag(tag)
@@ -214,6 +310,10 @@ module TicGitNG
           base.git.commit("added tags (#{tag}) to ticket #{ticket_name}")
         end
       end
+      tags.each {|tag|
+        @tags << tag
+      }
+      self
     end
 
     def remove_tag(tag)
@@ -232,6 +332,8 @@ module TicGitNG
           base.git.commit("removed tags (#{tag}) from ticket #{ticket_name}")
         end
       end
+      @tags.delete_if {|t| t==tag }
+      self
     end
 
     def path
@@ -250,10 +352,29 @@ module TicGitNG
       assigned.split('@').first rescue ''
     end
 
-    def self.create_ticket_name(title)
-      [Time.now.to_i.to_s, Ticket.clean_string(title), rand(999).to_i.to_s].join('_')
+    def self.create_ticket_name(title, time=nil)
+      [time.nil? ? Time.now.to_i.to_s : time, Ticket.clean_string(title), rand(999).to_i.to_s].join('_')
     end
 
-
+    def create_attachment_name( attachment_name, time=nil )
+        raise ArgumentError, "create_attachment_name( ) only takes a string" unless attachment_name.class==String
+        if time
+            if time.to_i == 0
+                raise ArgumentError, "argument 'time' is not valid"  unless time.class==Fixnum
+            else
+                time=time.to_i
+            end
+        end
+        time or time=Time.now.to_i
+        time.to_s+'_'+email+'_'+File.basename( attachment_name )
+    end
+    def ==(ticket2)
+        self.instance_variables.each {|instance_var|
+            unless send( instance_var.gsub('@','').to_sym ) == ticket2.instance_eval {send(instance_var.gsub('@','').to_sym)}
+                return false
+            end
+        }
+        return true
+    end
   end
 end

data/lib/ticgit-ng/version.rb

@@ -1,3 +1,3 @@
 module TicGitNG
-  VERSION = '1.0.2.14'
+  VERSION = '1.0.2.15'
 end

data/lib/ticgit-ng.rb

@@ -4,6 +4,7 @@ require 'optparse'
 require 'ostruct'
 require 'set'
 require 'yaml'
+require 'pp'
 
 # Add the directory containing this file to the start of the load path if it
 # isn't there already.
@@ -15,12 +16,12 @@ require 'rubygems'
 require 'git'
 
 #Only redefine if we are not using 1.9
-unless Config::CONFIG["ruby_version"][/^\d\.9/]
+unless (defined?(RbConfig) ? RbConfig : 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|
+        do_get = lambda do |x|
           command('config', ['--get', name])
         end
         if @git_dir
@@ -35,6 +36,7 @@ end
 
 require 'ticgit-ng/base'
 require 'ticgit-ng/cli'
+require 'ticgit-ng/attachment'
 module TicGitNG
   autoload :VERSION, 'ticgit-ng/version'
   autoload :Comment, 'ticgit-ng/comment'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: TicGit-ng
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 73
   prerelease: 
   segments: 
   - 1
   - 0
   - 2
-  - 14
-  version: 1.0.2.14
+  - 15
+  version: 1.0.2.15
 platform: ruby
 authors: 
 - Scott Chacon
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 Z
+date: 2012-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: git
@@ -58,28 +58,31 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/ti
 - bin/ticgitweb
+- bin/ti
 - lib/ticgit-ng.rb
-- lib/ticgit-ng/comment.rb
 - lib/ticgit-ng/cli.rb
-- lib/ticgit-ng/command/new.rb
-- lib/ticgit-ng/command/comment.rb
-- lib/ticgit-ng/command/show.rb
-- lib/ticgit-ng/command/init.rb
+- lib/ticgit-ng/attachment.rb
+- lib/ticgit-ng/command/milestone.rb
+- lib/ticgit-ng/command/checkout.rb
 - lib/ticgit-ng/command/state.rb
 - lib/ticgit-ng/command/list.rb
+- lib/ticgit-ng/command/assign.rb
 - lib/ticgit-ng/command/sync.rb
-- lib/ticgit-ng/command/recent.rb
+- lib/ticgit-ng/command/comment.rb
 - lib/ticgit-ng/command/points.rb
-- lib/ticgit-ng/command/assign.rb
-- lib/ticgit-ng/command/milestone.rb
 - lib/ticgit-ng/command/tag.rb
-- lib/ticgit-ng/command/checkout.rb
+- lib/ticgit-ng/command/show.rb
+- lib/ticgit-ng/command/help.rb
+- lib/ticgit-ng/command/recent.rb
+- lib/ticgit-ng/command/attach.rb
+- lib/ticgit-ng/command/init.rb
+- lib/ticgit-ng/command/new.rb
+- lib/ticgit-ng/comment.rb
 - lib/ticgit-ng/version.rb
+- lib/ticgit-ng/ticket.rb
 - lib/ticgit-ng/command.rb
 - lib/ticgit-ng/base.rb
-- lib/ticgit-ng/ticket.rb
 - LICENSE_MIT
 - LICENSE_GPL
 - README.mkd
@@ -112,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ticgit-ng
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Git based distributed ticketing system