3llo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b821782c50c15268558fee17228bd87e7c1c013c65df510f293701f993f3048e
-  data.tar.gz: 1a16571e8eef793329e113aedac17f66e077434ec9d06906e8949c7f57a46f46
+  metadata.gz: 924f5388e35597e1570a41cc0e0d346d999a6c5a354904e2d4db189579a5047d
+  data.tar.gz: 0d6d728e7831db53095118317a12e3d952793ecdae041db2dd75ca6d8282f515
 SHA512:
-  metadata.gz: c93eccf148fa41d4ee1a5aa59cc847b63b4ed6b9a52b0b0ca584effbe403b02b5048df80df398272a23fe5b36e3d983bb2bfefa42c2972dc038281461b1225ed
-  data.tar.gz: d1b1c3f133d46ff8f6588899efc9ea29e8db1cacedaf9a113c3384cacba2011cd8f7d7461b096124da592bab8558250c20ad691d358b794174356597cd24b176
+  metadata.gz: 11c88432c0490b325080423edee099ac78263f7f0efcb7ef0f9d81d5348733d26649bddfcb335452946b5b8150b2dc539fb224094f6efeabc128ee14694cc198
+  data.tar.gz: '0318a410ef4b35661a9442cab3cdf9a22dcec2cda1645e0000e6eab0629b38ea6df4c97183dae1beb814b444bbd05a841d7da4db1f86aea1882207466f91664d'

data/.rubocop.yml

@@ -117,3 +117,6 @@ Style/StringLiteralsInInterpolation:
 
 Style/RaiseArgs:
   EnforcedStyle: compact
+
+Lint/NonDeterministicRequireOrder:
+  Enabled: false

data/3llo.gemspec

@@ -5,8 +5,8 @@ require "3llo/version"
 Gem::Specification.new do |spec|
   spec.name = "3llo"
   spec.version = Tr3llo::VERSION
-  spec.authors = ["Cẩm Huỳnh"]
-  spec.email = ["huynhquancam@gmail.com"]
+  spec.authors = ["Cẩm Huỳnh", "Diệp Sở Hùng"]
+  spec.email = ["huynhquancam@gmail.com", "diepsohung@gmail.com"]
 
   spec.summary = "Trello CLI app"
   spec.description = "Interactive CLI application for Trello"

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v1.2.0
+
+* Support running multiple commands with `--init` switch (#83)
+* Include current board name to status line (#77)
+* Introduce `card add-label` command (#74)
+* Support multiline card description (#72)
+
 ## v1.1.0
 
 * Introduce "list add" command.

data/LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2020 Cẩm Huỳnh
+Copyright (c) 2017 Cẩm Huỳnh
+Copyright (c) 2020 Cẩm Huỳnh and Diệp Sở Hùng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/3llo.rb

@@ -3,7 +3,6 @@ require "3llo/remote_server"
 require "3llo/interface"
 require "container"
 require "json"
-require "erb"
 
 require "3llo/application"
 require "3llo/configuration"

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

@@ -116,6 +116,12 @@ module Tr3llo
         client.put(req_path, {}, payload)
       end
 
+      def add_labels(card_id, labels)
+        req_path = Utils.build_req_path("/cards/#{card_id}/idLabels")
+
+        client.put(req_path, {}, {"value" => labels.join(",")})
+      end
+
       private
 
       def make_struct(payload)
@@ -135,10 +141,11 @@ module Tr3llo
           payload
             .fetch("labels", [])
             .map do |label_payload|
+            label_id = label_payload.fetch("id")
             label_name = label_payload.fetch("name")
             label_color = label_payload["color"]
 
-            Entities::Label.new(id: nil, shortcut: nil, name: label_name, color: label_color)
+            Entities::Label.new(id: label_id, shortcut: nil, name: label_name, color: label_color)
           end
 
         card =

data/lib/3llo/command.rb

@@ -22,7 +22,7 @@ module Tr3llo
           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-item edit-item remote-item check-item uncheck-item add-label
         ],
         "label" => %w[list add edit remove],
         "help" => [],

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

@@ -1,7 +1,4 @@
-require "3llo/command/board/list"
-require "3llo/command/board/select"
-require "3llo/command/board/invalid"
-require "3llo/command/board/add"
+Tr3llo::Utils.require_directory(File.dirname(__FILE__) + "/board/*.rb")
 
 module Tr3llo
   module Command

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

@@ -1,23 +1,4 @@
-require "3llo/command/card/list"
-require "3llo/command/card/list_mine"
-require "3llo/command/card/edit"
-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
@@ -125,6 +106,12 @@ module Tr3llo
           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/card/add.rb

@@ -21,7 +21,7 @@ module Tr3llo
               )
 
               name = interface.input.ask("Name:", required: true)
-              description = interface.input.ask("Description:")
+              description = interface.input.multiline("Description:").join("")
 
               API::Card.create(name, description, list_id)
 

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

@@ -0,0 +1,56 @@
+module Tr3llo
+  module Command
+    module Card
+      module AddLabel
+        extend self
+
+        def execute(key, board_id)
+          card_id = Entities.parse_id(:card, key)
+          assert_card_id!(card_id, key)
+
+          card = API::Card.find(card_id)
+
+          interface = Application.fetch_interface!()
+
+          interface.print_frame do
+            label_ids = select_labels(interface, card, board_id)
+
+            add_labels(card_id, label_ids)
+            interface.puts("Chosen labels have been added to the card.")
+          end
+        end
+
+        private
+
+        def assert_card_id!(card_id, key)
+          raise InvalidArgumentError.new("#{key.inspect} is not a valid card key") unless card_id
+        end
+
+        def add_labels(card_id, label_ids)
+          API::Card.add_labels(card_id, label_ids)
+        end
+
+        def select_labels(interface, card, board_id)
+          label_options =
+            API::Label.find_all_by_board(board_id)
+              .map { |label| [label.name, label.id] }
+              .to_h()
+
+          preselected_label_ids =
+            card.labels.flat_map do |label|
+              index = label_options.find_index { |_label_name, label_id| label_id == label.id }
+
+              index ? [index + 1] : []
+            end
+
+          interface.input.multi_select(
+            "Choose the labels to add to this card:",
+            label_options,
+            default: preselected_label_ids,
+            enum: "."
+          )
+        end
+      end
+    end
+  end
+end

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

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

@@ -1,8 +1,4 @@
-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"
+Tr3llo::Utils.require_directory(File.dirname(__FILE__) + "/label/*.rb")
 
 module Tr3llo
   module Command

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

@@ -1,8 +1,4 @@
-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"
+Tr3llo::Utils.require_directory(File.dirname(__FILE__) + "/list/*.rb")
 
 module Tr3llo
   module Command

data/lib/3llo/controller.rb

@@ -13,14 +13,16 @@ module Tr3llo
       interface = Application.fetch_interface!()
 
       if init_command && init_command != ""
-        interface.puts("Executing " + Utils.format_highlight(init_command) + " command")
-
-        execute_command!(init_command)
+        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)
@@ -31,6 +33,18 @@ module Tr3llo
 
     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())
     end

data/lib/3llo/utils.rb

@@ -67,5 +67,11 @@ module Tr3llo
 
       [path, URI.encode_www_form(params)].join("?")
     end
+
+    def require_directory(glob)
+      Dir.glob(glob).each do |file|
+        require file
+      end
+    end
   end
 end

data/lib/3llo/version.rb

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

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

@@ -18,6 +18,7 @@ module Tr3llo
           card comments <key>     - Load recent comments of a card
           card comment <key>      - Add a comment to a card
           card archive <key>      - Archive a card
+          card add-label <key>    - Label a card
 
           #{Utils.format_bold("# Available checklist commands:")}
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: 3llo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Cẩm Huỳnh
-autorequire: 
+- Diệp Sở Hùng
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -55,6 +56,7 @@ dependencies:
 description: Interactive CLI application for Trello
 email:
 - huynhquancam@gmail.com
+- diepsohung@gmail.com
 executables:
 - 3llo
 extensions: []
@@ -91,6 +93,7 @@ files:
 - lib/3llo/command/card/add.rb
 - lib/3llo/command/card/add_checklist.rb
 - lib/3llo/command/card/add_item.rb
+- lib/3llo/command/card/add_label.rb
 - lib/3llo/command/card/archive.rb
 - lib/3llo/command/card/assign.rb
 - lib/3llo/command/card/check_item.rb
@@ -153,7 +156,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Trello CLI app
 test_files: []