work_md 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 566027a143beb9e55274abe76ef2f0d0c7a44078d4773c595e9cdce2175a2c32
-  data.tar.gz: d4094062e154849f8514d26c20d52d37e931d3f844f2b162cb26eab2b7a70d5d
+  metadata.gz: 240715cce22ce57249e206aaccb86151732c059fa4af0f00b1b3d2c8f47389bb
+  data.tar.gz: 436b17f29758239fe959abdf6d8ffaf24f629ba3fb41315bf92e8c42eaaac4cb
 SHA512:
-  metadata.gz: 41053f4429dfd6a4a3af74e52da1d6f131aac58c79c9034a201814a89dc67fd7a2e3feae74c25afa8c0ffc0b610cf9d8332392ee69cb66f43011779033a4af21
-  data.tar.gz: 4daed1478dedc190e1d3eef1719c54f16af4040519b276ab08820453e08371112fd92cd70b9aef8c3e32480cee65257daa884f3580b0748cb8d32c34c6fabd3f
+  metadata.gz: 595cc7e93141034918c3076dcf1416fe46ba9c0194fd06026e117269c73482a595d8d6cfdf7b23cc73e67a60880971d3ba2c76453a567ea6581d273c529414d7
+  data.tar.gz: e9599c13e70ade59262afb89dca054c8dc54821906e9eca4a113efc579716f3df2e1e2f91819d1a0b0edb77a632b8d227233aa3912b70fd87dcb509b984cd0ed

data/lib/work_md.rb

@@ -5,6 +5,7 @@ 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,7 @@ module WorkMd
     ALIAS_COMMANDS =
       {
         't' => 'today',
+        'ty' => 'tyesterday',
         'y' => 'yesterday',
         'p' => 'parse'
       }.freeze
@@ -46,6 +47,7 @@ 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,6 +25,14 @@ 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
@@ -51,6 +59,11 @@ 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)
             end
@@ -72,6 +85,7 @@ module WorkMd
                 "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/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/config.rb

@@ -12,6 +12,7 @@ module WorkMd
           meetings: 'Reuniões',
           interruptions: 'Interrupções',
           difficulties: 'Dificuldades',
+          observations: 'Observações',
           pomodoros: 'Pomodoros / Ciclos',
           per_day: 'por dia'
         },
@@ -21,6 +22,7 @@ module WorkMd
           meetings: 'Meetings',
           interruptions: 'Interruptions',
           difficulties: 'Difficulties',
+          observations: 'Observations',
           pomodoros: 'Pomodoros / Cycles',
           per_day: 'per day'
         }

data/lib/work_md/file.rb

@@ -26,6 +26,8 @@ module WorkMd
           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

data/lib/work_md/parser/engine.rb

@@ -2,6 +2,7 @@
 
 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'
@@ -11,6 +12,7 @@ module WorkMd
                       :meetings,
                       :interruptions,
                       :difficulties,
+                      :observations,
                       :date,
                       :pomodoros
       end
@@ -66,9 +68,15 @@ 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)
+          return (pomodoros.to_f / @parsed_files.size).round(1)
         end
 
         0
@@ -115,7 +123,10 @@ module WorkMd
           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
@@ -148,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.6'
+  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.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -53,6 +53,7 @@ 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