TicGit-ng 1.0.2.4 → 1.0.2.5

data/README.mkd

@@ -29,13 +29,9 @@ Required Ruby Gems: git
 
 To install these packages on a Debian system, or a Debian based system like Ubuntu, do
 
-    sudo apt-get install git ruby rubygems
+    sudo aptitude install git ruby rubygems
     sudo gem install git
 
-After installing Gems it is necessary to update the PATH environment variable so that the scripts can be found. Issue the following command to the end of your .bachrc file or equivalent.
-
-    PATH=$PATH:/var/lib/gems/1.8/bin
-
 **ticgitweb**
 
 Required Packages: git, ruby, rubygems
@@ -44,9 +40,11 @@ Required Ruby Gems: git, sinatra, haml, sass
 
 To install these packages on a Debian system, or a Debian based system like Ubuntu, do
 
-    sudo apt-get install git ruby rubygems
-    sudo gem install git sinatra haml
-    sudo gem install sass --pre
+    sudo aptitude install git ruby rubygems
+    sudo gem install git sinatra haml sass
+
+
+
 
 **A Note about rubygems**
 
@@ -62,22 +60,19 @@ The git gem requires a git version of 1.6.0.0 or later, but on Debian stable, gi
 
 If these annoy you as they do me and you've set up [apt](http://jaqque.sbih.org/kplug/apt-pinning.html) [pinning](http://jeffwelling.github.com//2010/09/05/Apt-Pinning.html), you can do
 
-    sudo apt-get -t testing install git-core
+    $ sudo aptitude -t testing install git-core
 
 And those notices should go away.
 
-**A Note about Ubuntu**
 
-NB At the time of writing (Ver 1.0.2.3) there are additional problems with TigGitWeb Ubuntu. The workaround is to add `/var/lib/gems/1.8/gems/TicGit-ng-1.0.2.3/bin` to start of PATH. viz
 
-    PATH=/var/lib/gems/1.8/gems/TicGit-ng-1.0.2.3/bin:$PATH
 
 ### Installing ##
 Installation on a Debian stable system.  Note that the command line interface for TicGit-ng can be run from Debian stable, but some of the gems required for the web interface may require you to use [apt](http://jaqque.sbih.org/kplug/apt-pinning.html) [pinning](http://jeffwelling.github.com//2010/09/05/Apt-Pinning.html) to run without errors.  See below
 
 To install TicGit-ng on your system, you can go one of two ways,
 
-    $ sudo gem install TicGit-ng
+    $ gem install TicGit-ng
 
 or, you can install it from source by downloading this repository building your own gem (see below).
 

data/lib/ticgit-ng/base.rb

@@ -206,11 +206,9 @@ module TicGitNG
       if ticket_id
         ticket_id = ticket_id.strip
 
-        if /^[0-9]*$/ =~ ticket_id
-          if t = @last_tickets[ticket_id.to_i - 1]
-           return t
-          end
-        else # partial or full sha
+        if /^[0-9]*$/ =~ ticket_id && (t = @last_tickets[ticket_id.to_i - 1])
+          return t
+        elsif ticket_id.length > 4 # partial (5 characters or greater to be considered unique enough) or full sha
           regex = /^#{Regexp.escape(ticket_id)}/
           ch = tickets.select{|name, t|
             t['files'].assoc('TICKET_ID')[1] =~ regex }

data/lib/ticgit-ng/cli.rb

@@ -20,10 +20,10 @@ module TicGitNG
     attr_accessor :out
 
     def initialize(args, path = '.', out = $stdout)
-      @out = out
       @args = args.dup
       @tic = TicGitNG.open(path, :keep_state => true)
       @options = OpenStruct.new
+      @out = out
 
       @out.sync = true # so that Net::SSH prompts show up
     rescue NoRepoFound

data/lib/ticgit-ng/command.rb

@@ -9,7 +9,7 @@ module TicGitNG
       commands.each{|cmd| COMMANDS[cmd] = mod_name }
     end
 
-    register 'Assign', 'Assigns a ticket to someone', 'assign'
+    register 'Assign', 'Assings a ticket to someone', 'assign'
     register 'Attach', 'Attach file to ticket', 'attach'
     register 'Checkout', 'Checkout a ticket', 'checkout', 'co'
     register 'Comment', 'Comment on a ticket', 'comment'
@@ -40,7 +40,10 @@ module TicGitNG
       o.top.append ' ', nil, nil
       o.top.append 'The available ticgit commands are:', nil, nil
 
-      DOC.each do |commands, doc|
+      sorted_doc = DOC.sort_by do |cmds, doc|
+        cmds.sort_by{|cmd| cmd.size }.last
+      end
+      sorted_doc.each do |commands, doc|
         # get the longest version
         command = commands.sort_by{|cmd| cmd.size }.last
         o.top.append("    %-32s %s" % [command, doc], nil, nil)

data/lib/ticgit-ng/ticket.rb_

@@ -0,0 +1,258 @@
+module TicGitNG
+  class Ticket
+
+    attr_reader :base, :opts
+    attr_accessor :ticket_id, :ticket_name
+    attr_accessor :title, :state, :milestone, :assigned, :opened, :points
+    attr_accessor :comments, :tags, :attachments # arrays
+
+    def initialize(base, options = {})
+      # 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 || {}
+
+      @state = 'open' # by default
+      @comments = []
+      @tags = []
+      @attachments = []
+    end
+
+    def self.create(base, title, options = {})
+      t = Ticket.new(base, options)
+      t.title = title
+      t.ticket_name = self.create_ticket_name(title)
+      t.save_new
+      t
+    end
+
+    def self.open(base, ticket_name, ticket_hash, options = {})
+      tid = nil
+
+      t = Ticket.new(base, options)
+      t.ticket_name = ticket_name
+
+      title, date = self.parse_ticket_name(ticket_name)
+      t.opened = date
+
+      ticket_hash['files'].each do |fname, value|
+        if fname == 'TICKET_ID'
+          tid = value
+        elsif fname == 'TICKET_TITLE'
+          t.title = base.git.gblob(value).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)
+          when 'COMMENT'
+            t.comments << TicGitNG::Comment.new(base, fname, value)
+          when 'POINTS'
+            t.points = base.git.gblob(value).contents.to_i
+          when 'STATE'
+            t.state = data[1]
+          when 'TAG'
+            t.tags << data[1]
+          when 'TITLE'
+            t.title = base.git.gblob(value).contents
+          end
+        end
+      end
+
+      t.ticket_id = tid
+      t
+    end
+
+
+    def self.parse_ticket_name(name)
+      epoch, title, rand = name.split('_')
+      title = title.gsub('-', ' ')
+      return [title, Time.at(epoch.to_i)]
+    end
+
+    # write this ticket to the git database
+    def save_new
+      base.in_branch do |wd|
+        files=[]
+        t=nil
+        base.logger.info "saving #{ticket_name}"
+
+        Dir.mkdir(ticket_name)
+        Dir.chdir(ticket_name) do
+          base.new_file('TICKET_ID', ticket_name)
+          files << File.join( ticket_name, 'TICKET_ID' )
+          base.new_file('TICKET_TITLE', title)
+          files << File.join( ticket_name, 'TICKET_TITLE' )
+          base.new_file( (t='ASSIGNED_'+email) , email)
+          files << File.join( ticket_name, t )
+          base.new_file( (t='STATE_'+state) , state)
+          files << File.join( ticket_name, t )
+          base.new_file('TITLE', title)
+          files << File.join( ticket_name, 'TITLE' )
+
+          # add initial comment
+          #COMMENT_080315060503045__schacon_at_gmail
+          if opts[:comment]
+            base.new_file(t=comment_name(email), opts[:comment])
+            files << File.join( ticket_name, t )
+          end
+
+          # add initial tags
+          if opts[:tags] && opts[:tags].size > 0
+            opts[:tags] = opts[:tags].map { |t| t.strip }.compact
+            opts[:tags].each do |tag|
+              if tag.size > 0
+                tag_filename = 'TAG_' + Ticket.clean_string(tag)
+                if !File.exists?(tag_filename)
+                  base.new_file(tag_filename, tag_filename)
+                  files << File.join( ticket_name, tag_filename )
+                end
+              end
+            end
+          end
+        end
+        files.each {|file|
+          base.git.add file
+        }
+        base.git.commit("added ticket #{ticket_name}")
+      end
+      # ticket_id
+    end
+
+    def self.clean_string(string)
+      string.downcase.gsub(/[^a-z0-9]+/i, '-')
+    end
+
+    def add_comment(comment)
+      return false if !comment
+      base.in_branch do |wd|
+        t=nil
+        Dir.chdir(ticket_name) do
+          base.new_file(t=comment_name(email), comment)
+        end
+        base.git.add File.join(ticket_name, t)
+        base.git.commit("added comment to ticket #{ticket_name}")
+      end
+    end
+
+    def change_state(new_state)
+      return false if !new_state
+      return false if new_state == state
+
+      base.in_branch do |wd|
+        Dir.chdir(ticket_name) do
+          base.new_file(t='STATE_' + new_state, new_state)
+        end
+        base.git.remove(File.join(ticket_name,'STATE_' + state))
+        base.git.add File.join(ticket_name, t)
+        base.git.commit("added state (#{new_state}) to ticket #{ticket_name}")
+      end
+    end
+
+    def change_assigned(new_assigned)
+      new_assigned ||= email
+      old_assigned= assigned || ''
+      return false if new_assigned == old_assigned
+
+      base.in_branch do |wd|
+        t=nil
+        Dir.chdir(ticket_name) do
+          base.new_file(t='ASSIGNED_' + new_assigned, new_assigned)
+        end
+        base.git.remove(File.join(ticket_name,'ASSIGNED_' + old_assigned))
+        base.git.add File.join(ticket_name,t)
+        base.git.commit("assigned #{new_assigned} to ticket #{ticket_name}")
+      end
+    end
+
+    def change_points(new_points)
+      return false if new_points == points
+
+      base.in_branch do |wd|
+        Dir.chdir(ticket_name) do
+          base.new_file('POINTS', new_points)
+        end
+        base.git.add File.join(ticket_name, 'POINTS')
+        base.git.commit("set points to #{new_points} for ticket #{ticket_name}")
+      end
+    end
+
+    def add_tag(tag)
+      return false if !tag
+      files=[]
+      added = false
+      tags = tag.split(',').map { |t| t.strip }
+      base.in_branch do |wd|
+        Dir.chdir(ticket_name) do
+          tags.each do |add_tag|
+            if add_tag.size > 0
+              tag_filename = 'TAG_' + Ticket.clean_string(add_tag)
+              if !File.exists?(tag_filename)
+                base.new_file(tag_filename, tag_filename)
+                files << File.join( ticket_name, tag_filename )
+                added = true
+              end
+            end
+          end
+        end
+        if added
+          files.each {|file|
+            base.git.add file
+          }
+          base.git.commit("added tags (#{tag}) to ticket #{ticket_name}")
+        end
+      end
+    end
+
+    def remove_tag(tag)
+      return false if !tag
+      removed = false
+      tags = tag.split(',').map { |t| t.strip }
+      base.in_branch do |wd|
+        tags.each do |add_tag|
+          tag_filename = File.join(ticket_name, 'TAG_' + Ticket.clean_string(add_tag))
+          if File.exists?(tag_filename)
+            base.git.remove(tag_filename)
+            removed = true
+          end
+        end
+        if removed
+          base.git.commit("removed tags (#{tag}) from ticket #{ticket_name}")
+        end
+      end
+    end
+
+    def path
+      File.join(state, ticket_name)
+    end
+
+    def comment_name(email)
+      'COMMENT_' + Time.now.to_i.to_s + '_' + email
+    end
+
+    def email
+      opts[:user_email] || 'anon'
+    end
+
+    def assigned_name
+      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('_')
+    end
+
+
+  end
+end

data/lib/ticgit-ng/version.rb

@@ -1,3 +1,3 @@
 module TicGitNG
-  VERSION = '1.0.2.4'
+  VERSION = '1.0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: TicGit-ng
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: false
   segments: 
   - 1
   - 0
   - 2
-  - 4
-  version: 1.0.2.4
+  - 5
+  version: 1.0.2.5
 platform: ruby
 authors: 
 - Scott Chacon
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -04:00
+date: 2011-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,10 +61,10 @@ extra_rdoc_files: []
 files: 
 - bin/ti
 - bin/ticgitweb
-- lib/ticgit-ng.rb_
 - lib/ticgit-ng.rb
 - lib/ticgit-ng/base.rb
 - lib/ticgit-ng/ticket.rb
+- lib/ticgit-ng/ticket.rb_
 - lib/ticgit-ng/cli.rb
 - lib/ticgit-ng/version.rb
 - lib/ticgit-ng/command/assign.rb

data/lib/ticgit-ng.rb_

@@ -1,35 +0,0 @@
-require 'fileutils'
-require 'logger'
-require 'optparse'
-require 'ostruct'
-require 'set'
-require 'yaml'
-
-# Add the directory containing this file to the start of the load path if it
-# isn't there already.
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'rubygems'
-# requires git >= 1.0.5
-require 'git'
-require 'ticgit-ng/base'
-require 'ticgit-ng/cli'
-
-module TicGitNG
-  autoload :VERSION, 'ticgit-ng/version'
-  autoload :Comment, 'ticgit-ng/comment'
-  autoload :Ticket, 'ticgit-ng/ticket'
-
-  # options
-  #   :logger => Logger.new(STDOUT)
-  def self.open(git_dir, options = {})
-    Base.new(git_dir, options)
-  end
-
-  class OpenStruct < ::OpenStruct
-    def to_hash
-      @table.dup
-    end
-  end
-end