work_md 0.2.9 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a981624ebcb01d89fcb6097d5969c8a4953c548c5f0af0ccad81c2ae56af7945
-  data.tar.gz: 2e22f7de5b3fc2e72025337b7176cb637e09d67ff56e2bbfd2f025ea21108eea
+SHA1:
+  metadata.gz: 1b324912bdc2b9d7db489110bdc56623c26de285
+  data.tar.gz: cda8ba5718f0420da7593340f67213570672c18c
 SHA512:
-  metadata.gz: 72060087a643c751da31160dc7d24b8747655ae1f42561fd1d64b4de9172304472d22fcda8da3d10dbf11a1cab27cbed48a5406a63881113cee9cc3a64e69620
-  data.tar.gz: cb634d22d720628d72a13e6b7975a27934f43064ef9bcacd82eb63d67999703b8df8d00ac5adb923c6d6fa9ab21d34c811b700a6f41ec6a03c5730a4f29ec3c1
+  metadata.gz: f96829690a7ff140f4fafdf7545944fff09fc9459c41119b13f3c965491a2d7dab6a39b9dba64acce475596b498e7c4957e31b4349aa59a80081ee197404a425
+  data.tar.gz: 161880115ce5a27df36dfa390e0fd08a0597ea0efd72d1ce4ad26008a3463058d2adcb6141059e0a30ae22dac5ec02d2b372d67eb6db46d8e6a4c7f3425947f0

data/lib/work_md/cli.rb

@@ -9,11 +9,10 @@ module WorkMd
         't' => 'today',
         'ty' => 'tyesterday',
         'y' => 'yesterday',
+        'c' => 'config',
         'p' => 'parse'
       }.freeze
 
-    DEFAULT_COMMAND = WorkMd::Commands::Today
-
     def self.execute(argv)
       first_argv_argument = argv.shift
 
@@ -26,17 +25,17 @@ module WorkMd
         .const_get("WorkMd::Commands::#{command}")
         .send(:execute, argv)
     rescue NameError
-      puts info(
+      puts help(
         ::TTY::Box.frame(
           "Command '#{first_argv_argument}' not found!",
           **error_frame_style
         )
       )
     rescue CommandMissing
-      DEFAULT_COMMAND.execute(argv)
+      help('Welcome! =)')
     end
 
-    def self.info(message = '')
+    def self.help(message = '')
       # rubocop:disable Layout/LineLength
       puts ::TTY::Box.frame(
         message,
@@ -49,8 +48,9 @@ module WorkMd
         '- work_md yesterday',
         '- work_md tyesterday',
         '- work_md parse',
+        '- work_md config',
         '',
-        'read more in github.com/henriquefernandez/work_md',
+        'more information in github.com/henriquefernandez/work_md',
         padding: 1,
         title: { top_left: '(work_md)', bottom_right: "(v#{WorkMd::VERSION})" }
       )

data/lib/work_md/commands/config.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module WorkMd
+  module Commands
+    class Config
+      class << self
+        def execute(_argv = [])
+          file_name = 'config.yml'
+          work_dir = ::WorkMd::Config::DEFAULT_WORK_DIR
+
+          unless ::File.exist?("#{work_dir}/#{file_name}")
+            ::FileUtils.mkdir_p(work_dir)
+
+            ::File.open("#{work_dir}/#{file_name}", 'w+') do |f|
+              f.puts("# Example configuration:")
+              f.puts("#")
+              f.puts("# title: Your Name")
+              f.puts("# editor: vim")
+              f.puts("# lang: en")
+              f.puts("#")
+              f.puts("title: # Title your work_md files")
+              f.puts("editor: # Your default editor")
+              f.puts("lang: # Only 'pt', 'en' and 'es' avaiable")
+            end
+          end
+
+          ::WorkMd::File.open_in_editor(
+            file_names: [file_name],
+            dir: work_dir
+          )
+        end
+      end
+    end
+  end
+end

data/lib/work_md/commands/parse.rb

@@ -51,27 +51,36 @@ module WorkMd
               f.puts("---\n\n")
               f.puts("### #{t[:interruptions]} (#{parser.interruptions.size}):\n\n")
               parser.interruptions.each do |interruption|
-                f.puts("- #{interruption}\n\n")
+                f.puts("- #{interruption}\n")
               end
               f.puts("---\n\n")
               f.puts("### #{t[:difficulties]} (#{parser.difficulties.size}):\n\n")
               parser.difficulties.each do |difficulty|
-                f.puts("- #{difficulty}\n\n")
+                f.puts("- #{difficulty}\n")
               end
               f.puts("---\n\n")
               f.puts("### #{t[:observations]} (#{parser.observations.size}):\n\n")
               parser.observations.each do |observation|
-                f.puts("- #{observation}\n\n")
+                f.puts("- #{observation}\n")
               end
               f.puts("---\n\n")
               f.puts("### #{t[:pomodoros]} (#{parser.average_pomodoros} #{t[:per_day]}):\n\n")
-              f.puts(parser.pomodoros_sum)
+              f.puts("**#{t[:total]}: #{parser.pomodoros_sum}**")
               f.puts("\n\n")
-
               parser.pomodoros_bars.each do |pomodoro_bar|
                 f.puts(pomodoro_bar)
                 f.puts("\n\n")
               end
+              f.puts("---\n\n")
+              f.puts("### #{t[:days_bars]}:\n\n")
+              f.puts("**#{t[:pomodoros]}: ⬛ | #{t[:meetings]}: 📅 | #{t[:interruptions]}: ⚠️ | #{t[:difficulties]}: 😓 | #{t[:observations]}: 📝 | #{t[:tasks]}: ✔️**")
+
+              f.puts("\n\n")
+              parser.days_bars.each do |day_bar|
+                f.puts(day_bar)
+                f.puts("\n\n")
+              end
+
               f.puts("\n\n")
             end
 
@@ -83,7 +92,7 @@ module WorkMd
               ::TTY::Editor.open(PARSED_FILE_PATH)
             end
           rescue => e
-            WorkMd::Cli.info(
+            WorkMd::Cli.help(
               ::TTY::Box.frame(
                 "message: #{e.message}",
                 "",

data/lib/work_md/commands/tyesterday.rb

@@ -5,12 +5,12 @@ module WorkMd
     class Tyesterday
       class << self
         def execute(_argv = [])
-          filenames =
+          file_names =
             [DateTime.now, Date.today.prev_day].map do |date|
               WorkMd::File.create_if_not_exist(date)
             end
 
-          WorkMd::File.open_in_editor(filenames[0], filenames[1])
+          WorkMd::File.open_in_editor(file_names: file_names)
         end
       end
     end

data/lib/work_md/config.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 module WorkMd
   module Config
-    DEFAULT_WORK_DIR = Dir.home + '/work_md'
+    DEFAULT_WORK_DIR = "#{Dir.home}/work_md"
     TRANSLATIONS = {
       'pt' =>
         {
@@ -14,7 +14,9 @@ module WorkMd
           difficulties: 'Dificuldades',
           observations: 'Observações',
           pomodoros: 'Pomodoros / Ciclos',
-          per_day: 'por dia'
+          per_day: 'por dia',
+          total: 'total',
+          days_bars: 'Resumo'
         },
       'en' =>
         {
@@ -24,8 +26,24 @@ module WorkMd
           difficulties: 'Difficulties',
           observations: 'Observations',
           pomodoros: 'Pomodoros / Cycles',
-          per_day: 'per day'
+          per_day: 'per day',
+          total: 'all',
+          days_bars: 'Summary'
+
+        },
+      'es' =>
+        {
+          tasks: 'Tareas',
+          meetings: 'Reuniones',
+          interruptions: 'Interrupciones',
+          difficulties: 'Dificultades',
+          observations: 'Observaciones',
+          pomodoros: 'Pomodoros / Ciclos',
+          per_day: 'por día',
+          total: 'total',
+          days_bars: 'Abstracto'
         }
+
     }.freeze
 
     def self.title
@@ -47,7 +65,7 @@ module WorkMd
     end
 
     def self.yaml_file
-      YAML.load_file(DEFAULT_WORK_DIR + '/config.yml')
+      YAML.load_file("#{DEFAULT_WORK_DIR}/config.yml")
     rescue StandardError
       {}
     end

data/lib/work_md/file.rb

@@ -1,26 +1,24 @@
 # frozen_string_literal: true
 
-require 'byebug'
-
 module WorkMd
   class File
     def self.open_or_create(some_date)
-      open_in_editor(create_if_not_exist(some_date))
+      open_in_editor(file_names: [create_if_not_exist(some_date)])
     end
 
     def self.create_if_not_exist(some_date)
       t = WorkMd::Config.translations
       work_dir = WorkMd::Config.work_dir
 
-      ::FileUtils
-        .mkdir_p("#{work_dir}/#{some_date.strftime('%Y/%m')}")
+      file_name = "#{some_date.strftime('%Y/%m/%d')}.md"
 
-      filename = "#{some_date.strftime('%Y/%m/%d')}.md"
+      return file_name if ::File.exist?("#{work_dir}/#{file_name}")
 
-      return filename if ::File.exist?("#{work_dir}/#{filename}")
+      ::FileUtils
+        .mkdir_p("#{work_dir}/#{some_date.strftime('%Y/%m')}")
 
       ::File.open(
-        "#{work_dir}/#{filename}",
+        "#{work_dir}/#{file_name}",
         'w+'
       ) do |f|
         # rubocop:disable Layout/LineLength
@@ -42,18 +40,19 @@ module WorkMd
         f.puts("0\n\n")
       end
 
-      filename
+      file_name
     end
 
-    def self.open_in_editor(filename1, filename2 = nil)
+    def self.open_in_editor(file_names: [], dir: nil)
       editor = WorkMd::Config.editor
+      work_dir = dir || WorkMd::Config.work_dir
 
-      ::FileUtils.cd(WorkMd::Config.work_dir) do
+      ::FileUtils.cd(work_dir) do
         ENV['EDITOR'] = editor unless editor.nil?
 
-        return ::TTY::Editor.open(filename1) if filename2.nil?
+        return ::TTY::Editor.open(file_names[0]) if file_names[1].nil?
 
-        ::TTY::Editor.open(filename1, filename2)
+        ::TTY::Editor.open(file_names[0], file_names[1])
       end
     end
   end

data/lib/work_md/parser/engine.rb

@@ -41,7 +41,7 @@ module WorkMd
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
         @done_tasks ||=
-          tasks.filter { |t| t.start_with?('x]') || t.start_with?('X]') }
+          tasks.select { |t| t.start_with?('x]') || t.start_with?('X]') }
       end
 
       def tasks
@@ -89,15 +89,37 @@ module WorkMd
           @parsed_files.reduce(0) { |sum, f| sum + f.pomodoros || 0 }
       end
 
-      def pomodoros_bars
+      def pomodoros_bars(_file = nil)
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
         @pomodoros_bars ||=
           @parsed_files.map do |f|
-            "(#{f.date}) #{(1..f.pomodoros).map { '◘' }.join }"
+            "(#{f.date}) #{(1..f.pomodoros).map { '⬛' }.join}"
           end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
+      def days_bars
+        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
+
+        return @days_bars if @days_bars
+
+        @days_bars ||=
+          @parsed_files.map do |f|
+            pom = (1..f.pomodoros).map { '⬛' }.join
+            mee = f.meetings.map { '📅' }.join
+            int = f.interruptions.map { '⚠️' }.join
+            dif = f.difficulties.map { '😓' }.join
+            obs = f.observations.map { '📝' }.join
+            tas = f.tasks.map { '✔️' }.join
+
+            "(#{f.date}) #{pom}#{mee}#{int}#{dif}#{obs}#{tas}"
+          end
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
+
       def freeze
         @frozen = true
       end
@@ -164,7 +186,7 @@ module WorkMd
 
         list
           .map { |s| s.gsub('---', '') unless s.nil? }
-          .filter { |s| (s != '') && (s != "\n\n") }
+          .select { |s| (s != '') && (s != "\n\n") }
           .map(&:strip)
       end
     end

data/lib/work_md/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WorkMd
-  VERSION = '0.2.9'
+  VERSION = '0.3.3'
 end

data/lib/work_md.rb

@@ -4,6 +4,7 @@ require_relative 'work_md/version'
 require_relative 'work_md/config'
 require_relative 'work_md/file'
 require_relative 'work_md/commands/today'
+require_relative 'work_md/commands/config'
 require_relative 'work_md/commands/yesterday'
 require_relative 'work_md/commands/tyesterday'
 require_relative 'work_md/parser/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_md
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.3
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-description:
+description: 
 email:
 - hriqueft@gmail.com
 executables:
@@ -51,6 +51,7 @@ files:
 - bin/work_md
 - lib/work_md.rb
 - lib/work_md/cli.rb
+- lib/work_md/commands/config.rb
 - lib/work_md/commands/parse.rb
 - lib/work_md/commands/today.rb
 - lib/work_md/commands/tyesterday.rb
@@ -59,12 +60,12 @@ files:
 - lib/work_md/file.rb
 - lib/work_md/parser/engine.rb
 - lib/work_md/version.rb
-homepage:
+homepage: 
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/henriquefernandez/work_md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -79,8 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.14.4
+signing_key: 
 specification_version: 4
 summary: Track your work activities, write annotations, recap what you did for a week,
   month or specific days... and much more!