work-md 0.4.1 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785ba0c00e62f155b5d1f0bd99e8aabe1f2e2a21ab969ee2d2a537cacdea905a
-  data.tar.gz: 1b0e7d575c2cc1dfa12286ae3a81f7e6407c23bc7e7779cacf04f88fccc3bede
+  metadata.gz: 5e11b12242f29e25b4cd175693b475d548e37c422f966cca7c4ecdd7ae7bbf23
+  data.tar.gz: 7707b5b4ddbcf93fcfa22209eafcfd214de35cf56faec7739ed2b3239af33cd1
 SHA512:
-  metadata.gz: 2f29dee5202dbda4cac2ba534b4fec472188153db6f0aeda0dff409fcb0b20a0dc3a9fbb8d67b0e4ef43c492bdbf5a0aabd0ad6d1e356d4cea0d7aa5b572aa31
-  data.tar.gz: 7908a13d8c2515a0d149f63aa896aad7c476efde33664a66f08da9178e979f8f761a25ad5ed6b41fc6a44fa2898d3ca934ad9021575ccd6ca1079233b9a10219
+  metadata.gz: 49da10202bf64a92baff477f92ad3cb510e8445ef4792b64298f0449680862b0b241ed8a710f047dd846ee5cf9d53930b9bc1594ca1a4e9fcaa29b6adef8ad0e
+  data.tar.gz: 932cc585bf763de7d26eade30b48a903885ba23a17a5a6594e3d088f598a7b99fbb99414bb98b0042b2b351f7a32e740c8c0bd74f82851afd2960235ec5aa06d

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/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,28 @@ 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 Work::Md::Parser::Error => e
+            Work::Md::Cli.help(e.message)
+          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,63 @@
+# 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 Work::Md::Parser::Error => e
+            Work::Md::Cli.help(e.message)
+          rescue StandardError => e
+            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/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")
+        end
+
+        Work::Md::File.open_in_editor([parsed_file_path])
+      end
     end
   end
 end

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

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require 'date'
+
 module Work
   module Md
     module Parser
+      class Error < StandardError; end
+
       # rubocop:disable Metrics/ClassLength
       class Engine
         IS_FROZEN_ERROR_MESSAGE = 'Work::Md::Parser::Engine is frozen'
@@ -28,7 +32,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
@@ -108,12 +112,12 @@ module Work
 
           @days_bars ||=
             @parsed_files.map do |f|
-              pom = (1..f.pomodoros).map { '⬛' }.join
-              mee = f.meetings.map { '📅' }.join
-              int = f.interruptions.map { '⚠️' }.join
-              dif = f.difficulties.map { '😓' }.join
-              obs = f.observations.map { '📝' }.join
-              tas = f.tasks.map { '✔️' }.join
+              pom = (1..f.pomodoros).map { '⬛' }.join if f.pomodoros
+              mee = f.meetings.map { '📅' }.join if f.meetings
+              int = f.interruptions.map { '⚠️' }.join if f.interruptions
+              dif = f.difficulties.map { '😓' }.join if f.difficulties
+              obs = f.observations.map { '📝' }.join if f.observations
+              tas = f.tasks.map { '✔️' }.join if f.tasks
 
               "(#{f.date}) #{pom}#{mee}#{int}#{dif}#{obs}#{tas}"
             end
@@ -170,6 +174,19 @@ module Work
             parsed_file.pomodoros =
               parse_pomodoro(content, start_with: @t[:pomodoros])
           end
+        rescue StandardError
+          # TODO: Write tests for this scenario
+          file_name = Date.strptime(parsed_file.date, '%d/%m/%Y').strftime('%Y/%m/%d.md')
+          message = ::TTY::Box.frame(
+            "message: Cannot parse file '#{file_name}' maybe it's in an incorrect format.",
+            '',
+            'Usage example:',
+            '',
+            'work-md pl 7       # parse the last 7 days',
+            **Work::Md::Cli.error_frame_style
+          )
+
+          raise Error, message
         end
         # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/PerceivedComplexity
@@ -187,7 +204,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.1'
+    VERSION = '0.4.5'
   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.1
+  version: 0.4.5
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-26 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