troo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4196fd2c2819ea9e6444d5095a58d98de11f2b97
-  data.tar.gz: 27e689c2d9d704d975e22fcb8706e15301ec4788
+  metadata.gz: e1de45a5c35b2b5698fcbc2770107afc4a778f3b
+  data.tar.gz: 5bf9a0b9ea0fabdf6f5f13ec79574b7cdbedefc2
 SHA512:
-  metadata.gz: 1b753a287582cb83a7ef43e8f2ca55adfbb69025eee8c756acb55a5c2df42b3dc1b25fe976d96faa50be0b184efdda23e5582cd7bea6fc75124e72eb33753a0a
-  data.tar.gz: 99a457435748022541e62d94a4cfc6c9ba1d4ccc934946313318fd646f7eb40efbe9e94131631b49ce384523aa22e82791d294a3cc6b7d9793ed8686ffcfd320
+  metadata.gz: b6717b3614403eca4d24879498a8d4219e3f48383c071b4875b7fa144fdebe02141de7bc75e7d39f563c4fd90b0377af3adda9f48c020b4efc275f7cfecdd035
+  data.tar.gz: 8e49b3e4758f173266b0b3fb91e2af0bd70994652a4c6e9f9dbd4c39c6d87e75ecc0a7f52071511ea6e93ccc21b8bb98fad7ada2de4acb80e4437fb75e85704d

data/lib/troo/actions/create_board.rb

@@ -21,7 +21,7 @@ module Troo
     attr_reader :name, :description
 
     def update_boards
-      return Troo::BoardPersistence.for(create_board) if create_board
+      return BoardPersistence.for(create_board) if create_board
       false
     end
 

data/lib/troo/actions/create_card.rb

@@ -20,7 +20,7 @@ module Troo
     attr_reader :list, :name, :description
 
     def update_cards
-      return Troo::CardPersistence.for(create_card) if create_card
+      return CardPersistence.for(create_card) if create_card
       false
     end
 

data/lib/troo/actions/create_comment.rb

@@ -19,7 +19,7 @@ module Troo
     attr_reader :card, :comment
 
     def update_comments
-      return Troo::CommentPersistence.for(parsed_json_response) if parsed_json_response
+      return CommentPersistence.for(parsed_json_response) if parsed_json_response
       false
     end
 

data/lib/troo/actions/create_list.rb

@@ -19,7 +19,7 @@ module Troo
     attr_reader :board, :name
 
     def update_lists
-      return Troo::ListPersistence.for(create_list) if create_list
+      return ListPersistence.for(create_list) if create_list
       false
     end
 

data/lib/troo/cli/add_cli.rb

@@ -10,8 +10,8 @@ module Troo
           name = ask("Please enter a name for this board:")
         end
 
-        if result = Troo::CreateBoard.with(name, description)
-          say "New board '#{result.name}' created."
+        if result = CreateBoard.with(name, description)
+          say "New board '#{result.decorator.name}' created."
         else
           say "Board could not be created."
         end
@@ -26,9 +26,9 @@ module Troo
           name = ask("Please enter a name for this card:")
         end
 
-        if list = Troo::ListRetrieval.retrieve(list_id)
-          if result = Troo::CreateCard.for(list, name, description)
-            say "New card '#{result.name}' created."
+        if list = ListRetrieval.retrieve(list_id)
+          if result = CreateCard.for(list, name, description)
+            say "New card '#{result.decorator.name}' created."
           else
             say "Card could not be created."
           end
@@ -46,8 +46,8 @@ module Troo
           comment = ask("Please enter a comment:")
         end
 
-        if card = Troo::CardRetrieval.retrieve(card_id)
-          if Troo::CreateComment.for(card, comment)
+        if card = CardRetrieval.retrieve(card_id)
+          if CreateComment.for(card, comment)
             say "New comment created."
           else
             say "Comment could not be created."
@@ -66,9 +66,9 @@ module Troo
           name = ask("Please enter a name for this list:")
         end
 
-        if board = Troo::BoardRetrieval.retrieve(board_id)
-          if result = Troo::CreateList.for(board, name)
-            say "New list '#{result.name}' created."
+        if board = BoardRetrieval.retrieve(board_id)
+          if result = CreateList.for(board, name)
+            say "New list '#{result.decorator.name}' created."
           else
             say "List could not be created."
           end

data/lib/troo/cli/cli_helpers.rb

@@ -0,0 +1,34 @@
+module Troo
+  module CLI
+    module Helpers
+      def set_default
+        return success if resource && resource.set_default!
+        not_found
+      end
+
+      def success
+        say "'#{resource.decorator.name}' set as default #{type.to_s.downcase}."
+        true
+      end
+
+      def not_found
+        say "#{type.to_s.capitalize} cannot be found. Specify a different <id> or use 'troo default #{type.to_s} <id>' to set a default #{type.to_s} first."
+        false
+      end
+
+      def resource
+        @resource = case type
+        when :board then @board ||= BoardRetrieval.retrieve(id)
+        when :list  then @list  ||= ListRetrieval.retrieve(id)
+        when :card  then @card  ||= CardRetrieval.retrieve(id)
+        end
+      end
+    end
+
+    class ThorFixes < Thor
+      def self.banner(command, namespace = nil, subcommand = false)
+        "#{basename} #{@package_name} #{command.usage}"
+      end
+    end
+  end
+end

data/lib/troo/cli/default_cli.rb

@@ -1,45 +1,31 @@
 module Troo
   module CLI
     class Default < ThorFixes
+      include Helpers
+
       package_name "default"
 
       desc "board <id>", "Set the board <id> to default."
       def board(id)
-        set_default(id, :board)
+        initialize_and_dispatch(id, :board)
       end
 
       desc "card <id>", "Set the card <id> to default."
       def card(id)
-        set_default(id, :card)
+        initialize_and_dispatch(id, :card)
       end
 
       desc "list <id>", "Set the list <id> to default."
       def list(id)
-        set_default(id, :list)
+        initialize_and_dispatch(id, :list)
       end
 
       private
+      attr_reader :id, :type
 
-      def set_default(id, type)
+      def initialize_and_dispatch(id, type)
         @id, @type = id, type
-        return success(resource.name) if SetDefault.for(resource)
-        not_found
-      end
-
-      def resource
-        @resource ||= case @type
-        when :board then Troo::BoardRetrieval.retrieve(@id)
-        when :list  then Troo::ListRetrieval.retrieve(@id)
-        when :card  then Troo::CardRetrieval.retrieve(@id)
-        end
-      end
-
-      def success(resource_name = "")
-        say "'#{resource_name}' set as default #{@type.to_s.downcase}."
-      end
-
-      def not_found
-        say "#{@type.to_s.capitalize} cannot be found."
+        set_default
       end
     end
   end

data/lib/troo/cli/main_cli.rb

@@ -1,62 +1,23 @@
 module Troo
   module CLI
     class Main < ThorFixes
+      include Helpers
+
       default_task :status
 
       class_option :debug, type: :boolean, desc: "Enable debugging."
 
       desc "status", "Get troo status."
       def status
-        board_count = Troo::Board.count
-        list_count  = Troo::List.count
-        card_count  = Troo::Card.count
-
-        if board_count > 0
-          if board = Troo::BoardRetrieval.default
-            say "Board: #{BoardDecorator.new(board).short}"
-          else
-            say "Board: No default set."
-          end
-        else
-          say "No local board data."
-        end
-
-        if list_count > 0
-          if list = Troo::ListRetrieval.default
-            say "List: #{ListDecorator.new(list).short}"
-          else
-            say "List: No default set."
-          end
-        else
-          say "No local list data."
-        end
-
-        if card_count > 0
-          if card = Troo::CardRetrieval.default
-            say "Card: #{CardDecorator.new(card).short}"
-          else
-            say "Card: No default set."
-          end
-        else
-          say "No local card data."
-        end
-
-        puts [plural(board_count, "board"),
-              plural(list_count, "list"),
-              plural(card_count, "card") ].join(", ")
-        puts
+        say "Status:"
+        get_status(:board)
+        get_status(:list)
+        get_status(:card)
+        say ""
 
         help
       end
 
-      private
-
-      def plural(size, singular)
-        (size == 1) ? "#{size} #{singular}" : "#{size} #{singular}s"
-      end
-
-      public
-
       desc "refresh", "Refresh all data for default board."
       method_option :all, type: :boolean, desc: "Refresh all boards, lists, cards and comments."
       method_option :lists, type: :boolean, desc: "Refresh all lists for default board."
@@ -66,7 +27,7 @@ module Troo
           RefreshAll.all(nil, options)
           say "All local data has been refreshed."
         else
-          if board = Troo::BoardRetrieval.default
+          if board = BoardRetrieval.default
             if options["lists"]
               RefreshAll.lists(board, options)
               say "All lists for the default board have been refreshed."
@@ -109,10 +70,10 @@ module Troo
 
       desc "move <card_id> <list_id>", "Move a card <card_id> to list <list_id>."
       def move(card_id, list_id)
-        if card = Troo::CardRetrieval.retrieve(card_id)
-          if list = Troo::ListRetrieval.retrieve(list_id)
+        if card = CardRetrieval.retrieve(card_id)
+          if list = ListRetrieval.retrieve(list_id)
             if result = MoveCard.with(card, list)
-              say "Card moved from '#{card.list.name}' to '#{list.name}'."
+              say "Card moved from '#{card.list.decorator.name}' to '#{list.decorator.name}'."
             else
               say "Card could not be moved."
             end
@@ -125,6 +86,47 @@ module Troo
       rescue Troo::InvalidAccessToken
         say "Your Trello access credentials have expired, please renew and try again."
       end
+
+      private
+      attr_reader :id, :type
+
+      def get_status(type)
+        @id, @type = nil, type
+        return show             if resource_found && resource
+        return no_default_found if resource_count > 0
+      end
+
+      def resource_found
+        label = "  #{type.to_s.capitalize}s:".ljust(10)
+        say label + plural(resource_count, type.to_s) + " found."
+      end
+
+      def resource_count
+        @count = case type
+        when :board then Troo::Board.count
+        when :list  then Troo::List.count
+        when :card  then Troo::Card.count
+        end
+      end
+
+      def show
+        say "          #{resource.decorator.title}"
+      end
+
+      def no_default_found
+        say "          " + Esc.red + "No default #{type} set." + Esc.reset
+      end
+
+      def plural(size, singular)
+        pluralized = singular + "s"
+        if size == 0
+          "No #{pluralized}"
+        elsif size == 1
+          "#{size} #{singular}"
+        else
+          "#{size} #{pluralized}"
+        end
+      end
     end
   end
 end

data/lib/troo/cli/show_cli.rb

@@ -1,11 +1,13 @@
 module Troo
   module CLI
     class Show < ThorFixes
+      include Helpers
+
       package_name "show"
 
       desc "boards", "Show all the boards with lists."
       def boards
-        boards = Troo::BoardRetrieval.all
+        boards = BoardRetrieval.all
         if boards.any?
           boards.map do |board|
             BoardPresenter.render_all(board)
@@ -15,69 +17,48 @@ module Troo
         end
       end
 
-      desc "board (<board_id>)", "Show lists and cards for board <board_id> (uses default board if <board_id> not provided)."
-      def board(board_id = nil)
-        if board = Troo::BoardRetrieval.retrieve(board_id)
-          if SetDefault.for(board)
-            say "'#{board.name}' set to default."
-          end
-          BoardPresenter.render_show(board)
-        else
-          if board_id
-            say "Board not found."
-          else
-            say "Specify a <board_id> or use 'troo default board <board_id>' to set a default board first."
-          end
-        end
+      desc "board (<id>)", "Show lists and cards for board <id> (uses default board if <id> not provided)."
+      def board(id = nil)
+        initialize_and_dispatch(id, :board)
       end
 
-      desc "list (<list_id>)", "Show all cards for list <list_id> (uses default list if <list_id> not provided)."
-      def list(list_id = nil)
-        if list = Troo::ListRetrieval.retrieve(list_id)
-          if SetDefault.for(list)
-            say "'#{list.name}' set to default."
-          end
-          ListPresenter.render_show(list)
-        else
-          if list_id
-            say "List not found."
-          else
-            say "Specify a <list_id> or use 'troo default list <list_id>' to set a default list first."
-          end
-        end
+      desc "list (<id>)", "Show all cards for list <id> (uses default list if <id> not provided)."
+      def list(id = nil)
+        initialize_and_dispatch(id, :list)
       end
 
-      desc "card (<card_id>)", "Show a card including latest 3 comments for card <card_id> (uses default card if <card_id> not provided)."
-      def card(card_id = nil)
-        if card = Troo::CardRetrieval.retrieve(card_id)
-          if SetDefault.for(card)
-            say "'#{card.name}' set to default."
-          end
-          CardPresenter.render_show(card)
-        else
-          if card_id
-            say "Card not found."
-          else
-            say "Specify a <card_id> or use 'troo default card <card_id>' to set a default card first."
-          end
-        end
+      desc "card (<id>)", "Show a card including latest 3 comments for card <id> (uses default card if <id> not provided)."
+      def card(id = nil)
+        initialize_and_dispatch(id, :card)
       end
 
-      desc "comments (<card_id>)", "Show all comments for card <card_id> (uses default card if <card_id> not provided)."
-      def comments(card_id = nil)
-        if card = Troo::CardRetrieval.retrieve(card_id)
+      desc "comments (<id>)", "Show all comments for card <id> (uses default card if <id> not provided)."
+      def comments(id = nil)
+        if card = CardRetrieval.retrieve(id)
           if SetDefault.for(card)
-            say "'#{card.name}' set to default."
+            say "'#{card.decorator.name}' set to default."
           end
-          CommentPresenter.render_show(card)
+          CommentPresenter.show(card)
         else
-          if card_id
-            say "Card not found."
+          if id
+            say "Card cannot be found."
           else
-            say "Specify a <card_id> or use 'troo default card <card_id>' to set a default card first."
+            say "Specify a <id> or use 'troo default card <id>' to set a default card first."
           end
         end
       end
+
+      private
+      attr_reader :id, :type
+
+      def initialize_and_dispatch(id, type)
+        @id, @type = id, type
+        show_resource
+      end
+
+      def show_resource
+        resource.presenter.show if set_default
+      end
     end
   end
 end

data/lib/troo/display/board_decorator.rb

@@ -40,6 +40,10 @@ module Troo
       board.id.to_s
     end
 
+    def lists(alt_options = {})
+      board.lists.map { |list| list.decorator(alt_options) }
+    end
+
     private
     attr_reader :board
 

data/lib/troo/display/board_presenter.rb

@@ -5,8 +5,8 @@ module Troo
         new(board, options).render_all
       end
 
-      def render_show(board, options = {})
-        new(board, options).render_show
+      def show(board, options = {})
+        new(board, options).show
       end
     end
 
@@ -18,48 +18,54 @@ module Troo
     end
 
     def render_all
-      spacing({foot: false}) do
-        print BoardDecorator.new(board).short
-
-        if board.lists.any?
-          board.lists.each do |list|
-            indent do
-              print ListDecorator.new(list).short
-            end
-          end
-        else
-          print_error "No lists were found.\n"
+      puts board.decorator.title
+
+      print_error "No lists were found." if lists.empty?
+
+      print_lists
+    end
+
+    def show
+      puts board.decorator.title
+
+      print_error "No lists were found." if lists.empty?
+
+      print_lists_with_cards
+    end
+
+    private
+    attr_reader :board
+
+    def print_lists_with_cards
+      lists.each do |list|
+        title_for(list)
+
+        print_error "No cards were found." if list.cards.empty?
+
+        list.cards(unformatted).each do |card|
+          title_for(card)
         end
       end
+      puts
     end
 
-    def render_show
-      spacing do
-        print BoardDecorator.new(board).short
-
-        if board.lists.any?
-          board.lists.each do |list|
-            indent do
-              print ListDecorator.new(list).short
-
-              if list.cards.any?
-                list.cards.each do |card|
-                  indent do
-                    print CardDecorator.new(card).short
-                  end
-                end
-              else
-                print_error "No cards were found."
-              end
-            end
-          end
-        else
-          print_error "No lists were found."
-        end
+    def print_lists
+      lists.each do |list|
+        title_for(list)
       end
+      puts
     end
 
-    private
-    attr_reader :board
+    def lists
+      board.decorator.lists
+    end
+
+    def unformatted
+      {
+        ansicolor: false,
+        colour:    nil,
+        underline: nil
+      }
+    end
   end
 end

data/lib/troo/display/card_decorator.rb

@@ -11,11 +11,6 @@ module Troo
       [default_str, id_str, name_str].join + "\n"
     end
 
-    def title
-      title_options = { ansicolor: true, colour: Esc.green, underline: Esc.underline }
-      highlight([default, brackets(id), name].join(" "), title_options)
-    end
-
     def name_str
       highlight(name, options)
     end
@@ -61,7 +56,7 @@ module Troo
 
     def members
       if card.members.any?
-        MemberPresenter.new(card).render_show
+        MemberPresenter.new(card).show
       else
         "No members have been assigned."
       end
@@ -72,11 +67,11 @@ module Troo
     end
 
     def board
-      BoardDecorator.new(card.board, options).short
+      card.board.decorator(options).short
     end
 
     def list
-      ListDecorator.new(card.list, options).short
+      card.list.decorator(options).short
     end
 
     private
@@ -88,18 +83,18 @@ module Troo
 
     def defaults
       {
-        ansicolor: false,
-        colour:    nil,
-        underline: nil
+        ansicolor: true,
+        colour:    Esc.magenta,
+        underline: Esc.underline
       }
     end
 
     def decorated_recent_comments
-      card.recent_comments.map { |comment| CommentDecorator.new(comment).as_view }.join
+      card.recent_comments.map { |comment| comment.decorator.as_view }.join
     end
 
     def decorated_all_comments
-      card.comments.map { |comment| CommentDecorator.new(comment).as_view }.join
+      card.comments.map { |comment| comment.decorator.as_view }.join
     end
   end
 end

data/lib/troo/display/card_presenter.rb

@@ -1,8 +1,8 @@
 module Troo
   class CardPresenter
     class << self
-      def render_show(card, options = {})
-        new(card, options).render_show
+      def show(card, options = {})
+        new(card, options).show
       end
     end
 
@@ -13,7 +13,7 @@ module Troo
       @options = options
     end
 
-    def render_show
+    def show
       print Template.parse(decorated_card, "/../views/card.erb")
     end
 
@@ -21,7 +21,7 @@ module Troo
     attr_reader :card
 
     def decorated_card
-      @decorated_card ||= CardDecorator.new(card)
+      @decorated_card ||= card.decorator
     end
   end
 end

data/lib/troo/display/comment_decorator.rb

@@ -2,8 +2,9 @@ module Troo
   class CommentDecorator
     include DecoratorHelpers
 
-    def initialize(comment)
+    def initialize(comment, options = {})
       @comment = comment
+      @options = options
     end
 
     def as_view