cardigan 0.0.6 → 0.0.7

data/README.rdoc

@@ -70,4 +70,4 @@ In case this documentation makes no sense at all, a few usage scenarios can be f
 
 == Future plans
 
-Refer to the .cards for detailed story breakdown but importing, exporting, automatic vcs interaction and generating pretty html reports/charts seem to be the most important missing features.
+Refer to the .cards for detailed story breakdown but automatic vcs interaction and generating pretty html reports/charts seem to be the most important missing features.

data/lib/cardigan/command/filter_cards.rb

@@ -1,19 +1,13 @@
-module Cardigan
-  module Command
-    class FilterCards
-      def initialize repository, io
-        @repository, @io = repository, io
-      end
+require 'cardigan/command/list_cards'
 
-      def execute filter
-        @repository.filter = filter
-        begin
-          @io.say "#{@repository.cards.length} cards match filter"
-        rescue Exception => e
-          @io.say "Invalid expression:\n#{e.message}"
-          @repository.filter = nil
-        end
-      end
+class Cardigan::Command::FilterCards < Cardigan::Command::ListCards
+  def execute filter
+    @repository.filter = filter
+    begin
+      super
+    rescue Exception => e
+      @io.say "Invalid expression:\n#{e.message}"
+      @repository.filter = nil
     end
   end
 end

data/lib/cardigan/command/list_cards.rb

@@ -1,14 +1,20 @@
 require 'cardigan/text_report_formatter'
-require 'cardigan/command/display_cards'
 
 class Cardigan::Command::ListCards
-  include Cardigan::Command::DisplayCards
-
   def initialize repository, io
     @repository, @io = repository, io
   end
 
   def execute text
-    display_cards
+    cards = @repository.cards
+    if cards.empty?
+      @io.say "There are no cards to display"
+      return
+    end
+    formatter = Cardigan::TextReportFormatter.new @io
+    @repository.display_columns.each do |column|
+      formatter.add_column(column, @repository.max_field_length(column))
+    end
+    formatter.output cards
   end
 end

data/lib/cardigan/command/specify_display_columns.rb

@@ -1,16 +1,10 @@
-require 'cardigan/command/display_cards'
-
-class Cardigan::Command::SpecifyDisplayColumns
-  include Cardigan::Command::DisplayCards
-
-  def initialize repository, io
-    @repository, @io = repository, io
-  end
+require 'cardigan/command/list_cards'
 
+class Cardigan::Command::SpecifyDisplayColumns < Cardigan::Command::ListCards
   def execute text
     if text
       @repository.display_columns = text.scan(/\w+/)
-      display_cards
+      super
     else
       @io.say "current columns: #{@repository.display_columns.join(',')}"
       @io.say "available columns: #{@repository.columns.sort.join(',')}"

data/lib/cardigan/command/specify_sort_columns.rb

@@ -1,16 +1,10 @@
-require 'cardigan/command/display_cards'
-
-class Cardigan::Command::SpecifySortColumns
-  include Cardigan::Command::DisplayCards
-
-  def initialize repository, io
-    @repository, @io = repository, io
-  end
+require 'cardigan/command/list_cards'
 
+class Cardigan::Command::SpecifySortColumns < Cardigan::Command::ListCards
   def execute text
     if text
       @repository.sort_columns = text.scan(/\w+/)
-      display_cards
+      super
     else
       @io.say "current columns: #{@repository.sort_columns.join(',')}"
       @io.say "available columns: #{@repository.columns.sort.join(',')}"

data/lib/cardigan/command/unfilter_cards.rb

@@ -1,13 +1,8 @@
-module Cardigan
-  module Command
-    class UnfilterCards
-      def initialize repository
-        @repository = repository
-      end
+require 'cardigan/command/list_cards'
 
-      def execute ignored
-        @repository.filter = nil
-      end
-    end
+class Cardigan::Command::UnfilterCards < Cardigan::Command::ListCards
+  def execute filter
+    @repository.filter = nil
+    super
   end
 end

data/lib/cardigan/entry_context.rb

@@ -16,7 +16,8 @@ module Cardigan
 
     def refresh_commands
       status = @entry['status'] || 'none'
-      @workflow_repository.load[status].map { |s| "now #{s}" }
+      next_statuses = @workflow_repository.load[status]
+      next_statuses ? next_statuses.map { |s| "now #{s}" } : []
     end
   end
 end

data/lib/cardigan/root_context.rb

@@ -19,7 +19,7 @@ module Cardigan
         'set' => command(:batch_update_cards, @repository, @io),
         'sort' => command(:specify_sort_columns, @repository, @io),
         'unclaim' => command(:unclaim_cards, @repository, @io),
-        'unfilter' => command(:unfilter_cards, @repository),
+        'unfilter' => command(:unfilter_cards, @repository, @io),
         'workflow' => command(:open_workflow, @workflow_repository, @io),
         'count' => command(:count_cards, @repository, @io),
         'total' => command(:total_cards, @repository, @io),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cardigan
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Mark Ryall
@@ -52,7 +52,6 @@ files:
 - lib/cardigan/command/count_cards.rb
 - lib/cardigan/command/create_card.rb
 - lib/cardigan/command/destroy_cards.rb
-- lib/cardigan/command/display_cards.rb
 - lib/cardigan/command/export_cards.rb
 - lib/cardigan/command/filter_cards.rb
 - lib/cardigan/command/import_cards.rb

data/lib/cardigan/command/display_cards.rb

@@ -1,14 +0,0 @@
-module Cardigan::Command::DisplayCards
-  def display_cards
-    cards = @repository.cards
-    if cards.empty?
-      @io.say "There are no cards to display"
-      return
-    end
-    formatter = Cardigan::TextReportFormatter.new @io
-    @repository.display_columns.each do |column|
-      formatter.add_column(column, @repository.max_field_length(column))
-    end
-    formatter.output cards
-  end
-end