work-md 0.4.0 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b2365dee8d1e62694565724b031df8975b11a9eafab0eb2290956915fdfcc89
-  data.tar.gz: d1ef9938b25eb53b38535374872c9d567759c1ddddcee9ad3c54030277453d61
+  metadata.gz: 7dba8433c9dbfaa9a989aeb3fd986a1917aa54d43da9bb4af2e7389a46979938
+  data.tar.gz: 2d1540ff631bf222f970efe6a53504704f7f6425247732d1a83340938e9e305e
 SHA512:
-  metadata.gz: 7e2a875215334876bc1bd28be738fe2ce8500c8186604e87797439b0f654d0dfce7049ba44f6d6d78a4f5962d72a86674d4d9b5920f1a91d56f40bcff06cc574
-  data.tar.gz: 6b2696a31327292c75b1b62e8f17e1cb9b0cc483cd04f44f416412a73767a20f7f9ebf7baa95117d36382bb81a1e212825cb59a8060034a2f682dc0d959cc946
+  metadata.gz: 585e1dece08f50f1b323e751f0bf3d711c69f453773996b2281aef334e11ed564fef356425cd55ea17c79dda36d38724de2759fd717777e8aec8f16a0e1d3609
+  data.tar.gz: 137a09fd7e7bdffa9fa64eacc26213f148509dd68461196d9d63aec359d65ac07534ae1b24f1e4dd51af10f8d2b992c33c349a165c9c0874cf5cdb971bcf8764

data/lib/work/md/cli.rb

@@ -12,6 +12,7 @@ module Work
           'y' => 'yesterday',
           'c' => 'config',
           'p' => 'parse',
+          'pl' => 'plast',
           'a' => 'annotations',
           'l' => 'last',
           'tl' => 'tlast'
@@ -19,6 +20,14 @@ module Work
 
       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?
 
@@ -29,7 +38,7 @@ module Work
         Object
           .const_get("Work::Md::Commands::#{command}")
           .send(:execute, argv)
-      rescue NameError => e
+      rescue NameError
         puts help(
           ::TTY::Box.frame(
             "Command '#{first_argv_argument}' not found!",
@@ -55,10 +64,11 @@ module Work
           '- 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})" }
         )
@@ -71,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

@@ -10,8 +10,7 @@ module Work
             current_day = Date.today.prev_day
             work_dir = Work::Md::Config.work_dir
 
-            (1..90).each do
-
+            (1..160).each do
               file_name = "#{current_day.strftime('%Y/%m/%d')}.md"
 
               if ::File.exist?("#{work_dir}/#{file_name}")
@@ -26,7 +25,7 @@ module Work
             unless found_file
               Work::Md::Cli.help(
                 ::TTY::Box.frame(
-                  "message: No file found in last 90 days",
+                  "message: No file found in last 5 months",
                   **Work::Md::Cli.error_frame_style
                 )
               )

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,81 +21,26 @@ 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:',
                 '',

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Plast
+        class << self
+          def execute(argv = [])
+            is_numeric = ->(str) {
+              str == "#{str.to_f}" || str == "#{str.to_i}"
+            }
+
+            if is_numeric.(argv.first)
+              last_n = argv.first.to_i
+            else
+              Work::Md::Cli.help(
+                ::TTY::Box.frame(
+                  "message: 'plast' command accept only numeric arguments, you give: #{argv.inspect}",
+                  '',
+                  'Usage example:',
+                  '',
+                  'work-md pl 7       # parse the last 7 days',
+                  **Work::Md::Cli.error_frame_style
+                )
+              )
+              return
+            end
+
+            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

@@ -10,7 +10,7 @@ module Work
             work_dir = Work::Md::Config.work_dir
             last_file_name = nil
 
-            (1..90).each do
+            (1..160).each do
               last_file_name = "#{last_date.strftime('%Y/%m/%d')}.md"
               break if ::File.exist?("#{work_dir}/#{last_file_name}")
 

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

@@ -28,7 +28,7 @@ module Work
           raise IS_FROZEN_ERROR_MESSAGE if @frozen
 
           begin
-            file_content = ::File.read(file)
+            file_content = ::File.read(file).squeeze(' ').strip
           rescue Errno::ENOENT
             return
           end
@@ -187,7 +187,12 @@ module Work
         end
 
         def basic_parse(content, start_with: nil)
-          return content.split("#{start_with}:\n")[1] unless start_with.nil?
+          unless start_with.nil?
+            return content
+                   .split("#{start_with}:")[1]
+                   .squeeze(' ')
+                   .sub("\n\n", "\n")
+          end
 
           content.split(":\n\n")[1]
         end

data/lib/work/md/version.rb

@@ -2,6 +2,6 @@
 
 module Work
   module Md
-    VERSION = '0.4.0'
+    VERSION = '0.4.4'
   end
 end

data/lib/work/md.rb

@@ -13,6 +13,7 @@ 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.4.0
+  version: 0.4.4
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -56,6 +56,7 @@ files:
 - 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