pello 0.1.0 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb48f8c0c18e6c06d29397396cbfa5792475d6da699d0215d1a7f9224364004d
-  data.tar.gz: c3a18b8d8af0664246e902d1ee4de3c28ac8357fd3e6e5e37086e78a34e2a321
+  metadata.gz: 2c85bd4f1d9080e27d0b8738141d556464c690f10b3cca2685aaaf79fa8d4511
+  data.tar.gz: 6fee889e4547385203fe90833fc959cab8fdf0cdf8bc084535ef7cba974a61cb
 SHA512:
-  metadata.gz: dcf908b718977550d8d681aec12effc122ea0fee149397e3a3d686758957c47081088bbb41b1027e953d2a02e9dcb8b4bcc549ae1895e7e227624ee79bad2d91
-  data.tar.gz: 5ace79e7fb062fafdcf654b337be2ae62d5b658d0ad01ae2d102f4e2c150aea289866c23daa147236ebdac5d8febf2d6b4586dd8f15adc009b7fe4915a8950d9
+  metadata.gz: 4a9d6a69228c7d7d3d1a05e9a2706d4e8692158345a603d32251ce283a7af0d2bbfd453a539ae0056edab0aa51dcbab0cf282dde939a77d00ec502211e3875b4
+  data.tar.gz: bd0c992649f399d3bdd95572859eb5a6c04d1805056d46a62866887f946e2d1bc96766a36398b58402c549b85aef3adb1cadf7cdef9b24d7d10c25b24566d180

data/lib/pello/actions/add_pomodori_to_card.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Pello
+  module Actions
+    class AddPomodoriToCard
+      attr_reader :prompt
+
+      def initialize(prompt)
+        @prompt = prompt
+      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
+            card.log "[#{Time.now}] #{card.extract_name} (#{pomodori_before} -> #{card.extract_pomodori})", user
+            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,45 @@
+# frozen_string_literal: true
+
+module Pello
+  module Actions
+    class MoveCard
+      attr_reader :prompt
+
+      def initialize(prompt)
+        @prompt = prompt
+      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
+            card.log "[#{Time.now}] #{card.extract_name} (#{source_list.name} -> #{target_list.name})", user
+            puts('Done!')
+          else
+            puts 'Ok, bye!'
+            nil
+          end
+
+          continue = prompt.yes?('Another one?')
+        end
+      end
+    end
+  end
+end

data/lib/pello/card.rb

@@ -5,43 +5,32 @@ 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
+    def log(event, user)
+      comment = comments.select { |c| c.creator_id == user.id && c.data['text'] =~ /PELLO LOG/ }.first
       if comment
         new_text = [comment.data['text'], event].join("\n")
         comment.delete

data/lib/pello/config.rb

@@ -1,25 +1,31 @@
 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
+    attr_accessor :board_url, :developer_public_key, :list_name, :member_token, :username, :error
 
     def initialize
-      return nil unless File.exist?(CONFIG_FILE_PATH)
+      if File.exist?(CONFIG_FILE_PATH)
+        config = YAML.safe_load File.open(CONFIG_FILE_PATH).read
 
-      config = YAML.safe_load File.open(CONFIG_FILE_PATH).read
+        auth_config           = config['auth']
+        @developer_public_key = auth_config['developer_public_key']
+        @member_token         = auth_config['member_token']
 
-      auth_config           = config['auth']
-      @developer_public_key = auth_config['developer_public_key']
-      @member_token         = auth_config['member_token']
-
-      pello_config          = config['config']
-      @username             = pello_config['username']
-      @board_url            = pello_config['board_url']
-      @list_name            = pello_config['list_name']
-      @log_file             = pello_config['log_file']
+        pello_config          = config['config']
+        @username             = pello_config['username']
+        @board_url            = pello_config['board_url']
+        @list_name            = pello_config['list_name']
+        @error                = false
+      else
+        @error = true
+      end
     rescue => e
+      @error = true
       puts "Error loading config: #{e.message}"
-      nil
+    end
+
+    def valid?
+      !error
     end
 
     def self.write_empty_config
@@ -32,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,18 @@ 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: '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 :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,49 +44,17 @@ 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)}"
-
-        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
+      Pello::Actions::AddPomodoriToCard.new(prompt).run(@user, board_url, list_name)
+    end
 
-        continue = prompt.yes?('Another one?')
-      end
+    def move_card
+      Pello::Actions::MoveCard.new(prompt).run(@user, board_url, list_name)
     end
 
     def configure_pello
       config = Pello::Config.new
-      if config
+      if config.valid?
         Trello.configure do |trello_config|
           trello_config.developer_public_key = config.developer_public_key
           trello_config.member_token = config.member_token
@@ -89,7 +63,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.0"
+  VERSION = "0.3"
 end

data/lib/pello.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pello
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: '0.3'
 platform: ruby
 authors:
 - Andrea Schiavini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-01-30 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,6 +63,8 @@ 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/board.rb
 - lib/pello/card.rb
 - lib/pello/config.rb