3llo 1.0.0.pre.rc.0 → 1.3.1.pre.rc.0

data/lib/3llo/command/card/edit.rb

@@ -0,0 +1,33 @@
+module Tr3llo
+  module Command
+    module Card
+      module Edit
+        extend self
+
+        def execute(card_key)
+          card_id = Entities.parse_id(:card, card_key)
+          assert_card_id!(card_id, card_key)
+
+          card = API::Card.find(card_id)
+
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            name = interface.input.ask("Name:", required: true, value: card.name)
+            description = interface.input.ask("Description:", value: card.description)
+
+            API::Card.update(card_id, {"name" => name, "desc" => description})
+
+            interface.puts("Card has been updated.")
+          end
+        end
+
+        private
+
+        def assert_card_id!(card_id, key)
+          raise InvalidArgumentError.new("#{key.inspect} is not a valid list key") unless card_id
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/card/move.rb

@@ -23,9 +23,9 @@ module Tr3llo
         def select_list(interface, board_id)
           list_options =
             API::List
-            .find_all_by_board(board_id)
-            .map { |list| [list.name, list.id] }
-            .to_h()
+              .find_all_by_board(board_id)
+              .map { |list| [list.name, list.id] }
+              .to_h()
 
           interface.input.select(
             "Choose the list to be moved to",
@@ -33,10 +33,6 @@ module Tr3llo
           )
         end
 
-        def move_card!(card_id, list_id)
-          API::Card.move_to_list(card_id, list_id)
-        end
-
         def assert_card_id!(card_id, key)
           raise InvalidArgumentError.new("#{key.inspect} is not a valid card key") unless card_id
         end

data/lib/3llo/command/card/self_assign.rb

@@ -8,7 +8,7 @@ module Tr3llo
           card_id = Entities.parse_id(:card, key)
           assert_card_id!(card_id, key)
 
-          card = assign_card(card_id, user_id)
+          assign_card(card_id, user_id)
 
           interface = Application.fetch_interface!()
 
@@ -21,7 +21,7 @@ module Tr3llo
 
         def assign_card(card_id, user_id)
           card = API::Card.find(card_id)
-          members = card.members.map { |member| member.id } + [user_id]
+          members = card.members.map(&:id) + [user_id]
 
           API::Card.assign_members(card_id, members)
         end

data/lib/3llo/command/card.rb

@@ -1,22 +1,4 @@
-require '3llo/command/card/list'
-require '3llo/command/card/list_mine'
-require '3llo/command/card/show'
-require '3llo/command/card/move'
-require '3llo/command/card/self_assign'
-require '3llo/command/card/assign'
-require '3llo/command/card/invalid'
-require '3llo/command/card/comments'
-require '3llo/command/card/comment'
-require '3llo/command/card/add'
-require '3llo/command/card/archive'
-require '3llo/command/card/add_checklist'
-require '3llo/command/card/edit_checklist'
-require '3llo/command/card/remove_checklist'
-require '3llo/command/card/add_item'
-require '3llo/command/card/check_item'
-require '3llo/command/card/uncheck_item'
-require '3llo/command/card/edit_item'
-require '3llo/command/card/remove_item'
+Tr3llo::Utils.require_directory(File.dirname(__FILE__) + "/card/*.rb")
 
 module Tr3llo
   module Command
@@ -25,104 +7,111 @@ module Tr3llo
 
       def execute(subcommand, args)
         case subcommand
-        when 'list'
-          is_mine, _ = *args
+        when "list"
           board = Application.fetch_board!()
 
-          if is_mine == 'mine'
-            user = Application.fetch_user!()
-            Command::Card::ListMine.execute(board[:id], user[:id])
-          elsif is_mine.nil?
-            Command::Card::List.execute(board[:id])
-          else
-            command_string = "card list #{is_mine}"
-            raise InvalidArgumentError.new("#{command_string.inspect} is not a valid command")
-          end
-        when 'add'
+          Command::Card::List.execute(board.id)
+        when "list-mine"
+          board = Application.fetch_board!()
+          user = Application.fetch_user!()
+
+          Command::Card::ListMine.execute(board.id, user.id)
+        when "add"
           board = Application.fetch_board!()
           Command::Card::Add.execute(board[:id])
-        when 'show'
-          card_key, _ = args
+        when "show"
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::Show.execute(card_key)
-        when 'comments'
-          card_key, _ = args
+        when "edit"
+          card_key, = args
+          Utils.assert_string!(card_key, "card key is missing")
+
+          Command::Card::Edit.execute(card_key)
+        when "comments"
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::Comments.execute(card_key)
-        when 'comment'
-          card_key, _ = args
+        when "comment"
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::Comment.execute(card_key)
-        when 'move'
+        when "move"
           board = Application.fetch_board!()
-          card_key, _ = args
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::Move.execute(card_key, board[:id])
-        when 'self-assign'
+        when "self-assign"
           user = Application.fetch_user!()
-          card_key, _ = args
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::SelfAssign.execute(card_key, user[:id])
-        when 'assign'
+        when "assign"
           board = Application.fetch_board!()
-          card_key, _ = args
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::Assign.execute(card_key, board[:id])
-        when 'archive'
-          card_key, _ = args
+        when "archive"
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::Archive.execute(card_key)
         when "add-checklist"
-          card_key, _ = args
+          card_key, = args
           Utils.assert_string!(card_key, "card key is missing")
 
           Command::Card::AddChecklist.execute(card_key)
         when "edit-checklist"
-          checklist_key, _ = args
+          checklist_key, = args
           Utils.assert_string!(checklist_key, "checklist key is missing")
 
           Command::Card::EditChecklist.execute(checklist_key)
         when "remove-checklist"
-          checklist_key, _ = args
+          checklist_key, = args
           Utils.assert_string!(checklist_key, "checklist key is missing")
 
           Command::Card::RemoveChecklist.execute(checklist_key)
         when "add-item"
-          checklist_key, _ = args
+          checklist_key, = args
           Utils.assert_string!(checklist_key, "checklist key is missing")
 
           Command::Card::AddItem.execute(checklist_key)
         when "check-item"
-          card_key, check_item_key, _ = args
+          card_key, check_item_key, = args
           Utils.assert_string!(card_key, "card key is missing")
           Utils.assert_string!(check_item_key, "item key is missing")
 
           Command::Card::CheckItem.execute(card_key, check_item_key)
         when "uncheck-item"
-          card_key, check_item_key, _ = args
+          card_key, check_item_key, = args
           Utils.assert_string!(card_key, "card key is missing")
           Utils.assert_string!(check_item_key, "item key is missing")
 
           Command::Card::UncheckItem.execute(card_key, check_item_key)
         when "edit-item"
-          card_key, check_item_key, _ = args
+          card_key, check_item_key, = args
           Utils.assert_string!(card_key, "card key is missing")
           Utils.assert_string!(check_item_key, "item key is missing")
 
           Command::Card::EditItem.execute(card_key, check_item_key)
         when "remove-item"
-          card_key, check_item_key, _ = args
+          card_key, check_item_key, = args
           Utils.assert_string!(card_key, "card key is missing")
           Utils.assert_string!(check_item_key, "item key is missing")
 
           Command::Card::RemoveItem.execute(card_key, check_item_key)
+        when "add-label"
+          board = Application.fetch_board!()
+          card_key, = args
+          Utils.assert_string!(card_key, "card key is missing")
+
+          Command::Card::AddLabel.execute(card_key, board[:id])
         else
           handle_invalid_subcommand(subcommand, args)
         end

data/lib/3llo/command/label/add.rb

@@ -0,0 +1,22 @@
+module Tr3llo
+  module Command
+    module Label
+      module Add
+        extend self
+
+        def execute(board_id)
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            name = interface.input.ask("Name:", required: true)
+            color = interface.input.select("Choose the color:", Utils::TRELLO_LABEL_COLOR)
+
+            API::Label.create(name: name, color: color, board_id: board_id)
+
+            interface.puts("Label has been created.")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/label/edit.rb

@@ -0,0 +1,37 @@
+module Tr3llo
+  module Command
+    module Label
+      module Edit
+        extend self
+
+        def execute(label_key)
+          label_id = Entities.parse_id(:label, label_key)
+          assert_label_id!(label_id, label_key)
+
+          label = API::Label.find(label_id)
+
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            name = interface.input.ask("Name:", required: true, value: label.name)
+            color = interface.input.select(
+              "Choose the color:",
+              Utils::TRELLO_LABEL_COLOR,
+              default: Utils::TRELLO_LABEL_COLOR.index(label.color)
+            )
+
+            API::Label.update(label_id, {"name" => name, "color" => color})
+
+            interface.puts("Label has been updated.")
+          end
+        end
+
+        private
+
+        def assert_label_id!(label_id, key)
+          raise InvalidArgumentError.new("#{key.inspect} is not a valid label key") unless label_id
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/label/invalid.rb

@@ -0,0 +1,18 @@
+module Tr3llo
+  module Command
+    module Label
+      module Invalid
+        extend self
+
+        def execute(message)
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            interface.print_error(message)
+            interface.puts(View::Label::Help.render())
+          end
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/label/list.rb

@@ -0,0 +1,18 @@
+module Tr3llo
+  module Command
+    module Label
+      module List
+        extend self
+
+        def execute(board_id)
+          interface = Application.fetch_interface!()
+          labels = API::Label.find_all_by_board(board_id)
+
+          interface.print_frame do
+            interface.puts(View::Label::List.render(labels))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/label/remove.rb

@@ -0,0 +1,28 @@
+module Tr3llo
+  module Command
+    module Label
+      module Remove
+        extend self
+
+        def execute(label_key)
+          label_id = Entities.parse_id(:label, label_key)
+          assert_label_id!(label_id, label_key)
+
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            API::Label.delete(label_id)
+
+            interface.puts("Label has been deleted.")
+          end
+        end
+
+        private
+
+        def assert_label_id!(label_id, key)
+          raise InvalidArgumentError.new("#{key.inspect} is not a valid label key") unless label_id
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/label.rb

@@ -0,0 +1,47 @@
+Tr3llo::Utils.require_directory(File.dirname(__FILE__) + "/label/*.rb")
+
+module Tr3llo
+  module Command
+    module Label
+      extend self
+
+      def execute(subcommand, args)
+        case subcommand
+        when "list"
+          board = Application.fetch_board!()
+
+          Command::Label::List.execute(board[:id])
+        when "add"
+          board = Application.fetch_board!()
+
+          Command::Label::Add.execute(board[:id])
+        when "edit"
+          label_key, = args
+          Utils.assert_string!(label_key, "label key is missing")
+
+          Command::Label::Edit.execute(label_key)
+        when "remove"
+          label_key, = args
+          Utils.assert_string!(label_key, "label key is missing")
+
+          Command::Label::Remove.execute(label_key)
+        else
+          handle_invalid_subcommand(subcommand, args)
+        end
+      rescue InvalidArgumentError, InvalidCommandError, BoardNotSelectedError => exception
+        Command::Label::Invalid.execute(exception.message)
+      end
+
+      private
+
+      def handle_invalid_subcommand(subcommand, _args)
+        case subcommand
+        when String
+          raise InvalidCommandError.new("#{subcommand.inspect} is not a valid command")
+        when NilClass
+          raise InvalidCommandError.new("command is missing")
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/list/add.rb

@@ -0,0 +1,21 @@
+module Tr3llo
+  module Command
+    module List
+      module Add
+        extend self
+
+        def execute(board_id)
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            name = interface.input.ask("Name:", required: true)
+
+            API::List.create(name, board_id)
+
+            interface.puts("List has been created.")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/3llo/command/list.rb

@@ -1,7 +1,4 @@
-require '3llo/command/list/list'
-require '3llo/command/list/cards'
-require '3llo/command/list/invalid'
-require '3llo/command/list/archive_cards'
+Tr3llo::Utils.require_directory(File.dirname(__FILE__) + "/list/*.rb")
 
 module Tr3llo
   module Command
@@ -10,17 +7,21 @@ module Tr3llo
 
       def execute(subcommand, args)
         case subcommand
-        when 'list'
+        when "list"
           board = Application.fetch_board!()
 
           Command::List::List.execute(board[:id])
-        when 'cards'
-          list_key, _ = args
+        when "add"
+          board = Application.fetch_board!()
+
+          Command::List::Add.execute(board[:id])
+        when "cards"
+          list_key, = args
           Utils.assert_string!(list_key, "list key is missing")
 
           Command::List::Cards.execute(list_key)
-        when 'archive-cards'
-          list_key, _ = args
+        when "archive-cards"
+          list_key, = args
           Utils.assert_string!(list_key, "list key is missing")
 
           Command::List::ArchiveCards.execute(list_key)

data/lib/3llo/command.rb

@@ -1,9 +1,10 @@
-require '3llo/command/board'
-require '3llo/command/card'
-require '3llo/command/list'
-require '3llo/command/help'
-require '3llo/command/exit'
-require '3llo/command/invalid'
+require "3llo/command/board"
+require "3llo/command/card"
+require "3llo/command/list"
+require "3llo/command/label"
+require "3llo/command/help"
+require "3llo/command/exit"
+require "3llo/command/invalid"
 
 module Tr3llo
   module Command
@@ -13,35 +14,67 @@ module Tr3llo
       build_command(command_buffer)
     end
 
+    def generate_suggestions(buffer, command_buffer)
+      commands = {
+        "board" => %w[add list select],
+        "list" => %w[list add cards archive-cards],
+        "card" => %w[
+          list show add edit archive list-mine move
+          comment comments self-assign assign
+          add-checklist edit-checklist remove-checklist
+          add-item edit-item remote-item check-item uncheck-item add-label
+        ],
+        "label" => %w[list add edit remove],
+        "help" => [],
+        "exit" => []
+      }
+
+      command, _subcommand, _args = parse_command(command_buffer)
+
+      if commands.has_key?(command)
+        subcommands = commands.fetch(command)
+
+        subcommands
+          .grep(/^#{Regexp.escape(buffer)}/)
+          .reject { |suggestion| suggestion == buffer }
+      else
+        commands.keys.grep(/^#{Regexp.escape(buffer)}/)
+      end
+    end
+
     private
 
     def build_command(command_string)
       command, subcommand, *args = parse_command(command_string)
 
       case command
-      when 'board'
+      when "board"
         Command::Board.execute(subcommand, args)
-      when 'card'
+      when "card"
         Command::Card.execute(subcommand, args)
-      when 'list'
+      when "list"
         Command::List.execute(subcommand, args)
-      when 'help'
+      when "label"
+        Command::Label.execute(subcommand, args)
+      when "help"
         Command::Help.execute()
-      when 'exit'
+      when "exit"
         Command::Exit.execute()
       else
         if command
-          raise InvalidCommandError.new("#{command.inspect} is not a valid command. Run #{"help".inspect} to display the document.")
+          raise InvalidCommandError.new(
+            "#{command.inspect} is not a valid command. Run #{"help".inspect} to display the document."
+          )
         else
           raise InvalidCommandError.new("command is missing")
         end
       end
-    rescue InvalidCommandError => exception
+    rescue InvalidCommandError, RemoteServer::RequestError => exception
       Command::Invalid.execute(exception.message)
     end
 
     def parse_command(command_string)
-      command_string.strip.split(' ')
+      command_string.strip.split(" ").map(&:strip)
     end
   end
 end

data/lib/3llo/controller.rb

@@ -1,37 +1,52 @@
-require 'readline'
+require "readline"
 
 module Tr3llo
   module Controller
     extend self
 
     def start(init_command)
-      list = %w(board card help list mine move select self-assign show)
-      auto_completion = proc { |s| list.grep( /^#{Regexp.escape(s)}/ ) }
-
       Readline.completion_append_character = " "
-      Readline.completion_proc = auto_completion
+      Readline.completion_proc = lambda { |buffer|
+        Command.generate_suggestions(buffer, Readline.line_buffer)
+      }
 
       interface = Application.fetch_interface!()
 
       if init_command && init_command != ""
-        interface.puts("Executing " + Utils.format_highlight(init_command) + " command")
-
-        execute_command!(init_command, interface)
+        init_commands = init_command.split(";")
+        init_commands.each do |cmd|
+          interface.puts("Executing " + Utils.format_highlight(cmd) + " command")
+          execute_command!(cmd)
+        end
       end
 
       loop do
-        command_buffer = Readline.readline("\e[15;48;5;27m 3llo \e[0m > ", true)
+        status_line = determine_status_line()
+        command_buffer = Readline.readline(status_line, true)
+        Command::Exit.execute() if command_buffer.nil?
 
-        execute_command!(command_buffer, interface)
+        execute_command!(command_buffer)
       end
     rescue Interrupt
       Command::Exit.execute()
     end
 
-    def execute_command!(command_buffer, interface)
+    private
+
+    def determine_status_line()
+      program_name = ["\e[15;48;5;27m 3llo \e[0m"]
+      board_name =
+        begin
+          ["\e[45m #{Application.fetch_board!().name} \e[0m"]
+        rescue BoardNotSelectedError
+          []
+        end
+
+      (program_name + board_name + [""]).join(" > ")
+    end
+
+    def execute_command!(command_buffer)
       Tr3llo::Command.execute(command_buffer.strip())
-    rescue Tr3llo::HTTP::Client::RequestError => e
-      interface.print_frame { interface.print_error(e.message) }
     end
   end
 end

data/lib/3llo/entities.rb

@@ -2,7 +2,7 @@ module Tr3llo
   module Entities
     extend self
 
-    SHORTCUT_PREFIX = "#"
+    SHORTCUT_PREFIX = "#".freeze
 
     InvalidKeyError = Class.new(ArgumentError)
     InvalidIDError = Class.new(ArgumentError)
@@ -11,7 +11,7 @@ module Tr3llo
     Board = Struct.new(:id, :shortcut, :name)
     List = Struct.new(:id, :shortcut, :name)
     Card = Struct.new(:id, :shortcut, :name, :description, :short_url, :labels, :members, :list, keyword_init: true)
-    Label = Struct.new(:name, :color)
+    Label = Struct.new(:id, :shortcut, :name, :color, keyword_init: true)
     Comment = Struct.new(:id, :text, :creator, :created_at, keyword_init: true)
     Checklist = Struct.new(:id, :shortcut, :name, :items, keyword_init: true)
     Checklist::Item = Struct.new(:id, :shortcut, :name, :state, keyword_init: true)

data/lib/3llo/interface.rb

@@ -1,7 +1,8 @@
 module Tr3llo
   class Interface
     def initialize(input, output)
-      @input, @output = input, output
+      @input = input
+      @output = output
     end
 
     def print_frame
@@ -15,7 +16,7 @@ module Tr3llo
       output.puts(str)
     end
 
-    alias :puts :print_line
+    alias puts print_line
 
     def print(str)
       output.print(str)