cardigan 0.0.7 → 0.0.8

data/lib/cardigan/command/count_cards.rb

@@ -1,15 +1,36 @@
+require 'cardigan/context'
+require 'cardigan/text_report_formatter'
+
 class Cardigan::Command::CountCards
   def initialize repository, io
     @repository, @io = repository, io
   end
 
-  def execute text
+  def execute text=''
     grouping_fields = text.scan(/\w+/)
+    lengths = Array.new(grouping_fields.size, 0)
     counts = {}
-    @repository.cards.each do |card|
+    total = 0
+    @repository.each do |card|
+      grouping_fields.each_with_index do |grouping_field,index|
+        lengths[index] = card[grouping_field].size if card[grouping_field] and card[grouping_field].size > lengths[index]
+      end
       key = grouping_fields.map {|key| card[key] ? card[key] : ''}
       counts[key] = counts[key] ? counts[key] + 1 : 1
+      total += counts[key]
+    end
+
+    values = counts.keys.sort.map do |key|
+      hash = {'count' => counts[key]}
+      grouping_fields.each_with_index {|grouping_field,index| hash[grouping_field] = key[index] }
+      hash
     end
-    counts.keys.sort.each {|key| @io.say "#{counts[key]} #{key.inspect}"}
+
+    values << {'count' => total} unless counts.size == 1
+
+    formatter = Cardigan::TextReportFormatter.new @io
+    grouping_fields.each_with_index {|grouping_field,index| formatter.add_column(grouping_field, lengths[index])}
+    formatter.add_column('count', 0)
+    formatter.output values, :suppress_index => true
   end
 end

data/lib/cardigan/command/total_cards.rb

@@ -1,3 +1,6 @@
+require 'cardigan/context'
+require 'cardigan/text_report_formatter'
+
 class Cardigan::Command::TotalCards
   def initialize repository, io
     @repository, @io = repository, io
@@ -6,11 +9,21 @@ class Cardigan::Command::TotalCards
   def execute text
     count_field, *grouping_fields = text.scan(/\w+/)
     counts = {}
-    @repository.cards.each do |card|
-      key = grouping_fields.map {|key| card[key] ? card[key] : ''}
+    @repository.each do |card|
+      key = grouping_fields.map {|grouping_field| card[grouping_field] ? card[grouping_field] : ''}
       value = card[count_field].to_i
       counts[key] = counts[key] ? counts[key] + value : value
     end
-    counts.keys.sort.each {|key| @io.say "#{counts[key]} #{key.inspect}"}
+
+    values = counts.keys.sort.map do |key|
+      hash = {count_field => counts[key]}
+      grouping_fields.each_with_index {|grouping_field,index| hash[grouping_field] = key[index] }
+      hash
+    end
+
+    formatter = Cardigan::TextReportFormatter.new @io
+    grouping_fields.each {|grouping_field| formatter.add_column(grouping_field, 0)}
+    formatter.add_column(count_field, 0)
+    formatter.output values, :suppress_index => true
   end
 end

data/lib/cardigan/text_report_formatter.rb

@@ -1,36 +1,41 @@
 module Cardigan
   class TextReportFormatter
+    INDEX_HEADING = 'index'
+    
     def initialize io
       @io = io
       @columns = []
-      @heading = 'index'
-      @width = 2 + @heading.length + 1
     end
 
     def add_column name, length
       longer = [name.length, length].max
       @columns << [name, longer]
-      @width += longer + 3
     end
 
-    def output hashes
-      hline
-      row 'index', @columns.map {|tuple| tuple.first }
-      hline
+    def output hashes, options={}
+      return if @columns.empty?
+      width = calculate_width(options[:suppress_index])
+      hline width
+      row INDEX_HEADING, @columns.map {|tuple| tuple.first }, options[:suppress_index]
+      hline width
       hashes.each_with_index do |h,i|
-        first = (i+1).to_s
-        values = @columns.map {|tuple| h[tuple.first]}
-        row first, values 
+        row (i+1).to_s, @columns.map {|tuple| h[tuple.first]}, options[:suppress_index]
       end
-      hline
+      hline width
     end
 private
-    def hline
-      @io.say ' ' + '-' * @width
+    def hline width
+      @io.say ' ' + '-' * (width - 2)
     end
 
-    def row first, values
-      a = "| #{first.ljust(@heading.length)} | "      
+    def calculate_width suppress_index
+      width = suppress_index ? 1 : INDEX_HEADING.length + 4
+      @columns.each {|column| width += column[1] + 3}
+      width
+    end
+
+    def row first, values, suppress_index
+      a = suppress_index ? "|" : "| #{first.ljust(INDEX_HEADING.length)} |"      
       @columns.each_with_index do |tuple, index|
         a << " #{values[index].to_s.ljust(tuple[1])} |"
       end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cardigan
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Mark Ryall
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +11:00
+date: 2010-04-10 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: |
   A command line utility that manages cards as individual files so that they can be added to a version control system
 
@@ -92,18 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: command line utility for managing cards (tasks, bugs, stories or whatever)