taco_it 1.4.2 → 1.5.0

data/bin/taco

@@ -12,7 +12,7 @@ end
 require 'commander/import'
 
 program :name, 'taco'
-program :version, '1.4.2'
+program :version, '1.5.0'
 program :description, 'simple command line issue tracking'
 
 command :init do |c|

data/lib/taco/cli.rb

@@ -1,62 +1,83 @@
 require 'taco/issue'
 require 'taco/taco'
 require 'taco/tacorc'
+require 'taco/taco_profile'
+
+# FIXME: this file should be named taco_cli.rb
 
 class TacoCLI
   RETRY_NAME = '.taco_retry.txt'
 
   TACORC_NAME = '.tacorc'
+  TACO_PROFILE_NAME = '.taco_profile'
   INDEX_ERB_NAME = '.index.html.erb'
   
   DEFAULT_TACORC_NAME = 'tacorc'
+  DEFAULT_TACO_PROFILE_NAME = 'taco_profile'
   DEFAULT_INDEX_ERB_NAME = 'index.html.erb'
-  DEFAULTS_HOME = File.realpath(File.join(File.dirname(__FILE__), 'defaults/'))
   
+  DEFAULTS_HOME = File.realpath(File.join(File.dirname(__FILE__), 'defaults/'))
+    
   def initialize
     @taco = Taco.new
     
     @retry_path = File.join(@taco.home, RETRY_NAME)
 
     @tacorc_path = File.join(@taco.home, TACORC_NAME)
+    @taco_profile_path = File.join(@taco.home, TACO_PROFILE_NAME)
     @index_erb_path = File.join(@taco.home, INDEX_ERB_NAME)
-    
+
+    # FIXME: do this elsewhere.  pass in an initialized TacoRc object
+    #
     if File.exist? @tacorc_path
       rc = TacoRc.new @tacorc_path
       rc.update_schema! Issue
     end
+    
+    # FIXME: do this elsewhere.  pass in an initialized TacoProfile object
+    #
+    if File.exist? @taco_profile_path
+      profile_text = open(@taco_profile_path) { |f| f.read }
+    end
+    
+    @profile = TacoProfile.new profile_text    
   end
   
   def init!
     out = @taco.init!
 
     FileUtils.copy(File.join(DEFAULTS_HOME, DEFAULT_TACORC_NAME), @tacorc_path)    
+    FileUtils.copy(File.join(DEFAULTS_HOME, DEFAULT_TACO_PROFILE_NAME), @taco_profile_path)    
+
     FileUtils.copy(File.join(DEFAULTS_HOME, DEFAULT_INDEX_ERB_NAME), @index_erb_path)
     
-    out + "\nPlease edit the config file at #{@tacorc_path}"
+    out + "\nPlease edit the config files at:\n #{@tacorc_path}\n #{@taco_profile_path}"
   end
 
   def list(args, opts)
-    the_list = @taco.list(:short_ids => true, :filters => args)
+    filters = args.size > 0 ? args : @profile.filters
+
+    the_list = @taco.list :filters => filters
     
     if opts[:sort]
       attrs = opts[:sort].split(',').map(&:to_s)
+    else
+      attrs = @profile.sort_order
+    end
       
-      the_list.sort! do |lhs, rhs|
-        issue_a, issue_b = lhs[0], rhs[0]
-
-        order = 0
-        
-        attrs.take_while do |attr|
-          order = issue_a.send(attr) <=> issue_b.send(attr)
-          order == 0
-        end
-                
-        order
+    the_list.sort! do |issue_a, issue_b|
+      order = 0
+      
+      attrs.take_while do |attr|
+        order = issue_a.send(attr) <=> issue_b.send(attr)
+        order == 0
       end
+              
+      order
     end
     
-    the_list.map! do |issue, short_id| 
-      "#{short_id} : #{issue.priority} : #{issue.summary}"
+    the_list.map! do |issue|
+      @profile.columns.map { |col| issue.send(col) }.join(' : ')
     end
     
     return "Found no issues." unless the_list.size > 0

data/lib/taco/defaults/taco_profile

@@ -0,0 +1,14 @@
+# comment, followed by a blank line (don't panic)
+
+# uncomment/edit to change the default sort order for 'taco list'
+#
+# sort: priority,status,owner
+
+# uncomment/edit to change the default filter for 'taco list'
+#
+# filter: kind:open owner:mike
+
+# uncomment/edit to change the default columns for 'taco list'
+#
+
+#columns: short_id,priority,owner,status,summary

data/lib/taco/taco.rb

@@ -86,17 +86,18 @@ class Taco
       
       raise Issue::Invalid.new("Issue ID does not match filename: #{issue.id} != #{id}") unless issue.id == id
       
-      short_id = 8.upto(id.size).each do |n|
-        short_id = id[0...n]
-        break short_id unless ids.count { |i| i.include? short_id } > 1
+      the_short_id = 8.upto(id.size).each do |n|
+        the_short_id = id[0...n]
+        break the_short_id unless ids.count { |i| i.include? the_short_id } > 1
       end
+
+      # because the length of the short_id is determinable only within the context of a group of issues 
+      # (because it must long enough to be unique), we can only define it on Issue in the context of a group
+      #
+      issue.instance_eval "def short_id; #{the_short_id.inspect}; end"
       
-      if opts[:short_ids]
-        [ issue, short_id ]
-      else
-        issue
-      end
-    end.reject(&:nil?).sort_by { |thing| opts[:short_ids] ? thing[0] : thing}
+      issue
+    end.reject(&:nil?).sort
   end
 end
 

data/lib/taco/taco_profile.rb

@@ -0,0 +1,33 @@
+# ~/.taco_profile configures per-user interactions with taco
+# a default .taco_profile exists at .taco/.taco_profile
+# contrast with .taco/.tacorc
+
+class TacoProfile
+  attr_reader :sort_order, :filters, :columns
+  
+  def initialize(text)
+    text ||= ''
+    
+    # FIXME: this is way too coupled to Issue
+    #
+    @sort_order = [ :created_at, :id ]
+    @columns = [ :short_id, :priority, :summary ]
+    @filters = []
+    
+    text.lines.each_with_index do |line, index|
+      next if line =~ /^#/ || line =~ /^\s*$/
+      
+      key, value = line.split(':', 2).map(&:strip)
+      case key
+      when 'sort'
+        @sort_order = value.split(',').map(&:to_sym)
+      when 'filters'
+        @filters = value.split(/\s/)
+      when 'columns'
+        @columns = value.split(',').map(&:to_sym)
+      else
+        raise ArgumentError.new("Parse error on line #{index+1}")
+      end
+    end
+  end
+end

data/lib/taco/tacorc.rb

@@ -1,3 +1,6 @@
+# .taco/.tacorc describes properties of the taco repository
+# contrast with ~/.taco_profile
+
 class TacoRc
   class ParseError < Exception; end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taco_it
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -41,8 +41,10 @@ files:
 - lib/taco/issue.rb
 - lib/taco/schema.rb
 - lib/taco/taco.rb
+- lib/taco/taco_profile.rb
 - lib/taco/tacorc.rb
 - lib/taco/defaults/index.html.erb
+- lib/taco/defaults/taco_profile
 - lib/taco/defaults/tacorc
 - bin/taco
 homepage: http://github.com/mikepartelow/taco