pello 0.1.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad5aeac8cb842a98bd69be325b1ebbaecbec31bedbc078773dbb2245123f2dce
-  data.tar.gz: 59d677d28e39e48cf1b86fc7ff86ffd7645e44b473f42e45a7cf41d903aa992f
+  metadata.gz: 74bd8b698e92b1cd698098387770e68aa62da299b6b72552694ef5345a385a41
+  data.tar.gz: e0eff537dbc2c3da8f66282317b529ff773fa2d4a7dda7c14bf19e5744f1f3b3
 SHA512:
-  metadata.gz: 6b26cc8641bf5f4230bd5adea22fdf5e5440c528e7dc651fe632d919bdc7ee3a2484baeec781af2e0df37986bbdb881046dc182bf845963807a76514c8738d78
-  data.tar.gz: 6baac99b9a92d8c75fea887c17451bdc290feb756bb8e8968968c011a165d326da7c3bfbd16a6bb1466397ec2e3fe6a9740c02b19fd62128d7be2c2762388382
+  metadata.gz: 820369d314e252c1b758235d8a24d271eacf418991d204bcd5a4e6098687462702c25ef456cf91e02ffe6c668a15f41547f0a9e6e93ded41a604f2295ed6a53c
+  data.tar.gz: 2d5cd13e26ed76b138731770d01232fd66d61a54698e40a4750e907de72a0d9b0ac6020765584f821cb49ce7288eecd13ebf9f51e32aab30fa7e7f1f31dcc956

data/lib/pello/actions/add_pomodori_to_card.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Pello
+  module Actions
+    class AddPomodoriToCard
+      attr_reader :prompt, :logger
+
+      def initialize(prompt, logger = Pello::CardLogger.new)
+        @prompt = prompt
+        @logger = logger
+      end
+
+      def run(user, board_url, list_name)
+        board = Pello::Inputs.choose_board user, board_url
+        return unless board
+
+        puts board.as_table
+        continue = true
+        while continue
+          list = Pello::Inputs.choose_list board, list_name
+          return unless list
+
+          card = Pello::Inputs.choose_card list
+          next unless card
+
+          pomodori_before = card.extract_pomodori
+          pomodori_to_add = prompt.ask('Pomodori', default: 1)
+
+          new_name = name_with_added_pomodori(card, pomodori_to_add.to_i)
+
+          puts "Updating card #{card.name}"
+          puts "New title:    #{new_name}"
+
+          if prompt.yes?('Confirm?')
+            card.name = new_name
+            card.save
+            logger.log user, card, "[#{Time.now}] #{card.extract_name} (#{pomodori_before} -> #{card.extract_pomodori})"
+            puts('Done!')
+          else
+            puts 'Ok, bye!'
+            nil
+          end
+
+          continue = prompt.yes?('Another one?')
+        end
+      end
+
+      private
+
+      def name_with_added_pomodori(card, pomodori_to_add)
+        current_pomodori = card.extract_pomodori
+        current_points = card.extract_points
+        current_name = card.extract_name
+
+        result = []
+        result << "(#{current_points})" unless current_points.zero?
+        result << "#{current_pomodori + pomodori_to_add} 🍅"
+        result << current_name
+        result.join(' ')
+      end
+    end
+  end
+end

data/lib/pello/actions/move_card.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Pello
+  module Actions
+    class MoveCard
+      attr_reader :prompt, :logger
+
+      def initialize(prompt, logger = Pello::CardLogger.new)
+        @prompt = prompt
+        @logger = logger
+      end
+
+      def run(user, board_url, list_name)
+        board = Pello::Inputs.choose_board user, board_url
+        return unless board
+
+        puts board.as_table
+        continue = true
+        while continue
+          source_list = Pello::Inputs.choose_list board, list_name, 'Choose source list'
+          return unless source_list
+
+          card = Pello::Inputs.choose_card source_list
+          next unless card
+
+          target_list = Pello::Inputs.choose_list board, list_name, 'Choose target list'
+          return unless target_list && target_list != source_list
+
+          puts "Moving card #{card.name} from \"#{source_list.name}\" to \"#{target_list.name}\""
+
+          if prompt.yes?('Confirm?')
+            card.list_id = target_list.id
+            card.save
+            logger.log user, card, "[#{Time.now}] #{card.extract_name} (#{source_list.name} -> #{target_list.name})"
+            puts('Done!')
+          else
+            puts 'Ok, bye!'
+            nil
+          end
+
+          continue = prompt.yes?('Another one?')
+        end
+      end
+    end
+  end
+end

data/lib/pello/actions/report.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Pello
+  module Actions
+    class Report
+      POMODORI_ADDED_COMMENT = /\((\d+) -> (\d+)\)$/.freeze
+
+      def run(user, board_url)
+        board = Pello::Inputs.choose_board user, board_url
+        return unless board
+
+        board_totals = {}
+
+        lists = board.lists
+        lists.each do |list|
+          list_totals = {}
+          list.cards.each do |card|
+            card.comments.select { |comment| pello_log?(comment) }.each do |comment|
+              lines_with_pomodori_increases_in(comment).each do |line|
+                author_name = cached_author_name(comment.creator_id)
+                pom_before, pom_after = pomodori_before_and_after_from(line)
+                update_counters(list_totals, author_name, (pom_after - pom_before))
+                update_counters(board_totals, author_name, (pom_after - pom_before))
+              end
+            end
+          end
+
+          print_counters(list_totals, list.name) if list_totals.any?
+        end
+
+        print_counters(board_totals, 'Totals')
+        puts "\n"
+      end
+
+      def pomodori_before_and_after_from(comment_line)
+        comment_line.match(POMODORI_ADDED_COMMENT)[1, 2].map(&:to_i)
+      end
+
+      def lines_with_pomodori_increases_in(comment)
+        comment.data['text'].split("\n").select { |line| line.match? POMODORI_ADDED_COMMENT }
+      end
+
+      def pello_log?(comment)
+        comment.data['text'] =~ /PELLO LOG/
+      end
+
+      def update_counters(counters, author_name, amount_to_add)
+        counters[author_name] ||= 0
+        counters[author_name] = counters[author_name] + amount_to_add
+      end
+
+      def print_counters(counters, label)
+        puts "\n-- #{label}:"
+        counters.each { |author_name, author_total| puts "* #{author_name}: #{author_total}" }
+      end
+
+      def cached_author_name(author_id)
+        @author_names ||= {}
+        @author_names[author_id] ||= Trello::Member.find(author_id).full_name
+        @author_names[author_id]
+      end
+    end
+  end
+end

data/lib/pello/card.rb

@@ -5,51 +5,28 @@ module Pello
   class Card
     extend Forwardable
 
-    TITLE_REGEX = /(\(([0-9.]*)\))*\s*([0-9.]*)\s*🍅*\s*(.*)/.freeze
+    NAME_REGEX = /(\(([0-9.]*)\))*\s*([0-9.]*)\s*🍅*\s*(.*)/.freeze
     attr_accessor :trello_card
-    def_delegators :@trello_card, :name, :name=, :comments, :add_comment, :save, :id
+    def_delegators :@trello_card, :name, :name=, :comments, :add_comment, :save, :id, :list_id, :list_id=
 
     def initialize(trello_card)
       @trello_card = trello_card
     end
 
     def extract_pomodori
-      pomos = name.match(TITLE_REGEX)[3]
+      pomos = name.match(NAME_REGEX)[3]
       pomos ||= 0
       pomos.to_i
     end
 
-    def extract_title
-      name.match(TITLE_REGEX)[-1]
+    def extract_name
+      name.match(NAME_REGEX)[-1]
     end
 
     def extract_points
-      points = name.match(TITLE_REGEX)[2]
+      points = name.match(NAME_REGEX)[2]
       points ||= 0
       points.to_f
     end
-
-    def title_with_added_pomodori(how_many = 1)
-      current_pomodori = extract_pomodori
-      current_points = extract_points
-      current_title = extract_title
-      result = []
-      result << "(#{current_points})" unless current_points.zero?
-      result << "#{current_pomodori + how_many} 🍅"
-      result << current_title
-      result.join(' ')
-    end
-
-    def log(event)
-      comment = comments.select { |c| c.data['text'] =~ /PELLO LOG/ }.first
-      if comment
-        new_text = [comment.data['text'], event].join("\n")
-        comment.delete
-        add_comment new_text
-      else
-        text = ['~~~PELLO LOG', event].join("\n")
-        add_comment text
-      end
-    end
   end
 end

data/lib/pello/card_logger.rb

@@ -0,0 +1,14 @@
+module Pello
+  class CardLogger
+    def log(user, card, event)
+      comment = card.comments.select { |c| c.creator_id == user.id && c.data['text'] =~ /PELLO LOG/ }.first
+      if comment
+        text = [comment.data['text'], event].join("\n")
+        comment.delete
+      else
+        text = ['~~~PELLO LOG', event].join("\n")
+      end
+      card.add_comment text
+    end
+  end
+end

data/lib/pello/config.rb

@@ -1,7 +1,7 @@
 module Pello
   class Config
     CONFIG_FILE_PATH = "#{ENV['HOME']}/.config/pello/pello.yaml".freeze
-    attr_accessor :board_url, :developer_public_key, :list_name, :log_file, :member_token, :username, :error
+    attr_accessor :board_url, :developer_public_key, :list_name, :member_token, :username, :error
 
     def initialize
       if File.exist?(CONFIG_FILE_PATH)
@@ -15,7 +15,6 @@ module Pello
         @username             = pello_config['username']
         @board_url            = pello_config['board_url']
         @list_name            = pello_config['list_name']
-        @log_file             = pello_config['log_file']
         @error                = false
       else
         @error = true
@@ -39,7 +38,6 @@ module Pello
         file.puts '  board_url: ""'
         file.puts '  username: ""'
         file.puts '  list_name: "In progress"'
-        file.puts '  log_file: "/Users/your_name/.pello_log"'
       end
     end
   end

data/lib/pello/inputs.rb

@@ -15,12 +15,12 @@ module Pello
       Pello::Board.new(user.boards.detect { |b| b.name == input })
     end
 
-    def self.choose_list(board, list_name)
+    def self.choose_list(board, list_name, prompt_text = 'Choose list')
       prompt = TTY::Prompt.new
       list_names = board.lists.map(&:name)
       list_names << BACK_OPTION
       default_list = board.lists.select { |l| l.name == list_name }.first.try(:name)
-      input = prompt.select('Choose list', list_names, per_page: 15, default: default_list)
+      input = prompt.select(prompt_text, list_names, per_page: 15, default: default_list)
       return nil if input == BACK_OPTION
 
       Pello::List.new(board.lists.detect { |l| l.name == input })

data/lib/pello/list.rb

@@ -4,7 +4,7 @@ module Pello
   class List
     extend Forwardable
     attr_accessor :trello_list
-    def_delegators :@trello_list, :cards
+    def_delegators :@trello_list, :cards, :name, :id
 
     def initialize(trello_list)
       @trello_list = trello_list

data/lib/pello/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'trello'
 require 'tty-prompt'
@@ -21,14 +23,21 @@ module Pello
       while continue
         case prompt.select('Choose task') do |menu|
           menu.choice name: 'Add pomodori', value: :add_pomodori
+          menu.choice name: 'Move card', value: :move_card
+          menu.choice name: 'Print board pomodori report', value: :report
           menu.choice name: 'Edit config', value: :edit_config
           menu.choice name: 'quit', value: :quit
         end
         when :add_pomodori
           add_pomodori_to_card
+        when :move_card
+          move_card
+        when :report
+          report
         when :edit_config
+          editor = ENV['EDITOR'] || 'vim'
           system 'mkdir -p ~/.config/pello'
-          system "#{ENV['EDITOR']} ~/.config/pello/pello.yaml"
+          system "#{editor} ~/.config/pello/pello.yaml"
         when :quit
           puts 'Ok, bye!'
           exit
@@ -38,44 +47,16 @@ module Pello
 
     private
 
-    def file_log(text)
-      File.open(@log_file_path, 'a+') do |file|
-        file.puts(text)
-      end
-    end
-
     def add_pomodori_to_card
-      board = Pello::Inputs.choose_board @user, @board_url
-      return unless board
-
-      puts board.as_table
-      continue = true
-      while continue
-        list = Pello::Inputs.choose_list board, @list_name
-        return unless list
-
-        card = Pello::Inputs.choose_card list
-        next unless card
-
-        pomodori_before = card.extract_pomodori
-        pomodori_to_add = prompt.ask('Pomodori', default: 1)
-
-        puts "Updating card #{card.name}"
-        puts "New title:    #{card.title_with_added_pomodori(pomodori_to_add.to_i)}"
+      Pello::Actions::AddPomodoriToCard.new(prompt).run(@user, board_url, list_name)
+    end
 
-        if prompt.yes?('Confirm?')
-          card.name = card.title_with_added_pomodori(pomodori_to_add.to_i)
-          card.save
-          file_log "[#{Time.now} - #{@user.full_name}] #{card.extract_title} (#{pomodori_before} -> #{card.extract_pomodori})"
-          card.log "[#{Time.now} - #{@user.full_name}] #{card.extract_title} (#{pomodori_before} -> #{card.extract_pomodori})"
-          puts('Done!')
-        else
-          puts 'Ok, bye!'
-          nil
-        end
+    def move_card
+      Pello::Actions::MoveCard.new(prompt).run(@user, board_url, list_name)
+    end
 
-        continue = prompt.yes?('Another one?')
-      end
+    def report
+      Pello::Actions::Report.new.run(@user, board_url)
     end
 
     def configure_pello
@@ -89,7 +70,6 @@ module Pello
         @user          = Trello::Member.find config.username
         @board_url     = config.board_url
         @list_name     = config.list_name
-        @log_file_path = config.log_file
       else
         puts 'No config found, opening config file...'
         Pello::Config.write_empty_config

data/lib/pello/version.rb

@@ -1,3 +1,3 @@
 module Pello
-  VERSION = "0.1.1"
+  VERSION = "0.4"
 end

data/lib/pello.rb

@@ -4,6 +4,10 @@ require 'pello/inputs'
 require 'pello/board'
 require 'pello/list'
 require 'pello/card'
+require 'pello/card_logger'
+require 'pello/actions/add_pomodori_to_card'
+require 'pello/actions/move_card'
+require 'pello/actions/report'
 require 'pello/config'
 
 module Pello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pello
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.4'
 platform: ruby
 authors:
 - Andrea Schiavini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-trello
@@ -52,7 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Perform Trello operations like adding pomodori to a card title
+description: Perform Trello operations like adding pomodori to a card name and moving
+  cards across lists
 email:
 - metalelf0@gmail.com
 executables:
@@ -62,8 +63,12 @@ extra_rdoc_files: []
 files:
 - bin/pello
 - lib/pello.rb
+- lib/pello/actions/add_pomodori_to_card.rb
+- lib/pello/actions/move_card.rb
+- lib/pello/actions/report.rb
 - lib/pello/board.rb
 - lib/pello/card.rb
+- lib/pello/card_logger.rb
 - lib/pello/config.rb
 - lib/pello/inputs.rb
 - lib/pello/list.rb