work_md 0.2.3 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1c858bf12a976912f85e9fd1a22b39e2bd5daf4e56ec46299c1297aa4e576cb
-  data.tar.gz: 8a542af4507b9765d9317f23ad7db72bc1f4cf8ffe7bc27342ea9c1e8f592e82
+  metadata.gz: 240715cce22ce57249e206aaccb86151732c059fa4af0f00b1b3d2c8f47389bb
+  data.tar.gz: 436b17f29758239fe959abdf6d8ffaf24f629ba3fb41315bf92e8c42eaaac4cb
 SHA512:
-  metadata.gz: '02389407af0f604e5cf9fac532639b5cb5553179cd98d67fa18aecf56bc182cccbc2bc674cd1f8ca3f5b11ede62d82d8b85320613a55e0cf6d432f273618e06a'
-  data.tar.gz: 3983b233410dd07224abf01bf74998c31307780b52b43cdb83495d4745ed83938c72d0f0cb449e34dcdb7cded9e28fd5dec440fedacd823446f8ec0309152457
+  metadata.gz: 595cc7e93141034918c3076dcf1416fe46ba9c0194fd06026e117269c73482a595d8d6cfdf7b23cc73e67a60880971d3ba2c76453a567ea6581d273c529414d7
+  data.tar.gz: e9599c13e70ade59262afb89dca054c8dc54821906e9eca4a113efc579716f3df2e1e2f91819d1a0b0edb77a632b8d227233aa3912b70fd87dcb509b984cd0ed

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,25 +59,33 @@ module WorkMd
                 f.puts("- #{difficulty}\n\n")
               end
               f.puts("---\n\n")
-              f.puts("### #{t[:pomodoros]}:\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)
             end
 
             editor = WorkMd::Config.editor
 
             unless editor.nil?
-              ::TTY::Editor.open(PARSED_FILE_PATH, {command: editor})
+              ::TTY::Editor.open(PARSED_FILE_PATH, command: editor)
             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,14 @@
+# frozen_string_literal: true
+
+module WorkMd
+  module Commands
+    class Tyesterday
+      class << self
+        def execute(_argv = [])
+          WorkMd::File.open_or_create(DateTime.now)
+          WorkMd::File.open_or_create(Date.today.prev_day)
+        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,21 +10,21 @@ module WorkMd
         {
           tasks: 'Atividades',
           meetings: 'Reuniões',
-          annotations: 'Anotações',
-          meeting_annotations: 'Anotações de Reunião',
           interruptions: 'Interrupções',
           difficulties: 'Dificuldades',
-          pomodoros: 'Pomodoros'
+          observations: 'Observações',
+          pomodoros: 'Pomodoros / Ciclos',
+          per_day: 'por dia'
         },
       'en' =>
         {
           tasks: 'Tasks',
           meetings: 'Meetings',
-          annotations: 'Annotations',
-          meeting_annotations: 'Meeting Annotations',
           interruptions: 'Interruptions',
           difficulties: 'Difficulties',
-          pomodoros: 'Pomodoros'
+          observations: 'Observations',
+          pomodoros: 'Pomodoros / Cycles',
+          per_day: 'per day'
         }
     }.freeze
 

data/lib/work_md/file.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module WorkMd
+  class File
+    def self.open_or_create(some_date)
+      t = WorkMd::Config.translations
+      work_dir = WorkMd::Config.work_dir
+
+      ::FileUtils
+        .mkdir_p("#{work_dir}/#{some_date.strftime('%Y/%m')}")
+      unless ::File.exist?("#{work_dir}/#{some_date.strftime('%Y/%m/%d')}.md")
+        ::File.open(
+          "#{work_dir}/#{some_date.strftime('%Y/%m/%d')}.md",
+          '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
+      end
+
+      editor = WorkMd::Config.editor
+
+      ::FileUtils.cd(work_dir) do
+        if editor.nil?
+          ::TTY::Editor.open("#{some_date.strftime('%Y/%m/%d')}.md")
+        else
+          ::TTY::Editor.open(
+            "#{some_date.strftime('%Y/%m/%d')}.md",
+            command: editor
+          )
+        end
+      end
+    end
+  end
+end

data/lib/work_md/parser/engine.rb

@@ -2,17 +2,18 @@
 
 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
 
@@ -26,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
@@ -49,35 +50,36 @@ module WorkMd
         @tasks ||= @parsed_files.map(&:tasks).flatten
       end
 
-      def annotations
+      def meetings
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
-        @annotations ||= @parsed_files.map(&:annotations).flatten
+        @meetings ||= @parsed_files.map(&:meetings).flatten
       end
 
-      def meeting_annotations
+      def interruptions
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
-        @meeting_annotations ||=
-          @parsed_files.map(&:meeting_annotations).flatten
+        @interruptions ||= @parsed_files.map(&:interruptions).flatten
       end
 
-      def meetings
+      def difficulties
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
-        @meetings ||= @parsed_files.map(&:meetings).flatten
+        @difficulties ||= @parsed_files.map(&:difficulties).flatten
       end
 
-      def interruptions
+      def observations
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
-        @interruptions ||= @parsed_files.map(&:interruptions).flatten
+        @observations ||= @parsed_files.map(&:observations).flatten
       end
 
-      def difficulties
-        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
+      def average_pomodoros
+        if @parsed_files.size.positive? && pomodoros.positive?
+          return (pomodoros.to_f / @parsed_files.size).round(1)
+        end
 
-        @difficulties ||= @parsed_files.map(&:difficulties).flatten
+        0
       end
 
       def pomodoros
@@ -106,18 +108,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
@@ -125,7 +134,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
 
@@ -150,5 +159,6 @@ module WorkMd
           .map(&:strip)
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/work_md/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_md
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 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: