3llo 0.1.8 → 0.1.9.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45845f6247206e981300f0213b03d9d5b2e9943b
-  data.tar.gz: 8c373c8ce27298abdf54a083d7c80fb03ae27e84
+  metadata.gz: e6cf3198c2484045d6c27f9e502026dc177b2d61
+  data.tar.gz: b542d6aa3e3ffeffac36ce468daa7b9d288bddbb
 SHA512:
-  metadata.gz: 3e8e2a1142b5859f1bf699732ae39677375fcda06fc003a296a9c91cfc31067f2d6eb16ccfc0432385843dbd05f5628651319226e3743075b756fd2a181428d8
-  data.tar.gz: e95778da4d3df83edbcc99b0e07ab1c1858244c95eb5a61a7ad6c0380a3e29d40f21c5b1b0ae9900f8962e6b3074dbf57553ff6bc96cadb367f6b955d75b8c54
+  metadata.gz: 72c9bd2a0d678d8073b630fcc37e7924cc23245ad46662b6fc27de9986d32f2d8f485e79e097bcd87f49073be71eccdc17d860a9cbfcce759d951db797d8a51e
+  data.tar.gz: 500a740b975c8ea42c5088a374a321876a0863fc8bbe117b190058133d2618851fbdb2a893b020835e840014a72074ee33d9687ef1696d4d1def40c653be2e03

data/3llo.gemspec

@@ -26,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency 'tty-prompt', '~> 0.11.0'
 end

data/bin/3llo

@@ -3,10 +3,12 @@
 $:.unshift File.expand_path("../../lib", __FILE__)
 require "3llo"
 require 'container'
+require 'tty-prompt'
 
 $container = Container.new
 $container.register(:api_client, Tr3llo::Client)
-$container.register(:interface, Tr3llo::Interface.new($stdin, $stdout))
+prompt = TTY::Prompt.new
+$container.register(:interface, Tr3llo::Interface.new(prompt, $stdout))
 
 configuration = Tr3llo::Configuration.new
 configuration.user_id = ENV.fetch('TRELLO_USER') { raise "Have you set TRELLO_USER?" }

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

@@ -20,6 +20,8 @@ module Tr3llo
             "/lists/#{list_id}/cards",
             key: api_key,
             token: api_token,
+            members: 'true',
+            member_fields: "id,username"
           ),
           symbolize_names: true
         )
@@ -37,6 +39,20 @@ module Tr3llo
         )
       end
 
+      def create(name:, description:, list_id:)
+        JSON.parse(
+          client.post(
+            "/cards",
+            key: api_key,
+            token: api_token,
+            name: name,
+            description: description,
+            idList: list_id
+          ),
+          symbolize_names: true
+        )
+      end
+
       def find(card_id)
         JSON.parse(
           client.get(
@@ -75,6 +91,19 @@ module Tr3llo
         )
       end
 
+      def find_comments(card_id)
+        url = "/cards/#{card_id}/actions"
+        JSON.parse(
+          client.get(
+            url,
+            key: api_key,
+            token: api_token,
+            filter: "commentCard",
+          ),
+          symbolize_names: true
+        )
+      end
+
       private
 
       def api_key

data/lib/3llo/board_command_factory.rb

@@ -15,8 +15,7 @@ module Tr3llo
         user_id = $container.resolve(:user)[:id]
         Command::Board::ListCommand.new(user_id)
       when :select
-        board_id, _ = args
-        Command::Board::SelectCommand.new(board_id)
+        Command::Board::SelectCommand.new
       else
         Command::Board::InvalidCommand.new
       end

data/lib/3llo/card_command_factory.rb

@@ -4,6 +4,8 @@ require '3llo/commands/card/show'
 require '3llo/commands/card/move'
 require '3llo/commands/card/self_assign'
 require '3llo/commands/card/invalid'
+require '3llo/commands/card/comments'
+require '3llo/commands/card/add'
 
 module Tr3llo
   class CardCommandFactory
@@ -24,13 +26,19 @@ module Tr3llo
         else
           Command::Card::ListCommand.new(board_id)
         end
+      when 'add'
+        board_id = $container.resolve(:board)[:id]
+        Command::Card::AddCommand.new(board_id)
       when 'show'
         card_id, _ = args
         Command::Card::ShowCommand.new(card_id)
+      when 'comments'
+        card_id, _ = args
+        Command::Card::CommentsCommand.new(card_id)
       when 'move'
-        card_id, list_id = args
+        card_id, _ = args
         board_id = $container.resolve(:board)[:id]
-        Command::Card::MoveCommand.new(card_id, list_id, board_id)
+        Command::Card::MoveCommand.new(card_id, board_id)
       when 'self-assign'
         card_id, _ = args
         user_id = $container.resolve(:user)[:id]

data/lib/3llo/client.rb

@@ -37,6 +37,23 @@ module Tr3llo
       end
     end
 
+    def post(path, params)
+      uri = URI("#{BASE_URL}#{path}")
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Post.new(uri.request_uri, 'Content-Type' => 'application/json')
+      request.body = params.to_json
+
+      res = http.request(request)
+
+      case res
+      when Net::HTTPOK then res.body
+      else raise(RequestError.new(res.body))
+      end
+    end
+
     def put(path, params)
       uri = URI("#{BASE_URL}#{path}?#{query_string(params)}")
 

data/lib/3llo/commands/board/invalid.rb

@@ -15,8 +15,8 @@ module Tr3llo
           %q{
     Available `board` commands
 
-    board list                      - Show list of board
-    board select <board_id>         - Select board
+    board list    - Show list of board
+    board select  - Select board
           }
         end
 

data/lib/3llo/commands/board/select.rb

@@ -2,12 +2,9 @@ module Tr3llo
   module Command
     module Board
       class SelectCommand
-        def initialize(board_id)
-          @board_id = board_id
-        end
-
         def execute
-          board = load_board
+          board = load_board(select_board)
+
           $container.register(:board, board)
           interface.print_frame do
             interface.puts("Board #{board[:name].labelize} selected")
@@ -16,9 +13,19 @@ module Tr3llo
 
         private
 
-        attr_reader :board_id
+        def select_board
+          interface.input.select("Board to select: ", board_choices)
+        end
+
+        def board_choices
+          user_id = $container.resolve(:user)[:id]
+          API::Board
+            .find_all_by_user(user_id)
+            .map { |board| [board[:name], board[:id]] }
+            .to_h
+        end
 
-        def load_board
+        def load_board(board_id)
           API::Board.find(board_id)
         end
 

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

@@ -0,0 +1,50 @@
+module Tr3llo
+  module Command
+    module Card
+      class AddCommand
+        def initialize(board_id)
+          @board_id = board_id
+        end
+
+        def execute
+          interface.print_frame do
+            list_id = interface.input.select(
+              "Choose a list:",
+              load_lists
+            )
+            name = interface.input.ask("Name:")
+            description = interface.input.ask("Description:")
+
+            interface.puts(
+              create_card!(name, description, list_id) &&
+              "Card created"
+            )
+          end
+        end
+
+        private
+
+        attr_reader :board_id
+
+        def create_card!(name, description, list_id)
+          API::Card.create(
+            name: name,
+            description: description,
+            list_id: list_id
+          )
+        end
+
+        def load_lists
+          API::List
+            .find_all_by_board(board_id)
+            .map { |list| [list[:name], list[:id]] }
+            .to_h
+        end
+
+        def interface
+          $container.resolve(:interface)
+        end
+      end
+    end
+  end
+end

data/lib/3llo/commands/card/comments.rb

@@ -0,0 +1,29 @@
+module Tr3llo
+  module Command
+    module Card
+      class CommentsCommand
+        def initialize(card_id)
+          @card_id = card_id
+        end
+
+        def execute
+          Tr3llo::Presenter::Card::CommentsPresenter
+            .new(interface)
+            .print!(load_comments)
+        end
+
+        private
+
+        attr_reader :card_id
+
+        def load_comments
+          API::Card.find_comments(card_id)
+        end
+
+        def interface
+          $container.resolve(:interface)
+        end
+      end
+    end
+  end
+end

data/lib/3llo/commands/card/invalid.rb

@@ -15,11 +15,13 @@ module Tr3llo
           %q{
     Available `card` commands
 
-    card list                       - Show list of cards grouped by list
-    card list mine                  - Show list of my cards
-    card show <card_id>             - Show card information
-    card move <card_id> <list_id>   - Move card to a list
-    card self-assign <card_id>      - Self-assign a card
+    card list                   - Show list of cards grouped by list
+    card list mine              - Show list of my cards
+    card add                    - Create a card
+    card show <card_id>         - Show card information
+    card move <card_id>         - Move card to a list
+    card self-assign <card_id>  - Self-assign a card
+    card comments <card_id>     - Load recent comments of a card
           }
         end
 

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

@@ -2,23 +2,22 @@ module Tr3llo
   module Command
     module Card
       class MoveCommand
-        def initialize(card_id, list_id, board_id)
+        def initialize(card_id, board_id)
           @card_id = card_id
-          @list_id = list_id
           @board_id = board_id
         end
 
         def execute
           interface.print_frame do
-            prompt_for_list_id!(board_id) unless list_id
-            move_card!
+            list_id = prompt_for_list_id!(board_id)
+            move_card!(list_id)
             interface.puts("Card has been moved.")
           end
         end
 
         private
 
-        attr_reader :list_id, :card_id, :board_id
+        attr_reader :card_id, :board_id
 
         def prompt_for_list_id!(board_id)
           board_id = $container.resolve(:board)[:id]
@@ -30,7 +29,7 @@ module Tr3llo
             .prompt_for_list_id(lists)
         end
 
-        def move_card!
+        def move_card!(list_id)
           API::Card.move_to_list(card_id, list_id)
         end
 

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

@@ -19,7 +19,9 @@ module Tr3llo
         attr_reader :user_id, :card_id
 
         def assign_card
-          API::Card.assign_members(card_id, [user_id])
+          card = API::Card.find(card_id)
+          members = card[:idMembers] << user_id
+          API::Card.assign_members(card_id, members)
         end
 
         def interface

data/lib/3llo/commands/error.rb

@@ -3,7 +3,7 @@ module Tr3llo
     class ErrorCommand
       def execute
         interface.print_frame do
-          command = "board select <board-id>".red
+          command = "board select".red
           interface.puts("You have not selected any board. Run #{command} to select one.")
         end
       end

data/lib/3llo/controller.rb

@@ -23,7 +23,7 @@ module Tr3llo
         end
       end
     rescue Interrupt
-      interface.print_frame { interface.puts('Bye Bye...') }
+      Command::ExitCommand.new.execute
     end
 
     private

data/lib/3llo/errors.rb

@@ -1,7 +1,7 @@
 module Tr3llo
   class BoardNotSelectedError < RuntimeError
     def message
-      "Board has not been selected. Run 'board select <board-id>' to select board"
+      "Board has not been selected. Run 'board select' to select board"
     end
   end
 end

data/lib/3llo/interface.rb

@@ -20,11 +20,6 @@ module Tr3llo
       output.print(str)
     end
 
-    def prompt(message)
-      print("Enter list ID to be moved to: ")
-      input.gets.chomp
-    end
-
     attr_reader :input, :output
   end
 end

data/lib/3llo/presenter/card/comments.rb

@@ -0,0 +1,33 @@
+module Tr3llo
+  module Presenter
+    module Card
+      class CommentsPresenter
+        def initialize(interface)
+          @interface = interface
+        end
+
+        def print!(comments)
+          interface.print_frame do
+            comments.each do |comment|
+              present_comment(comment)
+            end
+          end
+        end
+
+        private
+
+        attr_reader :interface
+
+        def present_comment(comment)
+          interface.puts(
+            "#{decorate_user(comment[:memberCreator])}: #{comment[:data][:text]}"
+          )
+        end
+
+        def decorate_user(user)
+          "@#{user[:username]}".blue
+        end
+      end
+    end
+  end
+end

data/lib/3llo/presenter/card/list.rb

@@ -25,13 +25,19 @@ module Tr3llo
             label_str = ''
           end
 
+          if card.has_key?(:members)
+            members_str = card[:members].map { |member| "@#{member[:username]}".blue }.join(", ")
+          else
+            members_str = ''
+          end
+
           if card[:subscribed]
             subscribed_str = "[✓]"
           else
             subscribed_str = "[ ]"
           end
 
-          interface.puts "#{subscribed_str} #{card[:id].labelize}] - #{card[:name]} (#{label_str})"
+          interface.puts "#{subscribed_str} #{card[:id].labelize}] - #{card[:name]} (#{label_str}) [#{members_str}]"
         end
 
         def colorize_label(label)

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

@@ -7,9 +7,10 @@ module Tr3llo
         end
 
         def prompt_for_list_id(lists)
-          interface.puts("List of lists in this board")
-          lists.each(&method(:present_list))
-          interface.prompt("Select list ID")
+          interface.input.select(
+            'Choose the list to be moved to',
+            lists.map { |list| [list[:name], list[:id]] }.to_h
+          )
         end
 
         private

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

@@ -20,17 +20,19 @@ module Tr3llo
     3llo - CLI for Trello
 
     Usage:
-    board list                      - Show list of board
-    board select <board_id>         - Select board
-    card list                       - Show list of cards grouped by list
-    card list mine                  - Show list of my cards
-    card show <card_id>             - Show card information
-    card move <card_id> <list_id>   - Move card to a list
-    card self-assign <card_id>      - Self-assign a card
-    list list                       - Show all lists
-    list cards <list_id>            - Show all cards in list
-    help                            - Show help menu
-    exit                            - Exit program
+    board list                  - Show list of board
+    board select                - Select board
+    card list                   - Show list of cards grouped by list
+    card list mine              - Show list of my cards
+    card add                    - Create a card
+    card show <card_id>         - Show card information
+    card move <card_id>         - Move card to a list
+    card self-assign <card_id>  - Self-assign a card
+    card comments <card_id>     - Load recent comments of a card
+    list list                   - Show all lists
+    list cards <list_id>        - Show all cards in list
+    help                        - Show help menu
+    exit                        - Exit program
         }
       end
     end

data/lib/3llo/presenter.rb

@@ -4,5 +4,6 @@ require '3llo/presenter/card/list'
 require '3llo/presenter/card/list_mine'
 require '3llo/presenter/card/move'
 require '3llo/presenter/card/show'
+require '3llo/presenter/card/comments'
 require '3llo/presenter/list/list'
 require '3llo/presenter/list/cards'

data/lib/3llo/version.rb

@@ -1,3 +1,3 @@
 module Tr3llo
-  VERSION = "0.1.8"
+  VERSION = "0.1.9.beta"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: 3llo
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9.beta
 platform: ruby
 authors:
 - Cẩm Huỳnh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
-dependencies: []
+date: 2017-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 description: CLI for Trello
 email:
 - huynhquancam@gmail.com
@@ -41,6 +55,8 @@ files:
 - lib/3llo/commands/board/invalid.rb
 - lib/3llo/commands/board/list.rb
 - lib/3llo/commands/board/select.rb
+- lib/3llo/commands/card/add.rb
+- lib/3llo/commands/card/comments.rb
 - lib/3llo/commands/card/invalid.rb
 - lib/3llo/commands/card/list.rb
 - lib/3llo/commands/card/list_mine.rb
@@ -62,6 +78,7 @@ files:
 - lib/3llo/presenter.rb
 - lib/3llo/presenter/.gitkeep
 - lib/3llo/presenter/board/list.rb
+- lib/3llo/presenter/card/comments.rb
 - lib/3llo/presenter/card/list.rb
 - lib/3llo/presenter/card/list_mine.rb
 - lib/3llo/presenter/card/move.rb
@@ -88,9 +105,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5