@@ -15,9 +15,11 @@ module TicGit @git = Git.open(git_dir) @logger = opts[:logger] || Logger.new(STDOUT) + proj = Ticket.clean_string(@git.dir.path) + @tic_dir = opts[:tic_dir] || '~/.ticgit' - @tic_working = opts[:working_directory] || File.expand_path(File.join(@tic_dir, 'working')) - @tic_index = opts[:index_file] || File.expand_path(File.join(@tic_dir, 'index')) + @tic_working = opts[:working_directory] || File.expand_path(File.join(@tic_dir, proj, 'working')) + @tic_index = opts[:index_file] || File.expand_path(File.join(@tic_dir, proj, 'index')) # load config file @config_file = File.expand_path(File.join(@tic_dir, 'config.yml')) @@ -27,7 +29,7 @@ module TicGit @config = {} end - @state = File.expand_path(File.join(@tic_dir, 'state')) + @state = File.expand_path(File.join(@tic_dir, proj, 'state')) if File.exists?(@state) load_state @@ -217,7 +219,7 @@ module TicGit @tickets = {} bs = git.lib.branches_all.map { |b| b[0] } - init_ticgit_branch if !bs.include?('ticgit') + init_ticgit_branch if !(bs.include?('ticgit') && File.directory?(@tic_working)) tree = git.lib.full_tree('ticgit') tree.each do |t| @@ -235,7 +237,7 @@ module TicGit def init_ticgit_branch puts 'creating ticgit repo branch' - in_branch do + in_branch(true) do new_file('.hold', 'hold') git.add git.commit('creating the ticgit branch') @@ -243,7 +245,7 @@ module TicGit end # temporarlily switches to ticgit branch for tic work - def in_branch + def in_branch(no_checkout = false) needs_checkout = false if !File.directory?(@tic_working) FileUtils.mkdir_p(@tic_working) @@ -255,7 +257,7 @@ module TicGit git.lib.change_head_branch('ticgit') git.with_index(@tic_index) do git.with_working(@tic_working) do |wd| - git.lib.checkout('ticgit') if needs_checkout + git.lib.checkout('ticgit') if needs_checkout && !no_checkout yield wd end end lib/ticgit/base.rb @@ -277,7 +277,7 @@ module TicGit tags = tags.split(',').map { |t| t.strip } end if message.size > 0 - comment = message.join("\n") + comment = message.join("") end ticket_show(@tic.ticket_new(title, :comment => comment, :tags => tags)) else lib/ticgit/cli.rb @@ -65,8 +65,8 @@ module TicGit def self.parse_ticket_name(name) - epoch, title, rand = name.split('-') - title = title.gsub('_', ' ') + epoch, title, rand = name.split('_') + title = title.gsub('-', ' ') return [title, Time.at(epoch.to_i)] end @@ -190,7 +190,7 @@ module TicGit end def self.create_ticket_name(title) - [Time.now.to_i.to_s, Ticket.clean_string(title), rand(999).to_i.to_s].join('-') + [Time.now.to_i.to_s, Ticket.clean_string(title), rand(999).to_i.to_s].join('_') end lib/ticgit/ticket.rb @@ -1,5 +1,17 @@ +link to another ticket (child tickets) -Recent (use git-log) +Merge + +link to a git object + +Web UI + +TicGit goes up directories until it finds .git dir + +Ticket +- remove ticket ( git.remove(ticket_dir, :recursive => true) ) + +Color Output + Paging long results Attachments - add @@ -7,19 +19,9 @@ Attachments Milestones -Merge - Tags * show all tags * rename tag * delete tag * tag multiple tics - -Ticket - - remove ticket ( git.remove(ticket_dir, :recursive => true) ) - -Color Output + Paging long results - -TicGit goes up directories until it finds .git dir - -Web UI \ No newline at end of file + \ No newline at end of file note/TODO c1c340747343f104046ab8b6a2c5eab38625169c Scott Chacon schacon@gmail.com http://github.com/schacon/ticgit/commit/083e620ade8b05402a63d1026692dcf1286eaffd 083e620ade8b05402a63d1026692dcf1286eaffd 2008-03-22T10:30:29-07:00 2008-03-22T10:30:29-07:00 added multiple project support 01e3873c8614a60931e6a9f8925dbc3d94b6a54f Scott Chacon schacon@gmail.com