taco_it 1.5.2 → 1.5.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2UwODA4YTVhOTlhZThhOTM1MjIyZjJhY2RhMWVkNmYyY2IyNDQ4Yg==
+  data.tar.gz: !binary |-
+    ZTljZGJhYTMwNTdmMmI4YzQ3YWU0MWI1ZTY3NjlkYzhkZWZhOWYwYg==
+SHA512:
+  metadata.gz: !binary |-
+    ZWQzNTc4NGMwZmZiNDFlOWJjZmJjYWZjN2ZlMjgzOThhOGE0OWJhMDYyNmJm
+    NzhkMzEyNDg2ZTgxZDBkOWFlYTIyZjdkZmE0YTU2MDkyNmNkYWU5YjUyZDEw
+    YmNmOTI2MTdiN2EyOWIzZjc3MDZjOTMxZjI3OGE5MGNlZTA1ZGI=
+  data.tar.gz: !binary |-
+    ODQ2Y2I4YTEyNTUwYTczYTUyMzgwMjRlMGMyMzY1NTI5MDc3OTIyNWVlMGY2
+    YzY3YTA1ZDQ1MjNjNWMwNzUyY2M3MWNmMDE0MDQyYzcyYWJlMWM5ZGUzODY3
+    MzM1NzM2MWNhZjRlYzEyNDk0MjI4MGIxZmM0NTczNTU5NzU5ZGU=

data/bin/taco

@@ -12,7 +12,7 @@ end
 require 'taco/commander/import'
 
 program :name, 'taco'
-program :version, '1.5.2'
+program :version, '1.5.3'
 program :description, 'simple command line issue tracking'
 
 command :init do |c|
@@ -49,7 +49,7 @@ command :new do |c|
   
   c.option '--retry', nil, 'retry a failed Issue creation'
   
-  c.arguments lambda { |args| args.size <= 1 }
+  c.arguments lambda { |args| true } #lambda { |args| args.size <= 1 }
   
   c.action do |args, options|
     begin

data/lib/taco/change.rb

@@ -4,32 +4,32 @@ require 'time'
 # FIXME: put this in a namespace
 class Change
   class Invalid < Exception; end
-  
+
   attr_reader   :created_at
   attr_accessor :attribute
   attr_accessor :old_value
-  attr_accessor :new_value  
-  
+  attr_accessor :new_value
+
   def initialize(args={})
     args.each do |attr, value|
       raise ArgumentError.new("Unknown attribute #{attr}") unless self.respond_to?(attr)
-      
+
       case attr.to_sym
       when :created_at
         value = Time.parse(value) unless value.is_a?(Time)
       when :attribute
         value = value.to_sym
       end
-      
+
       instance_variable_set("@#{attr.to_s}", value)
     end
-    
+
     @created_at = Time.parse(@created_at) if @created_at.is_a?(String)
     @created_at = timescrub(@created_at || Time.now)
-    
+
     self
-  end  
-  
+  end
+
   def self.from_json(the_json)
     begin
       hash = JSON.parse(the_json)
@@ -37,9 +37,9 @@ class Change
       raise Change::Invalid.new(e.to_s)
     end
 
-    Change.new(hash)      
+    Change.new(hash)
   end
-  
+
   def valid?(opts={})
     # old_value is optional!
     #
@@ -47,29 +47,29 @@ class Change
     raise Invalid if opts[:raise] && !valid
     valid
   end
-  
+
   def to_json(state=nil)
     valid? :raise => true
     hash = { :created_at => created_at, :attribute => attribute, :old_value => old_value, :new_value => new_value }
     JSON.pretty_generate(hash)
   end
-  
+
   def to_s(opts={})
     if opts[:simple]
       "#{attribute} : #{old_value} => #{new_value}"
     else
-      fields = [ date(created_at), attribute, old_value || '[nil]', new_value ]        
-      "%10s : %12s : %s => %s" % fields        
+      fields = [ date(created_at), attribute, old_value || '[nil]', new_value ]
+      "%10s : %12s : %s => %s" % fields
     end
   end
-  
+
   private
     def date(t)
       t.strftime "%Y/%m/%d %H:%M:%S"
     end
-    
+
     def timescrub(t)
       Time.new t.year, t.mon, t.day, t.hour, t.min, t.sec, t.utc_offset
     end
-  
+
 end

data/lib/taco/cli.rb

@@ -11,16 +11,16 @@ class TacoCLI
   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/'))
-    
+
   def initialize
     @taco = Taco.new
-    
+
     @retry_path = File.join(@taco.home, RETRY_NAME)
 
     @tacorc_path = File.join(@taco.home, TACORC_NAME)
@@ -33,24 +33,24 @@ class TacoCLI
       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    
+
+    @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_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 files at:\n #{@tacorc_path}\n #{@taco_profile_path}"
   end
 
@@ -58,40 +58,61 @@ class TacoCLI
     filters = args.size > 0 ? args : @profile.filters
 
     the_list = @taco.list :filters => filters
-    
+
     if opts[:sort]
-      attrs = opts[:sort].split(',').map(&:to_s)
+      attrs = opts[:sort].split(',').map(&:to_sym)
+      attrs.each do |attr|
+        # FIXME: don't hardcode :short_id
+        raise ArgumentError.new("Unknown Issue attribute for sort: #{attr}") unless attr == :short_id || Issue.schema_attributes.include?(attr)
+      end
     else
       attrs = @profile.sort_order
     end
-      
+
     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|
       @profile.columns.map { |col| issue.send(col) }.join(' : ')
     end
-    
+
     return "Found no issues." unless the_list.size > 0
     the_list.join("\n")
   end
-  
+
   def new!(args, opts)
     editor_opts = if opts[:retry]
-      raise ArgumentError.new("No previous Issue edit session was found.") unless File.exist?(@retry_path)      
+      raise ArgumentError.new("No previous Issue edit session was found.") unless File.exist?(@retry_path)
       { :template => open(@retry_path) { |f| f.read } }
-    elsif args.size == 0
-      { :template => Issue.new.to_template }
-    elsif args.size == 1
-      { :from_file => args[0] }
+    else
+      file, defaults = nil, {}
+
+      args.each do |arg|
+        if arg.include? ':'
+          k, v = arg.split(':', 2)
+          defaults[Issue.schema_attr_expand(k)] = v
+        elsif file
+          raise ArgumentError.new("Multiple filenames given.")
+        else
+          file = arg
+        end
+      end
+
+      if file && defaults.size > 0
+        raise ArgumentError.new("Cannot set defaults when creating Issue from file.")
+      elsif file
+        { :from_file => file, :defaults => defaults }
+      else
+        { :template => Issue.new.to_template(:defaults => defaults) }
+      end
     end
 
     if issue = IssueEditor.new(@taco, @retry_path).new_issue!(editor_opts)
@@ -100,31 +121,31 @@ class TacoCLI
       "Aborted."
     end
   end
-  
+
   def show(args, opts)
     if opts[:all]
       filters = args.select { |arg| arg.include? ':' }
       args = @taco.list(:filters => filters).map(&:id)
     end
-    
+
     args.map { |id| @taco.read(id).to_s(opts) }.join("\n\n")
   end
-  
+
   def edit!(args, opts)
     ie = IssueEditor.new @taco, @retry_path
-    
+
     if opts[:retry]
-      raise ArgumentError.new("No previous Issue edit session was found.") unless File.exist?(@retry_path)      
+      raise ArgumentError.new("No previous Issue edit session was found.") unless File.exist?(@retry_path)
       template = open(@retry_path) { |f| f.read }
     end
-    
+
     if issue = ie.edit_issue!(@taco.read(args[0]), :template => template)
       "Updated Issue #{issue.id}"
     else
       "Aborted."
     end
   end
-  
+
   def template(opts)
     if opts[:defaults]
       (Issue::TEMPLATE % Issue.new.to_hash).strip
@@ -132,14 +153,14 @@ class TacoCLI
       Issue::TEMPLATE.gsub(/%{.*?}/, '').strip
     end
   end
-  
+
   def html
     require 'erb'
-    
+
     issues = @taco.list
-    ERB.new(open(@index_erb_path) { |f| f.read }).result(binding)    
+    ERB.new(open(@index_erb_path) { |f| f.read }).result(binding)
   end
-  
+
   def push(opts)
     opts[:message] ||= 'turn and face the strange'
     cmd = "git add . && git commit -am '#{opts[:message]}' && git push"

data/lib/taco/issue.rb

@@ -2,25 +2,25 @@ require 'taco/schema'
 require 'taco/change'
 require 'securerandom'
 
-class Issue  
+class Issue
   include Comparable
   include Schema
-  
+
   alias_method :schema_valid?, :valid?
-  
+
   attr_reader :changelog
 
   schema_attr :id,          class: String,      settable: false
   schema_attr :created_at,  class: Time,        settable: false
   schema_attr :updated_at,  class: Time,        settable: false
-  
+
   schema_attr :summary,     class: String,      settable: true
   schema_attr :kind,        class: String,      settable: true
   schema_attr :status,      class: String,      settable: true
   schema_attr :owner,       class: String,      settable: true
   schema_attr :priority,    class: Fixnum,      settable: true
   schema_attr :description, class: String,      settable: true
-    
+
   TEMPLATE =<<-EOT.strip
 # Lines beginning with # will be ignored.
 Summary     : %{summary}
@@ -37,14 +37,14 @@ EOT
 
   class Invalid < Exception; end
   class NotFound < Exception; end
-  
+
   def initialize(attributes={}, changelog=[])
     attributes = Hash[attributes.map { |k, v| [ k.to_sym, v ] }]
 
-    @new = attributes[:created_at].nil? && attributes[:id].nil?      
+    @new = attributes[:created_at].nil? && attributes[:id].nil?
 
     @changelog = []
-            
+
     attributes.each do |attr, value|
       schema_attr = self.class.schema_attributes[attr]
       raise ArgumentError.new("unknown attribute: #{attr}") unless schema_attr
@@ -52,11 +52,11 @@ EOT
         self.send "#{attr}=", attributes[attr]
       end
     end
-    
+
     self.id = attributes[:id] || SecureRandom.uuid.gsub('-', '')
     self.created_at = attributes[:created_at] || Time.now
     self.updated_at = attributes[:updated_at] || Time.now
-    
+
     if changelog.size > 0
       @changelog = changelog.map do |thing|
         if thing.is_a? Change
@@ -66,21 +66,21 @@ EOT
         end
       end
     end
-    
+
     self
   end
-  
+
   def schema_attribute_change(attribute, old_value, new_value)
     if self.class.schema_attributes[attribute][:settable]
       self.updated_at = Time.now
       @changelog << Change.new(:attribute => attribute, :old_value => old_value, :new_value => new_value)
     end
-  end   
-  
+  end
+
   def new?
     @new
   end
-  
+
   def <=>(other)
     if self.class.schema_attributes.all? { |attr, opts| self.send(attr) == other.send(attr) }
       r = 0
@@ -92,10 +92,10 @@ EOT
       end
 
       # this clause should not return 0, we've already established inequality
-      #      
+      #
       r = -1 if r == 0
     end
-    
+
     r
   end
 
@@ -103,10 +103,10 @@ EOT
     fields = self.class.schema_attributes.map do |attr, opts|
       "@#{attr}=#{self.send(attr).inspect}"
     end.join ', '
-    
+
     "#<#{self.class}:0x%016x %s>" % [ object_id, fields ]
   end
-      
+
   def to_s(opts={})
     text = <<-EOT.strip
 ID          : #{id}
@@ -124,30 +124,30 @@ Owner       : #{owner}
 EOT
 
     if opts[:changelog]
-      changelog_str = changelog.map { |c| %Q|# #{c.to_s.strip.gsub(/\n/, "\n# ")}| }.join("\n")      
+      changelog_str = changelog.map { |c| %Q|# #{c.to_s.strip.gsub(/\n/, "\n# ")}| }.join("\n")
       text << %Q|\n---\n\n#{changelog_str}|
     end
-    
+
     text
   end
-  
+
   def valid?(opts={})
     valid = schema_valid?
     error = schema_errors.first
     raise Invalid.new("attribute #{error.first}: #{error[1].inspect} is not a valid value") if !valid && opts[:raise]
     valid
   end
-  
+
   def to_json(state=nil)
     valid? :raise => true
     hash = { :issue => self.to_hash, :changelog => changelog }
     JSON.pretty_generate(hash)
   end
-  
-  def to_template
+
+  def to_template(opts={})
     if new?
       header = "# New Issue\n#"
-      body = TEMPLATE % self.to_hash
+      body = TEMPLATE % self.to_hash.merge(opts.fetch(:defaults, {}))
       footer = ""
     else
       header =<<-EOT
@@ -159,44 +159,44 @@ EOT
 #
 EOT
       body = TEMPLATE % self.to_hash
-      
-      footer =<<-EOT      
+
+      footer =<<-EOT
 # ChangeLog
 #
-#{changelog.map { |c| %Q|# #{c.to_s.strip.gsub(/\n/, "\n# ")}| }.join("\n")}      
+#{changelog.map { |c| %Q|# #{c.to_s.strip.gsub(/\n/, "\n# ")}| }.join("\n")}
 EOT
     end
-    
+
     (header + "\n" + body + "\n\n" + footer).strip
   end
-  
+
   def self.from_json(the_json)
     begin
       hash = JSON.parse(the_json)
     rescue JSON::ParserError => e
       raise Issue::Invalid.new(e.to_s)
     end
-    
-    Issue.new(hash['issue'], hash['changelog'])    
-  end    
-  
+
+    Issue.new(hash['issue'], hash['changelog'])
+  end
+
   def self.from_template(text)
     issue = { :description => '' }
     reading_description = false
-    
+
     text.lines.each_with_index do |line, index|
       next if line =~ /^#/ || (!reading_description && line =~ /^\s*$/)
-      
+
       if line =~ /^---$/
         # FIXME: this means that there can be multiple description blocks in the template!
         #
         reading_description = !reading_description
         next
       end
-      
+
       if !reading_description && line =~ /^(\w+)\s*:\s*(.*)$/
         key, value = $1.downcase.to_sym, $2.strip
-        
+
         if schema_attributes.include?(key) && schema_attributes[key][:settable]
           issue[key] = value
         else
@@ -209,13 +209,13 @@ EOT
         raise ArgumentError.new("Cannot parse line #{index+1}")
       end
     end
-    
+
     Issue.new(issue)
   end
-  
+
   def update_from_template!(text)
     new_issue = Issue.from_template(text)
-    
+
     attrs = self.class.schema_attributes.map do |attr, opts|
       if opts[:settable] && self.send(attr) != (new_value = new_issue.send(attr))
         self.send("#{attr}=", new_value)
@@ -223,17 +223,17 @@ EOT
     end
 
     self
-  end  
-  
+  end
+
   private
     def date(t)
       t.strftime "%Y/%m/%d %H:%M:%S"
     end
-  
+
     def dup
       raise NoMethodError.new
     end
-    
+
     def clone
       raise NoMethodError.new
     end

data/lib/taco/schema.rb

@@ -10,20 +10,20 @@ module Schema
   def self.included(base)
     base.extend(ClassMethods)
   end
-  
+
   def to_hash
     Hash[self.class.schema_attributes.map do |attr, opts|
       [ attr, send(attr) ]
     end]
   end
-  
+
   def schema_errors
     @errors || []
   end
-  
+
   def valid?
     @errors = nil
-    
+
     self.class.schema_attributes.each do |attr, opts|
       if opts[:validate].nil?
         case opts[:class].to_s # can't case on opts[:class], because class of opts[:class] is always Class :-)
@@ -31,55 +31,62 @@ module Schema
           opts[:validate] = lambda { |v| v !~ /\A\s*\Z/ }
         end
       end
-      
+
       if opts[:validate]
         value = eval(attr.to_s)
-        
+
         valid = if opts[:validate].is_a?(Array)
           opts[:validate].include? value
         elsif opts[:validate].is_a?(Proc)
           opts[:validate].call(value)
         end
-        
+
         unless valid
           @errors = [ [ attr, value ] ]
           return false
         end
       end
     end
-    
+
     true
   end
-    
+
   module ClassMethods
     def schema_attributes
       @schema_attrs
     end
-    
+
+    def schema_attr_expand(prefix)
+      candidates = @schema_attrs.keys.select { |a| a.to_s.start_with? prefix }
+      raise KeyError.new("no attribute is prefixed with #{prefix}") if candidates.size == 0
+      raise KeyError.new("prefix #{prefix} is not unique") if candidates.size > 1
+      candidates[0]
+    end
+
     def schema_attr_remove(name)
-      raise KeyError.new("attribute #{name}: does not exist in class #{self.name}") unless @schema_attrs.include? name      
+      raise KeyError.new("attribute #{name}: does not exist in class #{self.name}") unless @schema_attrs.include? name
       @schema_attrs.delete(name)
       self.send(:remove_method, name)
       self.send(:remove_method, "#{name}=".to_s)
     end
-    
+
     def schema_attr_replace(name, opts)
-      raise KeyError.new("attribute #{name}: does not exist in class #{self.name}") unless @schema_attrs.include? name      
+      raise KeyError.new("attribute #{name}: does not exist in class #{self.name}") unless @schema_attrs.include? name
       schema_attr_remove(name)
       schema_attr(name, opts)
     end
-    
+
     def schema_attr_update(name, opts)
-      raise KeyError.new("attribute #{name}: does not exist in class #{self.name}") unless @schema_attrs.include? name      
+      raise KeyError.new("attribute #{name}: does not exist in class #{self.name}") unless @schema_attrs.include? name
       raise KeyError.new("attribute #{name}: cannot update non-settable attribute") unless @schema_attrs[name][:settable]
       schema_attr_replace(name, @schema_attrs[name].merge(opts))
     end
-    
-    def schema_attr(name, opts)      
+
+    def schema_attr(name, opts)
       @schema_attrs ||= {}
 
       raise TypeError.new("attribute #{name}: missing or invalid :class") unless opts[:class].is_a?(Class)
-      
+
       if opts[:default].nil?
         opts[:default] = case opts[:class].to_s # can't case on opts[:class], because class of opts[:class] is always Class :-)
         when 'String'
@@ -92,31 +99,31 @@ module Schema
           raise ArgumentError.new("Sorry, no default default exists for #{opts[:class]}")
         end
       end
-            
+
       unless opts[:default].is_a?(opts[:class]) || opts[:default].is_a?(Proc)
         raise TypeError.new("attribute #{name}: invalid :default")
       end
-      
+
       if opts[:validate]
         unless opts[:validate].is_a?(Array) || opts[:validate].is_a?(Proc)
           raise ArgumentError.new("attribute #{name}: expecting Array or Proc for :validate")
         end
-        
+
         if opts[:validate].is_a?(Array)
           raise TypeError.new("attribute #{name}: wrong type in :validate Array") unless opts[:validate].all? { |v| v.is_a?(opts[:class]) }
         end
       end
 
       raise ArgumentError.new("attribute #{name}: already exists") if @schema_attrs[name]
-      
+
       @schema_attrs[name] = opts
-      
+
       value_getter = if opts[:default].is_a?(Proc)
         %Q(
             opts = self.class.schema_attributes[:#{name}]
             value = opts[:default].call
-            raise TypeError.new("attribute #{name}: expected type #{opts[:class]}, received \#{value.class}") unless opts[:class] == value.class            
-        )        
+            raise TypeError.new("attribute #{name}: expected type #{opts[:class]}, received \#{value.class}") unless opts[:class] == value.class
+        )
       else
         %Q(value = #{opts[:default].inspect})
       end
@@ -129,7 +136,7 @@ module Schema
                         @#{name}
                       end
                     )
-        
+
       unless opts[:coerce] == false # possible values are false=no-coerce, nil=default-coerce, Proc=custom-coerce
         case opts[:class].to_s # can't case on opts[:class], because class of opts[:class] is always Class :-)
         when 'Fixnum'
@@ -155,16 +162,16 @@ module Schema
                   value = Time.parse(value)
                 rescue ArgumentError
                   raise TypeError.new("attribute #{name}: cannot coerce from \#{value.class}")
-                end                  
+                end
               end
               value
             end
-          end          
+          end
         end
-        
+
         coerce = 'value = opts[:coerce].call(value)' if opts[:coerce]
       end
-      
+
       unless opts[:transform] == false # possible values are false=no-transform, nil=default-transform, Proc=custom-transform
         case opts[:class].to_s # can't case on opts[:class], because class of opts[:class] is always Class :-)
         when 'String'
@@ -179,25 +186,25 @@ module Schema
             #                                 foo.a_time = Time.new
             #                                 Time.parse(foo.a_time.to_s) == foo.a_time # returns false most of the time!
             opts[:transform] = lambda { |t| Time.new t.year, t.mon, t.day, t.hour, t.min, t.sec, t.utc_offset }
-          end            
+          end
         end
-        
+
         transform = 'value = opts[:transform].call(value)' if opts[:transform]
       end
-      
+
       callback = %Q(
         if self.respond_to? :schema_attribute_change
           self.schema_attribute_change(:#{name}, @#{name}, value)
         end
       )
-      
+
       setter_method = %Q(
         def #{name}=(value)
           opts = self.class.schema_attributes[:#{name}]
           #{coerce}
           raise TypeError.new("attribute #{name}: expected type #{opts[:class]}, received \#{value.class}") unless opts[:class] == value.class
           #{transform}
-          #{callback}            
+          #{callback}
           @#{name} = value
         end
       )

data/lib/taco/taco.rb

@@ -8,33 +8,33 @@ class Taco
   HOME_DIR = '.taco'
 
   attr_accessor :home
-  
+
   class NotFound < Exception; end
   class Ambiguous < Exception; end
-  
-  def initialize(root_path=nil)    
+
+  def initialize(root_path=nil)
     @home = File.join(root_path || Dir.getwd, HOME_DIR)
-  end 
-  
+  end
+
   def init!
     raise IOError.new("Could not create #{@home}\nDirectory already exists.") if File.exists?(@home)
 
     FileUtils.mkdir_p(@home)
-  
+
     "Initialized #{@home}"
   end
-  
+
   def write!(issue_or_issues)
     issues = issue_or_issues.is_a?(Array) ? issue_or_issues : [ issue_or_issues ]
-    
+
     issues.each do |issue|
-      the_json = issue.to_json # do this first so we don't bother the filesystem if the issue is invalid    
+      the_json = issue.to_json # do this first so we don't bother the filesystem if the issue is invalid
       open(File.join(@home, issue.id), 'w') { |f| f.write(the_json) }
     end
-    
+
     issue_or_issues
-  end  
-  
+  end
+
   def read(issue_id)
     issue_path = File.join(@home, issue_id)
 
@@ -47,19 +47,19 @@ class Taco
           issue = read(File.basename(entry))
           "#{issue.id} : #{issue.summary}"
         end
-        raise Ambiguous.new("Found several matching issues:\n%s" % issue_list.join("\n")) 
+        raise Ambiguous.new("Found several matching issues:\n%s" % issue_list.join("\n"))
       end
 
       issue_path = entries[0]
       issue_id = File.basename entries[0]
     end
-     
+
     the_json = open(issue_path) { |f| f.read }
 
     issue = Issue.from_json the_json
-    
+
     raise Issue::Invalid.new("Issue ID does not match filename: #{issue.id} != #{issue_id}") unless issue.id == issue_id
-    
+
     issue
   end
 
@@ -67,45 +67,46 @@ class Taco
     filter_match = if opts.fetch(:filters, []).size > 0
       conditions = opts[:filters].map do |filter|
         attr, val = filter.split(':')
+        attr = Issue.schema_attr_expand(attr)
         %Q|i.send("#{attr}").to_s.downcase == "#{val.downcase}"|
       end.join ' && '
-      
+
       # FIXME: eval-ing user input? madness!
       eval "Proc.new { |i| #{conditions} }"
     else
       nil
     end
-    
+
     ids = Dir.glob("#{@home}/*")
-    
+
     ids.map do |name|
       id = File.basename name
       issue = Issue.from_json(open(name) { |f| f.read })
 
       next unless filter_match.nil? || filter_match.call(issue)
-      
+
       raise Issue::Invalid.new("Issue ID does not match filename: #{issue.id} != #{id}") unless issue.id == id
-      
+
       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 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"
-      
+
       issue
     end.reject(&:nil?).sort
   end
 end
 
 class IssueEditor
-  def initialize(taco, retry_path)    
+  def initialize(taco, retry_path)
     @taco, @retry_path = taco, retry_path
   end
-  
+
   def new_issue!(opts={})
     if opts[:from_file]
       text = open(opts[:from_file]) { |f| f.read }
@@ -116,13 +117,13 @@ class IssueEditor
 
     write_issue!(Issue.from_template(text), text) if text
   end
-  
+
   def edit_issue!(issue, opts={})
     if text = invoke_editor(opts[:template] || issue.to_template)
       write_issue!(issue.update_from_template!(text), text)
     end
   end
-  
+
   private
     def write_issue!(issue, text)
       begin
@@ -131,14 +132,14 @@ class IssueEditor
         open(@retry_path, 'w') { |f| f.write(text) } if text
         raise e
       end
-      
+
       File.unlink @retry_path rescue nil
-      issue      
+      issue
     end
-      
+
     def invoke_editor(template)
       text = nil
-      file = Tempfile.new('taco')    
+      file = Tempfile.new('taco')
 
       begin
         file.write(template)
@@ -147,7 +148,7 @@ class IssueEditor
         cmd = "$EDITOR #{file.path}"
         system(cmd)
 
-        open(file.path) do |f| 
+        open(file.path) do |f|
           text = f.read
         end
       ensure

data/lib/taco/taco_profile.rb

@@ -4,30 +4,40 @@
 
 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 = []
-    
+
+    @sort_order, @columns, @filters = nil, nil, nil
+
     text.lines.each_with_index do |line, index|
       next if line =~ /^#/ || line =~ /^\s*$/
-      
+
       key, value = line.split(':', 2).map(&:strip)
       case key
       when 'sort'
+        raise ArgumentError.new("sort defined more than once on line #{index+1}") if @sort_order
         @sort_order = value.split(',').map(&:to_sym)
+        raise ArgumentError.new("Unknown Issue attribute in sort on line #{index+1}") unless @sort_order.all? { |attr| Issue.schema_attributes.include?(attr) }
       when 'filters'
+        raise ArgumentError.new("filters defined more than once on line #{index+1}") if @filters
         @filters = value.split(/\s/)
+        raise ArgumentError.new("Unknown Issue attribute in filters on line #{index+1}") unless @filters.all? { |token| attr, value = token.split(':'); Issue.schema_attributes.include?(attr.to_sym) }
       when 'columns'
+        raise ArgumentError.new("columns defined more than once on line #{index+1}") if @columns
         @columns = value.split(',').map(&:to_sym)
+        raise ArgumentError.new("Unknown Issue attribute in columns on line #{index+1}") unless @columns.all? do |attr|
+          # FIXME: really?  hard-code :short_id? there's got to be a better way.
+          #
+          attr == :short_id || Issue.schema_attributes.include?(attr)
+        end
       else
         raise ArgumentError.new("Parse error on line #{index+1}")
       end
     end
+
+    @sort_order ||= [ :created_at, :id ]
+    @columns ||= [ :short_id, :priority, :summary ]
+    @filters ||= []
   end
 end

data/lib/taco/tacorc.rb

@@ -3,23 +3,22 @@
 
 class TacoRc
   class ParseError < Exception; end
-  
+
   def initialize(path)
     raise ArgumentError.new("no such file: #{path}") unless File.exists? path
     @path = path
   end
-  
+
   def update_schema!(schema)
     open(@path) do |f|
       f.readlines.each_with_index do |line, index|
         next if line =~ /^#/ || line =~ /^\s*$/
-  
         raise ParseError.new("Parse error on line #{index+1} of #{@path}: line does not begin with schema_attr_update") unless line =~ /^\s*schema_attr_update /
-        
+
         begin
           eval "#{schema}.#{line.strip}"
         rescue KeyError, TypeError, NameError => e
-          raise ParseError.new("Parse error on line #{index+1} of #{@path}: #{e.to_s}")           
+          raise ParseError.new("Parse error on line #{index+1} of #{@path}: #{e.to_s}")
         end
       end
     end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: taco_it
 version: !ruby/object:Gem::Version
-  version: 1.5.2
-  prerelease: 
+  version: 1.5.3
 platform: ruby
 authors:
 - Mike Partelow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -68,26 +65,25 @@ files:
 - bin/taco
 homepage: http://github.com/mikepartelow/taco
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ! 'Taco Issue Tracker: A CLI Issue Tracker with JSON/filesystem backend'
 test_files: []