TicGit-ng 1.0.2.11 → 1.0.2.12

data/lib/ticgit-ng/base.rb

@@ -10,6 +10,19 @@ module TicGitNG
 
     def initialize(git_dir, opts = {})
       @git = Git.open(find_repo(git_dir))
+      @logger = opts[:logger] || Logger.new(STDOUT)
+
+      #This is to accomodate for edge-cases where @logger.puts
+      #is called from debugging code.
+      unless @logger.respond_to?(:puts)
+        def @logger.puts str
+          self.info str
+        end
+      end
+         
+      @last_tickets = []
+      @init=opts[:init]
+
       proj = Ticket.clean_string(@git.dir.path)
 
       @tic_dir = opts[:tic_dir] || "~/.#{which_branch?}"
@@ -19,15 +32,23 @@ module TicGitNG
       @logger = opts[:logger] || Logger.new(STDOUT)
       @last_tickets = []
 
-      #expire @tic_index and @tic_working if it mtime is older than git log
+      #expire @tic_index and @tic_working if it mtime is older than 
+      #git log.  Otherwise, during testing, if you use the same temp
+      #directory with the same name, deleting it and recreating it
+      #to test something, ticgit would get confused by the cache from
+      #the previous instance of the temp dir.
       if File.exist?(@tic_working)
         cache_mtime=File.mtime(@tic_working)
-        gitlog_mtime=git.gblob(which_branch?).log(1).map {|l| l.committer.date }[0]
+        (gitlog_mtime=git.gblob(which_branch?).log(1).map {|l| l.committer.date }[0]) rescue reset_cache
+
         #unless (cache_mtime > gitlog_mtime.-(20) and cache_mtime <= gitlog_mtime) or (cache_mtime > gitlog_mtime.+(30) and cache_mtime >= gitlog_mtime)
-        if ((cache_mtime.to_i - gitlog_mtime.to_i) > 120) or ((gitlog_mtime.to_i - cache_mtime.to_i) > 120)
-          puts "Resetting cache"
-          reset_cache unless cache_mtime==gitlog_mtime
+        #FIXME break logic out into several lines
+        #FIXME don't bother resetting if gitlog_mtime.to_i == 0
+        if needs_reset?( cache_mtime, gitlog_mtime ) and !cache_mtime==gitlog_mtime
+          puts "Resetting cache" unless gitlog_mtime.to_i == 0
+          reset_cache
         end
+
       end
 
       # load config file
@@ -313,7 +334,15 @@ module TicGitNG
 
       unless (bs.include?(which_branch?) || bs.include?(which_branch?))  &&
               File.directory?(@tic_working)
-        init_ticgitng_branch(bs.include?(which_branch?))
+        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?)
@@ -331,7 +360,7 @@ module TicGitNG
     end
 
     def init_ticgitng_branch(ticgitng_branch = false)
-      @logger.info 'creating ticgit-ng repo branch'
+      @logger << 'creating ticgit-ng repo branch'
 
       in_branch(ticgitng_branch) do
         #The .hold file seems to have little to no purpose aside from helping
@@ -390,11 +419,18 @@ module TicGitNG
 
     def reset_cache
       #@state, @tic_index, @tic_working
+      #A rescue is appended to the end of each line because it allows
+      #execution of others to continue upon failure, as opposed to
+      #a begin;rescue;end segment.
+      FileUtils.rm_r File.expand_path(@tic_working) rescue nil
       FileUtils.rm File.expand_path(@state) rescue nil
       FileUtils.rm File.expand_path(@tic_index) rescue nil
-      FileUtils.rm_r File.expand_path(@tic_working) rescue nil
+      FileUtils.mkdir_p File.expand_path(@tic_working) rescue nil
       @state=nil
-      FileUtils.mkdir_p File.expand_path(@tic_working)
+    end
+
+    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
 
   end

data/lib/ticgit-ng/cli.rb

@@ -21,13 +21,23 @@ module TicGitNG
 
     def initialize(args, path = '.', out = $stdout)
       @args = args.dup
-      @tic = TicGitNG.open(path, :keep_state => true)
+
+      #set @init if one of the args is 'init'
+      #this needs to be done because initialization of the ticgit branch must be done before
+      #the branch is loaded, but because of the way commands are modularized this must be done
+      #outside of and before the init.rb file itself is called (init.rb is where we would
+      #normally put the code for such a command).
+      args.include?( 'init' ) ? (@init=true) : (@init=false)
+      #@init= ((args[0][/init/]=='init') rescue false)
+      #@init= ((args[0][/init/]=='init') or (args[1][/init/]=='init') rescue false)
+      
+      @tic = TicGitNG.open(path, {:keep_state => true, :init => @init, :logger  => out })
       @options = OpenStruct.new
       @out = out
 
       @out.sync = true # so that Net::SSH prompts show up
     rescue NoRepoFound
-      puts "No repo found"
+      out.puts "No repo found"
       exit
     end
 
@@ -64,7 +74,13 @@ module TicGitNG
         exit 1
       end
 
-      @action = args.shift
+      #FIXME
+      #this is a dirty hack that needs to be fixed
+      if args.include?('list') and args.include?('init')
+        @action = 'list'
+      else
+        @action = args.shift
+      end
     end
 
     def usage(args = nil)

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

@@ -10,7 +10,8 @@ module TicGitNG
     # ti assign -u {name} {1} (assign specified ticket to specified user)
     module Assign
       def parser(opts)
-        opts.banner = "Usage: ti assign [options] [ticket_id]"
+        opts.banner = "Usage: ti assign [options] [ticket_id]\n"+
+                      "Note: to assign to nobody: ti assign -u ''"
         opts.on_head(
           "-u USER", "--user USER", "Assign the ticket to this user"){|v|
           options.user = v

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

@@ -0,0 +1,20 @@
+module TicGitNG
+  module Command
+    module Init
+      def parser o
+        o.banner= "Usage: ti init"
+      end
+      def execute
+        @tic.read_tickets
+=begin
+        #Initialization has to happen earlier in the code so this code stands
+        #as an example, when `ti init` is called, initialization is handled by
+        #base.rb:354 (at the time of writing this).
+        tic.base.init_ticgitng_branch(
+          git.lib.branches_all.map{|b| b.first }.include?(which_branch?)
+        )
+=end
+      end
+    end
+  end
+end

data/lib/ticgit-ng/command.rb

@@ -22,6 +22,7 @@ module TicGitNG
     register 'State', 'Change state of a ticket', 'state'
     register 'Tag', 'Modify tags of a ticket', 'tag'
     register 'Sync', 'Sync tickets', 'sync'
+    register 'Init', 'Initialize Ticgit-ng', 'init'
 
     def self.get(command)
       if mod_name = COMMANDS[command]

data/lib/ticgit-ng/version.rb

@@ -1,3 +1,3 @@
 module TicGitNG
-  VERSION = '1.0.2.11'
+  VERSION = '1.0.2.12'
 end

data/lib/ticgit-ng.rb

@@ -41,7 +41,11 @@ module TicGitNG
   autoload :Ticket, 'ticgit-ng/ticket'
 
   # options
-  #   :logger => Logger.new(STDOUT)
+  #   :logger            => Logger.new(STDOUT)
+  #   :tic_dir           => "~/.#{ which_branch?() }"
+  #   :working_directory => File.expand_path(File.join(@tic_dir, proj, 'working'))
+  #   :index_file        => File.expand_path(File.join(@tic_dir, proj, 'index'))
+  #   :init              => Boolean -- if true, allow initializing ticgit
   def self.open(git_dir, options = {})
     Base.new(git_dir, options)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: TicGit-ng
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 79
   prerelease: false
   segments: 
   - 1
   - 0
   - 2
-  - 11
-  version: 1.0.2.11
+  - 12
+  version: 1.0.2.12
 platform: ruby
 authors: 
 - Scott Chacon
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 -08:00
+date: 2012-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - lib/ticgit-ng/command/tag.rb
 - lib/ticgit-ng/command/recent.rb
 - lib/ticgit-ng/command/sync.rb
+- lib/ticgit-ng/command/init.rb
 - lib/ticgit-ng/command/assign.rb
 - lib/ticgit-ng/command/list.rb
 - lib/ticgit-ng/command/milestone.rb