work_md 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5b841881acd03d54092af4c2e04b6fa29356b784ac52905810a3ba021c01de
-  data.tar.gz: 324ad983b70bd2749e7c888a21949a7c8b66ca6bbe7c3c7ebabeaeaee7f83a3d
+  metadata.gz: a981624ebcb01d89fcb6097d5969c8a4953c548c5f0af0ccad81c2ae56af7945
+  data.tar.gz: 2e22f7de5b3fc2e72025337b7176cb637e09d67ff56e2bbfd2f025ea21108eea
 SHA512:
-  metadata.gz: 7ab6691773bf32657133a362cfbb42a45e6fbace7a716dcd20f065fe081297ae720efc3b1bcaa86a297327d61886522b45101c3d65fc0bfa3edbdf2422611b28
-  data.tar.gz: e6de20ebdf9b3a5055bc4f1c0e822de41e37ee9ea4131ddc4268c0c47e0acc5d388f2c8864dbc0171dfd419264ea7aec9bc56fe26431475cd9351b12efa704e7
+  metadata.gz: 72060087a643c751da31160dc7d24b8747655ae1f42561fd1d64b4de9172304472d22fcda8da3d10dbf11a1cab27cbed48a5406a63881113cee9cc3a64e69620
+  data.tar.gz: cb634d22d720628d72a13e6b7975a27934f43064ef9bcacd82eb63d67999703b8df8d00ac5adb923c6d6fa9ab21d34c811b700a6f41ec6a03c5730a4f29ec3c1

data/bin/work_md

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# require_relative '../lib/work_md'
 require 'work_md'
 
 WorkMd::Cli.execute(ARGV)

data/lib/work_md.rb

@@ -2,7 +2,10 @@
 
 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/yesterday'
+require_relative 'work_md/commands/tyesterday'
 require_relative 'work_md/parser/engine'
 require_relative 'work_md/commands/parse'
 require_relative 'work_md/cli'

data/lib/work_md/cli.rb

@@ -7,6 +7,8 @@ module WorkMd
     ALIAS_COMMANDS =
       {
         't' => 'today',
+        'ty' => 'tyesterday',
+        'y' => 'yesterday',
         'p' => 'parse'
       }.freeze
 
@@ -44,6 +46,8 @@ module WorkMd
         '',
         '- work_md',
         '- work_md today',
+        '- work_md yesterday',
+        '- work_md tyesterday',
         '- work_md parse',
         '',
         'read more in github.com/henriquefernandez/work_md',

data/lib/work_md/commands/parse.rb

@@ -17,7 +17,7 @@ module WorkMd
 
             month = "0#{month.to_i}" if month.to_i < 10
 
-            args['d'].split(',').each do |day|
+            add_file_to_parser = ->(day) do
               day = "0#{day.to_i}" if day.to_i < 10
 
               file_name = WorkMd::Config.work_dir + "/#{year}/#{month}/#{day}.md"
@@ -25,11 +25,19 @@ module WorkMd
               parser.add_file(file_name)
             end
 
+            if args['d'].include?('..')
+              range = args['d'].split('..')
+
+              (range[0].to_i..range[1].to_i).each { |day| add_file_to_parser.(day) }
+            else
+              args['d'].split(',').each { |day| add_file_to_parser.(day) }
+            end
+
             parser.freeze
 
-            File.delete(PARSED_FILE_PATH) if File.exist? PARSED_FILE_PATH
+            ::File.delete(PARSED_FILE_PATH) if ::File.exist? PARSED_FILE_PATH
 
-            File.open(PARSED_FILE_PATH, 'w+') do |f|
+            ::File.open(PARSED_FILE_PATH, 'w+') do |f|
               f.puts("# #{WorkMd::Config.title}\n\n")
               f.puts("### #{t[:tasks]} (#{parser.tasks.size}):\n\n")
               parser.tasks.each do |task|
@@ -38,16 +46,7 @@ module WorkMd
               f.puts("---\n\n")
               f.puts("### #{t[:meetings]} (#{parser.meetings.size}):\n\n")
               parser.meetings.each do |meeting|
-                f.puts("- #{meeting}\n\n")
-              end
-              f.puts("---\n\n")
-              f.puts("### #{t[:annotations]}:\n\n")
-              parser.annotations.each do |annotation|
-                f.puts("- #{annotation.gsub('###', '')}") unless annotation.nil?
-              end
-              f.puts("###### #{t[:meeting_annotations]}:\n\n")
-              parser.meeting_annotations.each do |meeting_annotation|
-                f.puts("- #{meeting_annotation}\n\n")
+                f.puts("- [#{meeting}\n\n") if meeting != ' ]'
               end
               f.puts("---\n\n")
               f.puts("### #{t[:interruptions]} (#{parser.interruptions.size}):\n\n")
@@ -60,8 +59,20 @@ module WorkMd
                 f.puts("- #{difficulty}\n\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")
+              end
+              f.puts("---\n\n")
               f.puts("### #{t[:pomodoros]} (#{parser.average_pomodoros} #{t[:per_day]}):\n\n")
-              f.puts(parser.pomodoros)
+              f.puts(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")
             end
 
             editor = WorkMd::Config.editor
@@ -71,14 +82,17 @@ module WorkMd
             else
               ::TTY::Editor.open(PARSED_FILE_PATH)
             end
-          rescue
+          rescue => e
             WorkMd::Cli.info(
               ::TTY::Box.frame(
+                "message: #{e.message}",
+                "",
                 "Usage examples:",
                 "",
                 "work_md parse -d=1 -m=5 -y=2000 | get day 1 from month 5 and year 2000",
                 "work_md parse -d=1,2,3          | get day 1, 2 and 3 from the current month and year",
                 "work_md parse -d=1,2 -m=4       | get day 1 and 2 from month 4 and current year",
+                "work_md parse -d=1..10 -m=4     | get day 1 to 10 from month 4 and current year",
                 **WorkMd::Cli.error_frame_style
               )
             )

data/lib/work_md/commands/today.rb

@@ -5,50 +5,7 @@ module WorkMd
     class Today
       class << self
         def execute(_argv = [])
-          today = DateTime.now
-          t = WorkMd::Config.translations
-          work_dir = WorkMd::Config.work_dir
-
-          ::FileUtils
-            .mkdir_p("#{work_dir}/#{today.strftime('%Y/%m')}")
-          unless ::File
-                 .exist?(
-                   "#{work_dir}/#{today.strftime('%Y/%m/%d')}.md"
-                 )
-            ::File.open(
-              "#{work_dir}/#{today.strftime('%Y/%m/%d')}.md",
-              'w+'
-            ) do |f|
-              f.puts("# #{today.strftime('%d/%m/%Y')} - #{WorkMd::Config.title} \n\n")
-              f.puts("### #{t[:tasks]}:\n\n")
-              f.puts("- [ ]\n\n")
-              f.puts("---\n\n")
-              f.puts("### #{t[:meetings]}:\n\n")
-              f.puts("---\n\n")
-              f.puts("### #{t[:annotations]}:\n\n")
-              f.puts("###### #{t[:meeting_annotations]}:\n\n")
-              f.puts("---\n\n")
-              f.puts("### #{t[:interruptions]}:\n\n")
-              f.puts("---\n\n")
-              f.puts("### #{t[:difficulties]}:\n\n")
-              f.puts("---\n\n")
-              f.puts("### #{t[:pomodoros]}:\n\n")
-              f.puts("0\n\n")
-            end
-          end
-
-          editor = WorkMd::Config.editor
-
-          ::FileUtils.cd(work_dir) do
-            unless editor.nil?
-              ::TTY::Editor.open(
-                "#{today.strftime('%Y/%m/%d')}.md",
-                command: editor
-              )
-            else
-              ::TTY::Editor.open("#{today.strftime('%Y/%m/%d')}.md")
-            end
-          end
+          WorkMd::File.open_or_create(DateTime.now)
         end
       end
     end

data/lib/work_md/commands/tyesterday.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module WorkMd
+  module Commands
+    class Tyesterday
+      class << self
+        def execute(_argv = [])
+          filenames =
+            [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])
+        end
+      end
+    end
+  end
+end

data/lib/work_md/commands/yesterday.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module WorkMd
+  module Commands
+    class Yesterday
+      class << self
+        def execute(_argv = [])
+          WorkMd::File.open_or_create(Date.today.prev_day)
+        end
+      end
+    end
+  end
+end

data/lib/work_md/config.rb

@@ -10,10 +10,9 @@ module WorkMd
         {
           tasks: 'Atividades',
           meetings: 'Reuniões',
-          annotations: 'Anotações',
-          meeting_annotations: 'Anotações de Reunião',
           interruptions: 'Interrupções',
           difficulties: 'Dificuldades',
+          observations: 'Observações',
           pomodoros: 'Pomodoros / Ciclos',
           per_day: 'por dia'
         },
@@ -21,10 +20,9 @@ module WorkMd
         {
           tasks: 'Tasks',
           meetings: 'Meetings',
-          annotations: 'Annotations',
-          meeting_annotations: 'Meeting Annotations',
           interruptions: 'Interruptions',
           difficulties: 'Difficulties',
+          observations: 'Observations',
           pomodoros: 'Pomodoros / Cycles',
           per_day: 'per day'
         }

data/lib/work_md/file.rb

@@ -0,0 +1,60 @@
+# 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))
+    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')}")
+
+      filename = "#{some_date.strftime('%Y/%m/%d')}.md"
+
+      return filename if ::File.exist?("#{work_dir}/#{filename}")
+
+      ::File.open(
+        "#{work_dir}/#{filename}",
+        'w+'
+      ) do |f|
+        # rubocop:disable Layout/LineLength
+        f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{WorkMd::Config.title} \n\n")
+        # rubocop:enable Layout/LineLength
+        f.puts("### #{t[:tasks]}:\n\n")
+        f.puts("- [ ]\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:meetings]}:\n\n")
+        f.puts("- [ ]\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:interruptions]}:\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:difficulties]}:\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:observations]}:\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:pomodoros]}:\n\n")
+        f.puts("0\n\n")
+      end
+
+      filename
+    end
+
+    def self.open_in_editor(filename1, filename2 = nil)
+      editor = WorkMd::Config.editor
+
+      ::FileUtils.cd(WorkMd::Config.work_dir) do
+        ENV['EDITOR'] = editor unless editor.nil?
+
+        return ::TTY::Editor.open(filename1) if filename2.nil?
+
+        ::TTY::Editor.open(filename1, filename2)
+      end
+    end
+  end
+end

data/lib/work_md/parser/engine.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
 module WorkMd
   module Parser
+    # rubocop:disable Metrics/ClassLength
     class Engine
       IS_FROZEN_ERROR_MESSAGE = 'WorkMd::Parser::Engine is frozen'
       IS_NOT_FROZEN_ERROR_MESSAGE = 'WorkMd::Parser::Engine is not frozen'
 
       class ParsedFile
         attr_accessor :tasks,
-                      :annotations,
-                      :meeting_annotations,
                       :meetings,
                       :interruptions,
                       :difficulties,
+                      :observations,
+                      :date,
                       :pomodoros
       end
 
@@ -27,7 +27,7 @@ module WorkMd
         raise IS_FROZEN_ERROR_MESSAGE if @frozen
 
         begin
-          file_content = File.read(file)
+          file_content = ::File.read(file)
         rescue Errno::ENOENT
           return
         end
@@ -50,19 +50,6 @@ module WorkMd
         @tasks ||= @parsed_files.map(&:tasks).flatten
       end
 
-      def annotations
-        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
-
-        @annotations ||= @parsed_files.map(&:annotations).flatten
-      end
-
-      def meeting_annotations
-        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
-
-        @meeting_annotations ||=
-          @parsed_files.map(&:meeting_annotations).flatten
-      end
-
       def meetings
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
@@ -81,21 +68,36 @@ module WorkMd
         @difficulties ||= @parsed_files.map(&:difficulties).flatten
       end
 
+      def observations
+        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
+
+        @observations ||= @parsed_files.map(&:observations).flatten
+      end
+
       def average_pomodoros
-        if @parsed_files.size.positive? && pomodoros.positive?
-          return (pomodoros / @parsed_files.size)
+        if @parsed_files.size.positive? && pomodoros_sum.positive?
+          return (pomodoros_sum.to_f / @parsed_files.size).round(1)
         end
 
         0
       end
 
-      def pomodoros
+      def pomodoros_sum
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
-        @pomodoros ||=
+        @pomodoros_sum ||=
           @parsed_files.reduce(0) { |sum, f| sum + f.pomodoros || 0 }
       end
 
+      def pomodoros_bars
+        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
+
+        @pomodoros_bars ||=
+          @parsed_files.map do |f|
+            "(#{f.date}) #{(1..f.pomodoros).map { '◘' }.join }"
+          end
+      end
+
       def freeze
         @frozen = true
       end
@@ -115,18 +117,25 @@ module WorkMd
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def parse_content(parsed_file, content)
-        if content.start_with?(@t[:tasks])
-          parsed_file.tasks = parse_task_list(content)
+        if content.start_with?('# ')
+          parsed_file.date =
+            content.split(' - ')[0].gsub('# ', '').gsub("\n\n", '')
+        elsif content.start_with?(@t[:tasks])
+          parsed_file.tasks = parse_check_list(content)
         elsif content.start_with?(@t[:meetings])
-          parsed_file.meetings = parse_list(content)
-        elsif content.start_with?(@t[:meeting_annotations])
-          parsed_file.meeting_annotations = basic_parse(content)
-        elsif content.start_with?(@t[:annotations])
-          parsed_file.annotations = basic_parse(content)
+          parsed_file.meetings = parse_check_list(content)
         elsif content.start_with?(@t[:interruptions])
-          parsed_file.interruptions = parse_list(content)
+          parsed_file.interruptions = parse_list(content).map do |interruption|
+            "(#{parsed_file.date}) #{interruption}"
+          end
         elsif content.start_with?(@t[:difficulties])
-          parsed_file.difficulties = parse_list(content)
+          parsed_file.difficulties = parse_list(content).map do |difficulty|
+            "(#{parsed_file.date}) #{difficulty}"
+          end
+        elsif content.start_with?(@t[:observations])
+          parsed_file.observations = parse_list(content).map do |observations|
+            "(#{parsed_file.date}) #{observations}"
+          end
         elsif content.start_with?(@t[:pomodoros])
           parsed_file.pomodoros = parse_pomodoro(content)
         end
@@ -134,7 +143,7 @@ module WorkMd
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
 
-      def parse_task_list(content)
+      def parse_check_list(content)
         clear_list(basic_parse(content).split('- ['))
       end
 
@@ -159,6 +168,6 @@ module WorkMd
           .map(&:strip)
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/work_md/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_md
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -53,7 +53,10 @@ files:
 - lib/work_md/cli.rb
 - lib/work_md/commands/parse.rb
 - lib/work_md/commands/today.rb
+- lib/work_md/commands/tyesterday.rb
+- lib/work_md/commands/yesterday.rb
 - lib/work_md/config.rb
+- lib/work_md/file.rb
 - lib/work_md/parser/engine.rb
 - lib/work_md/version.rb
 homepage: