3llo 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6ca4c800b73fb0a5514e1a87204547c243045b9e3a0b5842f327513b726073
-  data.tar.gz: c6bc2f0e09bd27a558c8914d34734863efce9d6b534d2bae38d5d1267d378eb7
+  metadata.gz: b821782c50c15268558fee17228bd87e7c1c013c65df510f293701f993f3048e
+  data.tar.gz: 1a16571e8eef793329e113aedac17f66e077434ec9d06906e8949c7f57a46f46
 SHA512:
-  metadata.gz: 035ff3a48dcfe77e558d5eec4e341dcfc78caf0b6d55fa60c91f8a9d56b32a8d8221634e78ec3f34e26fc13c9d10df130017483fd3b9bcfb5aa0c64ce3d19e0f
-  data.tar.gz: 152e793d22f7db0ab50d9504c3d2c2d36051dcfa74293931d368a5e58ec9b176fa34f77215498566947fc6851a33bc9eadc3f891fbe43fa0221be13407d1c9b7
+  metadata.gz: c93eccf148fa41d4ee1a5aa59cc847b63b4ed6b9a52b0b0ca584effbe403b02b5048df80df398272a23fe5b36e3d983bb2bfefa42c2972dc038281461b1225ed
+  data.tar.gz: d1b1c3f133d46ff8f6588899efc9ea29e8db1cacedaf9a113c3384cacba2011cd8f7d7461b096124da592bab8558250c20ad691d358b794174356597cd24b176

data/.rubocop.yml

@@ -57,8 +57,14 @@ Security/JSONLoad:
 Style/Alias:
   EnforcedStyle: prefer_alias
 
-Style/BracesAroundHashParameters:
-  Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
 
 Style/DefWithParentheses:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v1.1.0
+
+* Introduce "list add" command.
+* Introduce "board add" command.
+* Introduce label related command.
+* Support exiting with Ctrl+D.
+
 ## v1.0.0
 
 * Support using shortcuts to access entities.

data/Rakefile

@@ -1,10 +1,4 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task default: :test
+task default: :spec

data/lib/3llo/api.rb

@@ -1,6 +1,7 @@
 require "3llo/api/board"
 require "3llo/api/card"
 require "3llo/api/list"
+require "3llo/api/label"
 require "3llo/api/user"
 require "3llo/api/checklist"
 require "3llo/api/token"

data/lib/3llo/api/board.rb

@@ -25,6 +25,18 @@ module Tr3llo
         make_struct(client.get(req_path, {}))
       end
 
+      def create(name:, desc:, default_lists: true)
+        client = Application.fetch_client!()
+        req_path = Utils.build_req_path("/boards", {})
+        payload = {
+          "name" => name,
+          "desc" => desc,
+          "defaultLists" => default_lists
+        }
+
+        client.post(req_path, {}, payload)
+      end
+
       private
 
       def make_struct(payload)

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

@@ -138,7 +138,7 @@ module Tr3llo
             label_name = label_payload.fetch("name")
             label_color = label_payload["color"]
 
-            Entities::Label.new(label_name, label_color)
+            Entities::Label.new(id: nil, shortcut: nil, name: label_name, color: label_color)
           end
 
         card =

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

@@ -0,0 +1,64 @@
+module Tr3llo
+  module API
+    module Label
+      extend self
+
+      def find_all_by_board(board_id)
+        req_path =
+          Utils.build_req_path(
+            "/boards/#{board_id}/labels"
+          )
+
+        client
+          .get(req_path, {})
+          .reject { |label| label["name"].empty? }
+          .map do |label_payload|
+            make_struct(label_payload)
+          end
+      end
+
+      def find(label_id)
+        req_path = Utils.build_req_path("/labels/#{label_id}")
+        label_payload = client.get(req_path, {})
+
+        make_struct(label_payload)
+      end
+
+      def create(name:, color:, board_id:)
+        req_path = Utils.build_req_path("/labels")
+        payload = {
+          "name" => name,
+          "color" => color,
+          "idBoard" => board_id
+        }
+
+        client.post(req_path, {}, payload)
+      end
+
+      def update(label_id, data)
+        req_path = Utils.build_req_path("/labels/#{label_id}")
+
+        client.put(req_path, {}, data)
+      end
+
+      def delete(label_id)
+        req_path = Utils.build_req_path("/labels/#{label_id}")
+
+        client.delete(req_path, {}, {})
+      end
+
+      private
+
+      def make_struct(payload)
+        id, name, color = payload.fetch_values("id", "name", "color")
+        shortcut = Entities.make_shortcut(:label, id)
+
+        Entities::Label.new(id: id, shortcut: shortcut, name: name, color: color)
+      end
+
+      def client
+        Application.fetch_client!()
+      end
+    end
+  end
+end

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

@@ -23,6 +23,16 @@ module Tr3llo
         client.post(req_path, {}, {})
       end
 
+      def create(name, board_id)
+        req_path = Utils.build_req_path("/lists")
+        payload = {
+          "name" => name,
+          "idBoard" => board_id
+        }
+
+        client.post(req_path, {}, payload)
+      end
+
       private
 
       def make_struct(payload)

data/lib/3llo/command.rb

@@ -1,6 +1,7 @@
 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"
@@ -15,14 +16,15 @@ module Tr3llo
 
     def generate_suggestions(buffer, command_buffer)
       commands = {
-        "board" => ["list", "select"],
-        "list" => %w[list cards archive-cards],
+        "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
         ],
+        "label" => %w[list add edit remove],
         "help" => [],
         "exit" => []
       }
@@ -52,6 +54,8 @@ module Tr3llo
         Command::Card.execute(subcommand, args)
       when "list"
         Command::List.execute(subcommand, args)
+      when "label"
+        Command::Label.execute(subcommand, args)
       when "help"
         Command::Help.execute()
       when "exit"

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

@@ -1,6 +1,7 @@
 require "3llo/command/board/list"
 require "3llo/command/board/select"
 require "3llo/command/board/invalid"
+require "3llo/command/board/add"
 
 module Tr3llo
   module Command
@@ -18,12 +19,12 @@ module Tr3llo
           Utils.assert_string!(board_key, "board key is missing")
 
           Command::Board::Select.execute(board_key)
+        when "add"
+          Command::Board::Add.execute()
         else
           handle_invalid_subcommand(subcommand, args)
         end
-      rescue InvalidCommandError => exception
-        Command::Board::Invalid.execute(exception.message)
-      rescue InvalidArgumentError => exception
+      rescue InvalidCommandError, InvalidArgumentError => exception
         Command::Board::Invalid.execute(exception.message)
       end
 

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

@@ -0,0 +1,29 @@
+module Tr3llo
+  module Command
+    module Board
+      module Add
+        extend self
+
+        def execute()
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            name = interface.input.ask("Name:", required: true)
+            desc = interface.input.ask("Description:")
+
+            default_lists =
+              interface.input.yes?("With default set of lists to the board (To Do, Doing, Done)?") do |question|
+                question.default false
+                question.positive "Y"
+                question.negative "N"
+              end
+
+            API::Board.create(name: name, desc: desc, default_lists: default_lists)
+
+            interface.puts("Board has been created.")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,17 +14,21 @@ module Tr3llo
           interface = Application.fetch_interface!()
 
           interface.print_frame do
-            list_id = interface.input.select(
-              "Choose the list this card should belong to:",
-              list_options
-            )
+            if list_options.any?
+              list_id = interface.input.select(
+                "Choose the list this card should belong to:",
+                list_options
+              )
 
-            name = interface.input.ask("Name:", required: true)
-            description = interface.input.ask("Description:")
+              name = interface.input.ask("Name:", required: true)
+              description = interface.input.ask("Description:")
 
-            API::Card.create(name, description, list_id)
+              API::Card.create(name, description, list_id)
 
-            interface.puts("Card has been created.")
+              interface.puts("Card has been created.")
+            else
+              interface.puts("There is no list on board.")
+            end
           end
         end
       end

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

@@ -0,0 +1,51 @@
+require "3llo/command/label/list"
+require "3llo/command/label/add"
+require "3llo/command/label/edit"
+require "3llo/command/label/remove"
+require "3llo/command/label/invalid"
+
+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/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/list.rb

@@ -1,4 +1,5 @@
 require "3llo/command/list/list"
+require "3llo/command/list/add"
 require "3llo/command/list/cards"
 require "3llo/command/list/invalid"
 require "3llo/command/list/archive_cards"
@@ -14,6 +15,10 @@ module Tr3llo
           board = Application.fetch_board!()
 
           Command::List::List.execute(board[:id])
+        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")

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/controller.rb

@@ -5,7 +5,7 @@ module Tr3llo
     extend self
 
     def start(init_command)
-      Readline.completion_append_character = "   "
+      Readline.completion_append_character = " "
       Readline.completion_proc = lambda { |buffer|
         Command.generate_suggestions(buffer, Readline.line_buffer)
       }
@@ -21,6 +21,8 @@ module Tr3llo
       loop do
         command_buffer = Readline.readline("\e[15;48;5;27m 3llo \e[0m > ", true)
 
+        Command::Exit.execute() if command_buffer.nil?
+
         execute_command!(command_buffer)
       end
     rescue Interrupt

data/lib/3llo/entities.rb

@@ -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/remote_server.rb

@@ -78,6 +78,8 @@ module Tr3llo
 
     def build_request_uri(req_path)
       URI.parse(endpoint_url + req_path)
+    rescue URI::Error
+      raise InvalidArgumentError.new("invalid command arguments")
     end
 
     def dispatch(request, expected_status_codes)

data/lib/3llo/utils.rb

@@ -17,6 +17,8 @@ module Tr3llo
       "sky" => 36
     }.freeze()
 
+    TRELLO_LABEL_COLOR = %w[red pink blue green purple yellow orange sky].freeze()
+
     def format_key_tag(id, shortcut)
       formatted_shortcut = Utils.format_highlight(Entities::SHORTCUT_PREFIX + shortcut)
       formatted_id = Utils.paint(id, "blue")

data/lib/3llo/version.rb

@@ -1,3 +1,3 @@
 module Tr3llo
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/3llo/view.rb

@@ -9,3 +9,5 @@ require "3llo/view/card/comments"
 require "3llo/view/list/help"
 require "3llo/view/list/list"
 require "3llo/view/list/cards"
+require "3llo/view/label/list"
+require "3llo/view/label/help"

data/lib/3llo/view/board/help.rb

@@ -10,6 +10,7 @@ module Tr3llo
 
           board list                - Show list of boards
           board select <board_key>  - Select board
+          board add                 - Create a board
           TEMPLATE
         end
       end

data/lib/3llo/view/help.rb

@@ -14,6 +14,8 @@ module Tr3llo
 
         #{View::List::Help.render()}
 
+        #{View::Label::Help.render()}
+
         #{miscellaneous_help()}
         TEMPLATE
       end

data/lib/3llo/view/label/help.rb

@@ -0,0 +1,20 @@
+module Tr3llo
+  module View
+    module Label
+      module Help
+        extend self
+
+        def render()
+          <<~TEMPLATE.strip
+          #{Utils.format_bold("# Available label commands:")}
+
+          label list                - Show all labels
+          label add                 - Create a label
+          label edit <key>          - Edit a label
+          list remove <key>         - Remove a label
+          TEMPLATE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Tr3llo
+  module View
+    module Label
+      module List
+        extend self
+
+        def render(labels)
+          labels
+            .map { |label| render_label(label) }
+            .join("\n")
+        end
+
+        private
+
+        def render_label(label)
+          "#{Utils.format_key_tag(label.id, label.shortcut)} #{Utils.paint("#" + label.name, label.color)}"
+        end
+      end
+    end
+  end
+end

data/lib/3llo/view/list/help.rb

@@ -9,6 +9,7 @@ module Tr3llo
           #{Utils.format_bold("# Available list commands:")}
 
           list list                 - Show all lists
+          list add                  - Create a list
           list cards <key>          - Show all cards in list
           list archive-cards <key>  - Archive all cards in list
           TEMPLATE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 3llo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Cẩm Huỳnh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -75,6 +75,7 @@ files:
 - lib/3llo/api/board.rb
 - lib/3llo/api/card.rb
 - lib/3llo/api/checklist.rb
+- lib/3llo/api/label.rb
 - lib/3llo/api/list.rb
 - lib/3llo/api/token.rb
 - lib/3llo/api/user.rb
@@ -82,6 +83,7 @@ files:
 - lib/3llo/command.rb
 - lib/3llo/command/.gitkeep
 - lib/3llo/command/board.rb
+- lib/3llo/command/board/add.rb
 - lib/3llo/command/board/invalid.rb
 - lib/3llo/command/board/list.rb
 - lib/3llo/command/board/select.rb
@@ -109,7 +111,14 @@ files:
 - lib/3llo/command/exit.rb
 - lib/3llo/command/help.rb
 - lib/3llo/command/invalid.rb
+- lib/3llo/command/label.rb
+- lib/3llo/command/label/add.rb
+- lib/3llo/command/label/edit.rb
+- lib/3llo/command/label/invalid.rb
+- lib/3llo/command/label/list.rb
+- lib/3llo/command/label/remove.rb
 - lib/3llo/command/list.rb
+- lib/3llo/command/list/add.rb
 - lib/3llo/command/list/archive_cards.rb
 - lib/3llo/command/list/cards.rb
 - lib/3llo/command/list/invalid.rb
@@ -133,6 +142,8 @@ files:
 - lib/3llo/view/card/list_mine.rb
 - lib/3llo/view/card/show.rb
 - lib/3llo/view/help.rb
+- lib/3llo/view/label/help.rb
+- lib/3llo/view/label/list.rb
 - lib/3llo/view/list/cards.rb
 - lib/3llo/view/list/help.rb
 - lib/3llo/view/list/list.rb