work-md 0.3.8 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d7014d50eb0200a0a7c923da4abe0bf1e896190cded2efb79b71beadfdca6c
-  data.tar.gz: 246776e2647530b64c5756a9f44dc911055b6e6948f300065c7f03cadec4a41b
+  metadata.gz: 785ba0c00e62f155b5d1f0bd99e8aabe1f2e2a21ab969ee2d2a537cacdea905a
+  data.tar.gz: 1b0e7d575c2cc1dfa12286ae3a81f7e6407c23bc7e7779cacf04f88fccc3bede
 SHA512:
-  metadata.gz: 47051b17fe24d01c28cc9e1a0fe5fee3d3cddb09746d8edce69ca6ae567e303b72274b1edb6427e6527afc8bdf128e4318c2200f3c82cecb80e55dd85ac97d64
-  data.tar.gz: 1186bbea64e4826639f54f3fbe91cb4da2766f152409a0203a11ea68c2c852e4f439444fd0e95542457380d9d180c9fe2ea8041f4261c4408ab9659e9a5e16aa
+  metadata.gz: 2f29dee5202dbda4cac2ba534b4fec472188153db6f0aeda0dff409fcb0b20a0dc3a9fbb8d67b0e4ef43c492bdbf5a0aabd0ad6d1e356d4cea0d7aa5b572aa31
+  data.tar.gz: 7908a13d8c2515a0d149f63aa896aad7c476efde33664a66f08da9178e979f8f761a25ad5ed6b41fc6a44fa2898d3ca934ad9021575ccd6ca1079233b9a10219

data/bin/work-md.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../lib/work/md'
+# require 'work/md'
+
+Work::Md::Cli.execute(ARGV)

data/lib/work/md/cli.rb

@@ -12,7 +12,9 @@ module Work
           'y' => 'yesterday',
           'c' => 'config',
           'p' => 'parse',
-          'a' => 'annotations'
+          'a' => 'annotations',
+          'l' => 'last',
+          'tl' => 'tlast'
         }.freeze
 
       def self.execute(argv)
@@ -27,7 +29,7 @@ module Work
         Object
           .const_get("Work::Md::Commands::#{command}")
           .send(:execute, argv)
-      rescue NameError
+      rescue NameError => e
         puts help(
           ::TTY::Box.frame(
             "Command '#{first_argv_argument}' not found!",
@@ -50,6 +52,8 @@ module Work
           '- work-md today',
           '- work-md yesterday',
           '- work-md tyesterday',
+          '- work-md last',
+          '- work-md tlast',
           '- work-md parse',
           '- work-md annotations',
           '- work-md config',

data/lib/work/md/commands/last.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Last
+        class << self
+          def execute(_argv = [])
+            found_file = false
+            current_day = Date.today.prev_day
+            work_dir = Work::Md::Config.work_dir
+
+            (1..160).each do
+              file_name = "#{current_day.strftime('%Y/%m/%d')}.md"
+
+              if ::File.exist?("#{work_dir}/#{file_name}")
+                Work::Md::File.open_in_editor([file_name])
+                found_file = true
+                break
+              end
+
+              current_day = current_day.prev_day
+            end
+
+            unless found_file
+              Work::Md::Cli.help(
+                ::TTY::Box.frame(
+                  "message: No file found in last 5 months",
+                  **Work::Md::Cli.error_frame_style
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/work/md/commands/parse.rb

@@ -60,44 +60,41 @@ module Work
               parser.interruptions.each do |interruption|
                 f.puts("- #{interruption}\n")
               end
+              f.puts("\n") if parser.interruptions.size > 0
               f.puts("---\n\n")
               f.puts("### #{t[:difficulties]} (#{parser.difficulties.size}):\n\n")
               parser.difficulties.each do |difficulty|
                 f.puts("- #{difficulty}\n")
               end
+              f.puts("\n") if parser.difficulties.size > 0
               f.puts("---\n\n")
               f.puts("### #{t[:observations]} (#{parser.observations.size}):\n\n")
               parser.observations.each do |observation|
                 f.puts("- #{observation}\n")
               end
+              f.puts("\n") if parser.observations.size > 0
               f.puts("---\n\n")
               f.puts("### #{t[:pomodoros]} (#{parser.average_pomodoros} #{t[:per_day]}):\n\n")
               f.puts("**#{t[:total]}: #{parser.pomodoros_sum}**")
-              f.puts("\n\n")
+              f.puts("\n")
               parser.pomodoros_bars.each do |pomodoro_bar|
                 f.puts(pomodoro_bar)
-                f.puts("\n\n")
+                f.puts("\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")
+              f.puts("\n")
               parser.days_bars.each do |day_bar|
                 f.puts(day_bar)
-                f.puts("\n\n")
+                f.puts("\n")
               end
 
               f.puts("\n\n")
             end
 
-            editor = Work::Md::Config.editor
-
-            if editor.nil?
-              ::TTY::Editor.open(parsed_file_path)
-            else
-              ::TTY::Editor.open(parsed_file_path, command: editor)
-            end
+            Work::Md::File.open_in_editor([parsed_file_path])
           rescue StandardError => e
             Work::Md::Cli.help(
               ::TTY::Box.frame(
@@ -105,10 +102,11 @@ module Work
                 '',
                 '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',
+                'work-md p -d=1 -m=5 -y=2000 # get day 1 from month 5 and year 2000',
+                'work-md p -d=1,2,3          # get day 1, 2 and 3 from the current month and year',
+                'work-md p -d=1,2 -m=4       # get day 1 and 2 from month 4 and current year',
+                'work-md p -d=1..10 -m=4     # get day 1 to 10 from month 4 and current year',
+                'work-md p -d=1..25 -m=2 and -d=1..25 -m=2 -y=1999     # get day 1 to 25 from month 2 and current year and 1 to 25 from month 2 in 1999',
                 **Work::Md::Cli.error_frame_style
               )
             )

data/lib/work/md/commands/tlast.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Tlast
+        class << self
+          def execute(_argv = [])
+            last_date = Date.today.prev_day
+            work_dir = Work::Md::Config.work_dir
+            last_file_name = nil
+
+            (1..160).each do
+              last_file_name = "#{last_date.strftime('%Y/%m/%d')}.md"
+              break if ::File.exist?("#{work_dir}/#{last_file_name}")
+
+              last_date = last_date.prev_day
+            end
+
+            today_file_name = Work::Md::DateFile.create_if_not_exist(DateTime.now)
+
+            Work::Md::File.open_in_editor([today_file_name, last_file_name].compact)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/work/md/commands/today.rb

@@ -6,7 +6,7 @@ module Work
       class Today
         class << self
           def execute(_argv = [])
-            Work::Md::File.open_or_create(DateTime.now)
+            Work::Md::DateFile.open_or_create(DateTime.now)
           end
         end
       end

data/lib/work/md/commands/tyesterday.rb

@@ -8,7 +8,7 @@ module Work
           def execute(_argv = [])
             file_names =
               [DateTime.now, Date.today.prev_day].map do |date|
-                Work::Md::File.create_if_not_exist(date)
+                Work::Md::DateFile.create_if_not_exist(date)
               end
 
             Work::Md::File.open_in_editor(file_names)

data/lib/work/md/commands/yesterday.rb

@@ -6,7 +6,7 @@ module Work
       class Yesterday
         class << self
           def execute(_argv = [])
-            Work::Md::File.open_or_create(Date.today.prev_day)
+            Work::Md::DateFile.open_or_create(Date.today.prev_day)
           end
         end
       end

data/lib/work/md/config.rb

@@ -54,7 +54,12 @@ module Work
       end
 
       def self.work_dir
-        ENV['WORK_MD_DIR'] || DEFAULT_WORK_DIR
+        dir =
+          ENV['WORK_MD_DIR'] || DEFAULT_WORK_DIR
+
+        return "#{dir}/#{ENV['WORK_MD_TAG']}" if ENV['WORK_MD_TAG']
+
+        dir
       end
 
       def self.translations

data/lib/work/md/date_file.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    class DateFile
+      def self.open_or_create(some_date, dir: nil)
+        Work::Md::File.open_in_editor(
+          [create_if_not_exist(some_date, dir: dir)], dir: dir
+        )
+      end
+
+      def self.create_if_not_exist(some_date, dir: nil)
+        t = Work::Md::Config.translations
+        work_dir = dir || Work::Md::Config.work_dir
+
+        file_name = "#{some_date.strftime('%Y/%m/%d')}.md"
+
+        return file_name if ::File.exist?("#{work_dir}/#{file_name}")
+
+        ::FileUtils
+          .mkdir_p("#{work_dir}/#{some_date.strftime('%Y/%m')}")
+
+        ::File.open(
+          "#{work_dir}/#{file_name}",
+          'w+'
+        ) do |f|
+          f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{Work::Md::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("---\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
+
+        file_name
+      end
+    end
+  end
+end

data/lib/work/md/file.rb

@@ -3,45 +3,6 @@
 module Work
   module Md
     class File
-      def self.open_or_create(some_date, dir: nil)
-        open_in_editor([create_if_not_exist(some_date, dir: dir)], dir: dir)
-      end
-
-      def self.create_if_not_exist(some_date, dir: nil)
-        t = Work::Md::Config.translations
-        work_dir = dir || Work::Md::Config.work_dir
-
-        file_name = "#{some_date.strftime('%Y/%m/%d')}.md"
-
-        return file_name if ::File.exist?("#{work_dir}/#{file_name}")
-
-        ::FileUtils
-          .mkdir_p("#{work_dir}/#{some_date.strftime('%Y/%m')}")
-
-        ::File.open(
-          "#{work_dir}/#{file_name}",
-          'w+'
-        ) do |f|
-          f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{Work::Md::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("---\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
-
-        file_name
-      end
-
       def self.open_in_editor(file_names = [], dir: nil)
         editor = Work::Md::Config.editor
         work_dir = dir || Work::Md::Config.work_dir

data/lib/work/md/parser/engine.rb

@@ -144,53 +144,65 @@ module Work
             parsed_file.date =
               content.split(' - ')[0].gsub('# ', '').gsub("\n\n", '')
           elsif content.start_with?(@t[:tasks])
-            parsed_file.tasks = parse_check_list(content)
+            parsed_file.tasks = parse_check_list(content, start_with: @t[:tasks])
           elsif content.start_with?(@t[:meetings])
-            parsed_file.meetings = parse_check_list(content)
+            parsed_file.meetings = parse_check_list(content, start_with: @t[:meetings])
           elsif content.start_with?(@t[:interruptions])
             parsed_file.interruptions =
-              parse_list(content).map do |interruption|
+              parse_list(content, start_with: @t[:interruptions]).map do |interruption|
                 "(#{parsed_file.date}) #{interruption}"
               end
           elsif content.start_with?(@t[:difficulties])
-            parsed_file.difficulties = parse_list(content).map do |difficulty|
-              "(#{parsed_file.date}) #{difficulty}"
-            end
+            parsed_file.difficulties =
+              parse_list(
+                content, start_with: @t[:difficulties]
+              ).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
+            parsed_file.observations =
+              parse_list(
+                content, start_with: @t[:observations]
+              ).map do |observations|
+                "(#{parsed_file.date}) #{observations}"
+              end
           elsif content.start_with?(@t[:pomodoros])
-            parsed_file.pomodoros = parse_pomodoro(content)
+            parsed_file.pomodoros =
+              parse_pomodoro(content, start_with: @t[:pomodoros])
           end
         end
         # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/PerceivedComplexity
 
-        def parse_check_list(content)
-          clear_list(basic_parse(content).split('- ['))
+        def parse_check_list(content, start_with: nil)
+          clear_list(basic_parse(content, start_with: start_with).split('- ['))
         end
 
-        def parse_list(content)
-          clear_list(basic_parse(content).split('- '))
+        def parse_list(content, start_with: nil)
+          clear_list(basic_parse(content, start_with: start_with).split('- '))
         end
 
-        def parse_pomodoro(content)
-          basic_parse(content).scan(/\d+/).first.to_i
+        def parse_pomodoro(content, start_with: nil)
+          basic_parse(content, start_with: start_with).scan(/\d+/).first.to_i
         end
 
-        def basic_parse(content)
+        def basic_parse(content, start_with: nil)
+          return content.split("#{start_with}:\n")[1] unless start_with.nil?
+
           content.split(":\n\n")[1]
         end
 
+        # rubocop:disable Metrics/CyclomaticComplexity
         def clear_list(list)
           return list unless list.is_a?(Array)
 
           list
             .map { |s| s.gsub('---', '') unless s.nil? }
-            .select { |s| (s != '') && (s != "\n\n") }
+            .select { |s| (s != "\n\n") && (s != "\n\n\n") }
             .map(&:strip)
+            .reject { |s| (s == '') }
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
       end
       # rubocop:enable Metrics/ClassLength
     end

data/lib/work/md/version.rb

@@ -2,6 +2,6 @@
 
 module Work
   module Md
-    VERSION = '0.3.8'
+    VERSION = '0.4.1'
   end
 end

data/lib/work/md.rb

@@ -3,11 +3,14 @@
 require_relative 'md/version'
 require_relative 'md/config'
 require_relative 'md/file'
+require_relative 'md/date_file'
 require_relative 'md/commands/today'
 require_relative 'md/commands/config'
 require_relative 'md/commands/yesterday'
 require_relative 'md/commands/tyesterday'
 require_relative 'md/commands/annotations'
+require_relative 'md/commands/last'
+require_relative 'md/commands/tlast'
 require_relative 'md/parser/engine'
 require_relative 'md/commands/parse'
 require_relative 'md/cli'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work-md
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.1
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2021-10-22 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:
@@ -49,24 +49,28 @@ files:
 - bin/console
 - bin/setup
 - bin/work-md
+- bin/work-md.rb
 - lib/work/md.rb
 - lib/work/md/cli.rb
 - lib/work/md/commands/annotations.rb
 - lib/work/md/commands/config.rb
+- lib/work/md/commands/last.rb
 - lib/work/md/commands/parse.rb
+- lib/work/md/commands/tlast.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/date_file.rb
 - 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/work-md/work-md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -81,8 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.2.22
+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!