work_md 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c7ac71894ac4ae951f1b0b2a7e6e4c7f5bbca415b3e2a175b8ca35c9adfb4ca
-  data.tar.gz: 8c5372912117c88e8e1c25c7245d400b585c616101f13da1094fb13f61abc81f
+  metadata.gz: 566027a143beb9e55274abe76ef2f0d0c7a44078d4773c595e9cdce2175a2c32
+  data.tar.gz: d4094062e154849f8514d26c20d52d37e931d3f844f2b162cb26eab2b7a70d5d
 SHA512:
-  metadata.gz: c347b644ee03cab1a499f7bea1cab09bd0e5601c52b39edb41e76f2d616ae4225e1c557ae6fd77eb368e403e094188c060f56e2589ae6462e55139122d7cc8ac
-  data.tar.gz: 81ec971d682d95fb2834c73df6615bea6448294c764f36470af1fe607784fa8d6bf47b5163a2117c03494b909cdf153282899ee0f96812743f44dbbe8732ae0a
+  metadata.gz: 41053f4429dfd6a4a3af74e52da1d6f131aac58c79c9034a201814a89dc67fd7a2e3feae74c25afa8c0ffc0b610cf9d8332392ee69cb66f43011779033a4af21
+  data.tar.gz: 4daed1478dedc190e1d3eef1719c54f16af4040519b276ab08820453e08371112fd92cd70b9aef8c3e32480cee65257daa884f3580b0748cb8d32c34c6fabd3f

data/lib/work_md.rb

@@ -2,7 +2,9 @@
 
 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/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',
+        'y' => 'yesterday',
         'p' => 'parse'
       }.freeze
 
@@ -44,6 +45,7 @@ module WorkMd
         '',
         '- work_md',
         '- work_md today',
+        '- work_md yesterday',
         '- work_md parse',
         '',
         'read more in github.com/henriquefernandez/work_md',

data/lib/work_md/commands/parse.rb

@@ -27,9 +27,9 @@ module WorkMd
 
             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 +38,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,14 +51,22 @@ module WorkMd
                 f.puts("- #{difficulty}\n\n")
               end
               f.puts("---\n\n")
-              f.puts("### #{t[:pomodoros]}:\n\n")
+              f.puts("### #{t[:pomodoros]} (#{parser.average_pomodoros} #{t[:per_day]}):\n\n")
               f.puts(parser.pomodoros)
             end
 
-            ::TTY::Editor.open(PARSED_FILE_PATH)
-          rescue
+            editor = WorkMd::Config.editor
+
+            unless editor.nil?
+              ::TTY::Editor.open(PARSED_FILE_PATH, command: editor)
+            else
+              ::TTY::Editor.open(PARSED_FILE_PATH)
+            end
+          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",

data/lib/work_md/commands/today.rb

@@ -5,41 +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
-
-          ::FileUtils.cd(work_dir) do
-            ::TTY::Editor.open("#{today.strftime('%Y/%m/%d')}.md")
-          end
+          WorkMd::File.open_or_create(DateTime.now)
         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

@@ -5,27 +5,24 @@ require 'yaml'
 module WorkMd
   module Config
     DEFAULT_WORK_DIR = Dir.home + '/work_md'
-    DEFAULT_EDITOR = 'vi'
     TRANSLATIONS = {
       'pt' =>
         {
           tasks: 'Atividades',
           meetings: 'Reuniões',
-          annotations: 'Anotações',
-          meeting_annotations: 'Anotações de Reunião',
           interruptions: 'Interrupções',
           difficulties: 'Dificuldades',
-          pomodoros: 'Pomodoros'
+          pomodoros: 'Pomodoros / Ciclos',
+          per_day: 'por dia'
         },
       'en' =>
         {
           tasks: 'Tasks',
           meetings: 'Meetings',
-          annotations: 'Annotations',
-          meeting_annotations: 'Meeting Annotations',
           interruptions: 'Interruptions',
           difficulties: 'Difficulties',
-          pomodoros: 'Pomodoros'
+          pomodoros: 'Pomodoros / Cycles',
+          per_day: 'per day'
         }
     }.freeze
 
@@ -34,7 +31,7 @@ module WorkMd
     end
 
     def self.editor
-      ENV['EDITOR'] || ENV['VISUAL'] || yaml_file['editor'] || DEFAULT_EDITOR
+      ENV['EDITOR'] || ENV['VISUAL'] || yaml_file['editor'] || nil
     end
 
     def self.work_dir

data/lib/work_md/file.rb

@@ -0,0 +1,48 @@
+# 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[: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

@@ -8,11 +8,10 @@ module WorkMd
 
       class ParsedFile
         attr_accessor :tasks,
-                      :annotations,
-                      :meeting_annotations,
                       :meetings,
                       :interruptions,
                       :difficulties,
+                      :date,
                       :pomodoros
       end
 
@@ -26,7 +25,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,19 +48,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
 
@@ -80,6 +66,14 @@ module WorkMd
         @difficulties ||= @parsed_files.map(&:difficulties).flatten
       end
 
+      def average_pomodoros
+        if @parsed_files.size.positive? && pomodoros.positive?
+          return (pomodoros / @parsed_files.size)
+        end
+
+        0
+      end
+
       def pomodoros
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
@@ -106,18 +100,22 @@ 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[:pomodoros])
           parsed_file.pomodoros = parse_pomodoro(content)
         end
@@ -125,7 +123,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
 

data/lib/work_md/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_md
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -53,7 +53,9 @@ files:
 - lib/work_md/cli.rb
 - lib/work_md/commands/parse.rb
 - lib/work_md/commands/today.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: