work-md 0.3.9 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d60ff8b9a7a58227c03ffdd52c61da194073d81c0e527caf567222ec1603cec
-  data.tar.gz: c4903302aa7c56acd9522c745049d219cd9c4dcbe98f5470210fa0f7476e06a7
+  metadata.gz: f71380cbbd01039015727e92f5de5e621b1a3511914e4a6b81ef50de192ea43d
+  data.tar.gz: 7952a1d0d8c232a40ac18bdf90ff5f3b728aa57b3868170821204136492b04ff
 SHA512:
-  metadata.gz: 205437250b4aa23ed69996b1d54fe34063fe3601bb33e4b1e91f090e8fee296916fd78a5b963238471ff2291109e29a4fd39a2faad3cb9d8eeac6c4d06bb5f0a
-  data.tar.gz: 1965c5824034763f978a1e1ab7064b390c3c73d09d4a7580ce0e1c8c09af71c5d9d693fd77372fe3142ee25bc46a273656b78937ab0ff8547a1b7732e48f0d75
+  metadata.gz: 11d3bc8deb4aa7ba041a171a28b825eed5ce1690a53644ab331583f219f970a58c1dfcfcf7c95460e4ab2634efad01f5bdfe9e68a754da7f859ae40c43ab9a5d
+  data.tar.gz: e4a5616a87b0d249ef703b775f6956af217f578bd9fc3cd88e2becd43a45d96f5daed154704e174c7e1724cf703234be2e848e5e805932275b407727c709cef6

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,10 @@ module Work
           'y' => 'yesterday',
           'c' => 'config',
           'p' => 'parse',
-          'a' => 'annotations'
+          'pl' => 'plast',
+          'a' => 'annotations',
+          'l' => 'last',
+          'tl' => 'tlast'
         }.freeze
 
       def self.execute(argv)
@@ -27,7 +30,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 +53,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

@@ -6,9 +6,6 @@ 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
@@ -40,61 +37,7 @@ module Work
               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")
-            end
-
-            Work::Md::File.open_in_editor([parsed_file_path])
+            Work::Md::File.create_and_open_parsed(parser)
           rescue StandardError => e
             Work::Md::Cli.help(
               ::TTY::Box.frame(
@@ -102,10 +45,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/plast.rb

@@ -0,0 +1,31 @@
+# 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)
+          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/parser/engine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
-
 module Work
   module Md
     module Parser

data/lib/work/md/version.rb

@@ -2,6 +2,6 @@
 
 module Work
   module Md
-    VERSION = '0.3.9'
+    VERSION = '0.4.2'
   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.9
+  version: 0.4.2
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2021-11-21 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,11 +49,15 @@ 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/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
@@ -62,12 +66,12 @@ files:
 - 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
@@ -82,8 +86,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!