work-md 0.3.10 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 536c5338145316ed33c03cf959b02c4ef1272f9c
-  data.tar.gz: 4aec526afbd5eb318727a0a7466813856dcba970
+SHA256:
+  metadata.gz: 7f44d4a6782b7211c58b01812b8ad00048ac2509abbdc60a20397dd2c16ee3a3
+  data.tar.gz: e1bc2d24ec7dbe29540e0105663d31c93b8da49c5a29056217ff6c7d311dee60
 SHA512:
-  metadata.gz: 52784d41c3612a41408ba48755e48790a96b61a76362059031a0509092106f5cbd1c6dd74b6d8dd50261d8f533a47b8df787be83bdfa780b6c20387bdad27232
-  data.tar.gz: d4c730abe51cd1ba28b3dbda73f3ad862b034215a054b904d2d6ab0b81c873c7b676e7e79aedd37ed6ca0cff40627daa7486ab8a4c48fc79be8e35b47fc198fd
+  metadata.gz: 587defdc3bf40c0801ea7b1f624974345e2c112cecb6417637fac295891066735440f43c3845574c524357c36453e2b84a33ade5b4ff62881f475cc3c3ecc200
+  data.tar.gz: 96389252eabac8037b98e2f05d56fab7631b64df53f99bc727cac903e80ffd9c22251f80ab9a29175f8768f9a11c7b9178bb68653fdaf2bd062db9120b7ff441

data/lib/work/md/cli.rb

@@ -12,11 +12,22 @@ module Work
           'y' => 'yesterday',
           'c' => 'config',
           'p' => 'parse',
-          'a' => 'annotations'
+          'pl' => 'plast',
+          'a' => 'annotations',
+          'l' => 'last',
+          'tl' => 'tlast'
         }.freeze
 
       def self.execute(argv)
         first_argv_argument = argv.shift
+        tag = fetch_argv_keys(argv)['tag']
+
+        if tag
+          ENV['WORK_MD_TAG'] = tag
+          argv.reject! { |arg| arg.include?('-tag=') }
+        end
+
+        ::FileUtils.mkdir_p(Work::Md::Config.work_dir)
 
         raise CommandMissing if first_argv_argument.nil?
 
@@ -50,11 +61,14 @@ module Work
           '- work-md today',
           '- work-md yesterday',
           '- work-md tyesterday',
+          '- work-md last',
+          '- work-md tlast',
           '- work-md parse',
+          '- work-md plast',
           '- work-md annotations',
           '- work-md config',
           '',
-          'more information in github.com/work-md',
+          'for more information: github.com/work-md',
           padding: 1,
           title: { top_left: '(work-md)', bottom_right: "(v#{Work::Md::VERSION})" }
         )
@@ -67,6 +81,10 @@ module Work
           title: { top_left: '(error)' }
         }
       end
+
+      def self.fetch_argv_keys(argv)
+        Hash[argv.join(' ').scan(/-?([^=\s]+)(?:=(\S+))?/)]
+      end
     end
   end
 end

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

@@ -6,13 +6,10 @@ module Work
       class Parse
         class << self
           def execute(argv = [])
-            parsed_file_path = Work::Md::Config.work_dir + '/parsed.md'
-            t = Work::Md::Config.translations
-
             parser = Work::Md::Parser::Engine.new
-            args_hash_to_parser = -> (args, received_parser) {
-              year = args['y'] || Time.new.year
-              month = args['m'] || Time.new.month
+            argv_keys_to_parser = -> (argv_keys, received_parser) {
+              year = argv_keys['y'] || Time.new.year
+              month = argv_keys['m'] || Time.new.month
 
               month = "0#{month.to_i}" if month.to_i < 10
 
@@ -24,88 +21,34 @@ module Work
                 received_parser.add_file(file_name)
               end
 
-              if args['d'].include?('..')
-                range = args['d'].split('..')
+              if argv_keys['d'].include?('..')
+                range = argv_keys['d'].split('..')
 
                 (range[0].to_i..range[1].to_i).each { |day| add_file_to_parser.call(day) }
               else
-                args['d'].split(',').each { |day| add_file_to_parser.call(day) }
+                argv_keys['d'].split(',').each { |day| add_file_to_parser.call(day) }
               end
 
               received_parser
             }
 
             argv.join('#').split('#and#').map { |v| v.split("#") }.each do |args|
-              args_hash = Hash[args.join(' ').scan(/-?([^=\s]+)(?:=(\S+))?/)]
-              args_hash_to_parser.(args_hash, parser)
-            end
-
-            parser.freeze
-
-            ::File.delete(parsed_file_path) if ::File.exist? parsed_file_path
-
-            ::File.open(parsed_file_path, 'w+') do |f|
-              f.puts("# #{Work::Md::Config.title}\n\n")
-              f.puts("### #{t[:tasks]} (#{parser.tasks.size}):\n\n")
-              parser.tasks.each do |task|
-                f.puts("- [#{task}\n\n") if task != ' ]'
-              end
-              f.puts("---\n\n")
-              f.puts("### #{t[:meetings]} (#{parser.meetings.size}):\n\n")
-              parser.meetings.each do |meeting|
-                f.puts("- [#{meeting}\n\n") if meeting != ' ]'
-              end
-              f.puts("---\n\n")
-              f.puts("### #{t[:interruptions]} (#{parser.interruptions.size}):\n\n")
-              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")
-              parser.pomodoros_bars.each do |pomodoro_bar|
-                f.puts(pomodoro_bar)
-                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")
-              parser.days_bars.each do |day_bar|
-                f.puts(day_bar)
-                f.puts("\n")
-              end
-
-              f.puts("\n\n")
+              argv_keys_to_parser.(Work::Md::Cli.fetch_argv_keys(args), parser)
             end
 
-            Work::Md::File.open_in_editor([parsed_file_path])
-          rescue StandardError => e
+            Work::Md::File.create_and_open_parsed(parser)
+          rescue StandardError
             Work::Md::Cli.help(
               ::TTY::Box.frame(
-                "message: #{e.message}",
+                "message: Some of verified markdown files may be with an incorrect format",
                 '',
                 '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/plast.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Plast
+        class << self
+          def execute(argv = [])
+            last_n = argv.first.to_i
+            last_date = Date.today.prev_day
+            work_dir = Work::Md::Config.work_dir
+            parser = Work::Md::Parser::Engine.new
+
+            (1..last_n).map do
+              last_file_name = "#{last_date.strftime('%Y/%m/%d')}.md"
+              if ::File.exist?("#{work_dir}/#{last_file_name}")
+                parser.add_file("#{work_dir}/#{last_file_name}")
+              else
+                nil
+              end
+
+              last_date = last_date.prev_day
+            end
+
+            Work::Md::File.create_and_open_parsed(parser)
+          rescue StandardError
+            Work::Md::Cli.help(
+              ::TTY::Box.frame(
+                "message: Some of verified markdown files may be with an incorrect format",
+                '',
+                'Usage example:',
+                '',
+                'work-md pl 7       # parse the last 7 days',
+                **Work::Md::Cli.error_frame_style
+              )
+            )
+          end
+        end
+      end
+    end
+  end
+end

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/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/file.rb

@@ -15,6 +15,67 @@ module Work
           ::TTY::Editor.open(file_names[0], file_names[1])
         end
       end
+
+      def self.create_and_open_parsed(parser)
+        parser.freeze
+
+        parsed_file_path = Work::Md::Config.work_dir + '/parsed.md'
+        t = Work::Md::Config.translations
+
+        ::File.delete(parsed_file_path) if ::File.exist? parsed_file_path
+
+        ::File.open(parsed_file_path, 'w+') do |f|
+          f.puts("# #{Work::Md::Config.title}\n\n")
+          f.puts("### #{t[:tasks]} (#{parser.tasks.size}):\n\n")
+          parser.tasks.each do |task|
+            f.puts("- [#{task}\n\n") if task != ' ]'
+          end
+          f.puts("---\n\n")
+          f.puts("### #{t[:meetings]} (#{parser.meetings.size}):\n\n")
+          parser.meetings.each do |meeting|
+            f.puts("- [#{meeting}\n\n") if meeting != ' ]'
+          end
+          f.puts("---\n\n")
+          f.puts("### #{t[:interruptions]} (#{parser.interruptions.size}):\n\n")
+          parser.interruptions.each do |interruption|
+            f.puts("- #{interruption}\n")
+          end
+          f.puts("\n") if parser.interruptions.size.positive?
+          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.positive?
+          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.positive?
+          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")
+          parser.pomodoros_bars.each do |pomodoro_bar|
+            f.puts(pomodoro_bar)
+            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")
+          parser.days_bars.each do |day_bar|
+            f.puts(day_bar)
+            f.puts("\n")
+          end
+
+          f.puts("\n\n")
+
+          Work::Md::File.open_in_editor([parsed_file_path])
+        end
+      end
     end
   end
 end

data/lib/work/md/version.rb

@@ -2,6 +2,6 @@
 
 module Work
   module Md
-    VERSION = '0.3.10'
+    VERSION = '0.4.3'
   end
 end

data/lib/work/md.rb

@@ -9,8 +9,11 @@ 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/commands/plast'
 require_relative 'md/cli'
 require 'date'
 require 'fileutils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work-md
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.3
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -54,7 +54,10 @@ files:
 - 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/plast.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
@@ -83,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Track your work activities, write annotations, recap what you did for a week,