taco_it 1.1.2 → 1.1.4

data/bin/taco

@@ -101,6 +101,9 @@ class Issue
     :kind           => { :class => String,    :required => true,    :settable => true },
     :status         => { :class => String,    :required => true,    :settable => true },
     :owner          => { :class => String,    :required => true,    :settable => true },
+    
+    :priority       => { :class => Fixnum,    :required => true,    :settable => true },
+    
     :description    => { :class => String,    :required => true,    :settable => true },
   }
   
@@ -109,6 +112,7 @@ class Issue
 Summary     : %{summary}
 Kind        : %{kind}
 Status      : %{status}
+Priority    : %{priority}
 Owner       : %{owner}
 
 # Everything between the --- lines is Issue Description
@@ -158,6 +162,10 @@ EOT
       attrs.each do |attr, values|
         raise ArgumentError.new("Unknown Issue attributes: #{attr}") unless SCHEMA_ATTRIBUTES.include? attr      
       
+        if SCHEMA_ATTRIBUTES[attr][:class] == Fixnum
+          values.map!(&:to_i)
+        end
+        
         SCHEMA_ATTRIBUTES[attr][:allowed_values] = values
       end
     end
@@ -174,18 +182,36 @@ EOT
       case cfg[:class].to_s # can't case on cfg[:class], because class of cfg[:class] is always Class :-)
       when 'Time'
         unless attrs[attr].is_a?(String) || attrs[attr].is_a?(Time)
-          raise ArgumentError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
         end
         
-        t = attrs[attr].is_a?(String) ? Time.parse(attrs[attr]) : attrs[attr]
+        t = if attrs[attr].is_a?(String)
+          begin
+            Time.parse(attrs[attr])
+          rescue ArgumentError => e
+            raise TypeError.new(e.to_s)
+          end
+        else
+          attrs[attr]
+        end
         attrs[attr] = timescrub(t)
       when 'String'
         unless attrs[attr].is_a?(String)
-          raise ArgumentError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
         end
          
         attrs[attr] && attrs[attr].strip!
-      end
+      when 'Fixnum'
+        unless attrs[attr].is_a?(Fixnum) || attrs[attr].is_a?(String)
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
+        end          
+        
+        if attrs[attr].is_a?(String)
+          i = attrs[attr].to_i
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}") unless i.to_s == attrs[attr]
+          attrs[attr] = i
+        end
+      end      
     end 
         
     attrs   
@@ -254,6 +280,7 @@ Updated At  : #{date(updated_at)}
 Summary     : #{summary}
 Kind        : #{kind}
 Status      : #{status}
+Priority    : #{priority}
 Owner       : #{owner}
 
 ---
@@ -383,9 +410,9 @@ EOT
           raise Issue::Invalid.new("Empty string is not allowed for #{attr}")
         end
       end
-    rescue Issue::Invalid
+    rescue Issue::Invalid => e
       return false unless opts[:raise]
-      raise
+      raise e
     end
     
     true
@@ -565,11 +592,13 @@ class TacoCLI
 #
 Kind = Defect, Feature Request
 Status = Open, Closed
+Priority = 1, 2, 3, 4, 5
 
 # Default values for Issue fields
 #
 DefaultKind = Defect
 DefaultStatus = Open
+DefaultPriority = 3
 EOT
   RETRY_NAME = '.taco_retry.txt'
 
@@ -593,7 +622,9 @@ EOT
   end
 
   def list(args)
-    the_list = @taco.list(:short_ids => true, :filters => args).map { |issue, short_id| "#{short_id} : #{issue.summary}" }
+    the_list = @taco.list(:short_ids => true, :filters => args).map do |issue, short_id| 
+      "#{short_id} : #{issue.priority} : #{issue.summary}"
+    end
     return "Found no issues." unless the_list.size > 0
     the_list.join("\n")
   end
@@ -706,7 +737,7 @@ end
 require 'commander/import'
 
 program :name, 'taco'
-program :version, '1.1.2'
+program :version, '1.1.4'
 program :description, 'simple command line issue tracking'
 
 command :init do |c|

data/lib/taco.rb

@@ -101,6 +101,9 @@ class Issue
     :kind           => { :class => String,    :required => true,    :settable => true },
     :status         => { :class => String,    :required => true,    :settable => true },
     :owner          => { :class => String,    :required => true,    :settable => true },
+    
+    :priority       => { :class => Fixnum,    :required => true,    :settable => true },
+    
     :description    => { :class => String,    :required => true,    :settable => true },
   }
   
@@ -109,6 +112,7 @@ class Issue
 Summary     : %{summary}
 Kind        : %{kind}
 Status      : %{status}
+Priority    : %{priority}
 Owner       : %{owner}
 
 # Everything between the --- lines is Issue Description
@@ -158,6 +162,10 @@ EOT
       attrs.each do |attr, values|
         raise ArgumentError.new("Unknown Issue attributes: #{attr}") unless SCHEMA_ATTRIBUTES.include? attr      
       
+        if SCHEMA_ATTRIBUTES[attr][:class] == Fixnum
+          values.map!(&:to_i)
+        end
+        
         SCHEMA_ATTRIBUTES[attr][:allowed_values] = values
       end
     end
@@ -174,18 +182,36 @@ EOT
       case cfg[:class].to_s # can't case on cfg[:class], because class of cfg[:class] is always Class :-)
       when 'Time'
         unless attrs[attr].is_a?(String) || attrs[attr].is_a?(Time)
-          raise ArgumentError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
         end
         
-        t = attrs[attr].is_a?(String) ? Time.parse(attrs[attr]) : attrs[attr]
+        t = if attrs[attr].is_a?(String)
+          begin
+            Time.parse(attrs[attr])
+          rescue ArgumentError => e
+            raise TypeError.new(e.to_s)
+          end
+        else
+          attrs[attr]
+        end
         attrs[attr] = timescrub(t)
       when 'String'
         unless attrs[attr].is_a?(String)
-          raise ArgumentError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
         end
          
         attrs[attr] && attrs[attr].strip!
-      end
+      when 'Fixnum'
+        unless attrs[attr].is_a?(Fixnum) || attrs[attr].is_a?(String)
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}")
+        end          
+        
+        if attrs[attr].is_a?(String)
+          i = attrs[attr].to_i
+          raise TypeError.new("#{attr} : expected type #{cfg[:class]}, got type #{attrs[attr].class}") unless i.to_s == attrs[attr]
+          attrs[attr] = i
+        end
+      end      
     end 
         
     attrs   
@@ -254,6 +280,7 @@ Updated At  : #{date(updated_at)}
 Summary     : #{summary}
 Kind        : #{kind}
 Status      : #{status}
+Priority    : #{priority}
 Owner       : #{owner}
 
 ---
@@ -383,9 +410,9 @@ EOT
           raise Issue::Invalid.new("Empty string is not allowed for #{attr}")
         end
       end
-    rescue Issue::Invalid
+    rescue Issue::Invalid => e
       return false unless opts[:raise]
-      raise
+      raise e
     end
     
     true
@@ -565,11 +592,13 @@ class TacoCLI
 #
 Kind = Defect, Feature Request
 Status = Open, Closed
+Priority = 1, 2, 3, 4, 5
 
 # Default values for Issue fields
 #
 DefaultKind = Defect
 DefaultStatus = Open
+DefaultPriority = 3
 EOT
   RETRY_NAME = '.taco_retry.txt'
 
@@ -593,7 +622,9 @@ EOT
   end
 
   def list(args)
-    the_list = @taco.list(:short_ids => true, :filters => args).map { |issue, short_id| "#{short_id} : #{issue.summary}" }
+    the_list = @taco.list(:short_ids => true, :filters => args).map do |issue, short_id| 
+      "#{short_id} : #{issue.priority} : #{issue.summary}"
+    end
     return "Found no issues." unless the_list.size > 0
     the_list.join("\n")
   end
@@ -706,7 +737,7 @@ end
 require 'commander/import'
 
 program :name, 'taco'
-program :version, '1.1.2'
+program :version, '1.1.4'
 program :description, 'simple command line issue tracking'
 
 command :init do |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taco_it
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander