work-md 0.3.5 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d880e4894863c9e62e915bb397194711aee0ec9d144dd0e53acffb4af268904
-  data.tar.gz: f4082880a4a1d0feca7e6a4c6fda1c57b865b7c7a692a4e22a68c30e5adc6b3b
+  metadata.gz: 1d60ff8b9a7a58227c03ffdd52c61da194073d81c0e527caf567222ec1603cec
+  data.tar.gz: c4903302aa7c56acd9522c745049d219cd9c4dcbe98f5470210fa0f7476e06a7
 SHA512:
-  metadata.gz: f262f4192079f5c19b51b07e7575d2efa8419d5f29a1479a04d36cf9795c68c9f0cb06563050ed643ffa95427695b710318b8db97293a0e64daf4d3396c2742c
-  data.tar.gz: ca947bf521e40588ce9c7db992bd23954b7c3b4fe4dcf2345ce888196b1b1c5ac524fc5068aa3716ce625a2ab80e2e3ad915e845928135e35796848ecfc01564
+  metadata.gz: 205437250b4aa23ed69996b1d54fe34063fe3601bb33e4b1e91f090e8fee296916fd78a5b963238471ff2291109e29a4fd39a2faad3cb9d8eeac6c4d06bb5f0a
+  data.tar.gz: 1965c5824034763f978a1e1ab7064b390c3c73d09d4a7580ce0e1c8c09af71c5d9d693fd77372fe3142ee25bc46a273656b78937ab0ff8547a1b7732e48f0d75

data/bin/work-md

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

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

@@ -7,29 +7,37 @@ module Work
         class << self
           def execute(argv = [])
             parsed_file_path = Work::Md::Config.work_dir + '/parsed.md'
-            args = Hash[argv.join(' ').scan(/-?([^=\s]+)(?:=(\S+))?/)]
-            parser = Work::Md::Parser::Engine.new
             t = Work::Md::Config.translations
 
-            year = args['y'] || Time.new.year
-            month = args['m'] || Time.new.month
+            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
 
-            month = "0#{month.to_i}" if month.to_i < 10
+              month = "0#{month.to_i}" if month.to_i < 10
 
-            add_file_to_parser = lambda do |day|
-              day = "0#{day.to_i}" if day.to_i < 10
+              add_file_to_parser = lambda do |day|
+                day = "0#{day.to_i}" if day.to_i < 10
 
-              file_name = Work::Md::Config.work_dir + "/#{year}/#{month}/#{day}.md"
+                file_name = Work::Md::Config.work_dir + "/#{year}/#{month}/#{day}.md"
 
-              parser.add_file(file_name)
-            end
+                received_parser.add_file(file_name)
+              end
+
+              if args['d'].include?('..')
+                range = args['d'].split('..')
 
-            if args['d'].include?('..')
-              range = args['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) }
+              end
 
-              (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) }
+              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
@@ -52,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(

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/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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'byebug'
+
 module Work
   module Md
     module Parser
@@ -144,53 +146,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.5'
+    VERSION = '0.3.9'
   end
 end

data/lib/work/md.rb

@@ -3,6 +3,7 @@
 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work-md
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.9
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -58,6 +58,7 @@ files:
 - 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