work-md 0.3.6 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 06e074c584e95d069fbd320f73857798672c9f72f77400841b72620c2d3d4cc1
-  data.tar.gz: 33ccf6bebcf8d0e2fdd54bb8a7071e35146fd608621fd4679e7f097b17a44ff0
+SHA1:
+  metadata.gz: 536c5338145316ed33c03cf959b02c4ef1272f9c
+  data.tar.gz: 4aec526afbd5eb318727a0a7466813856dcba970
 SHA512:
-  metadata.gz: d815119f5a6b395a27f709ea7f165bb16c817c5de2a669de678619f76f6ea8c76c88b0b8fad6bf4d689f5f10900ae98e69aa0d54fd6456f993b73f3df9ecfb6d
-  data.tar.gz: 4b2031d4bf1f0a987d6dc3278eeefde64086981c370b23cd3fa978d59aa43573e6245b272ea22c767f3c49884e8db93d868ea494dddb72164f0008986f6ef758
+  metadata.gz: 52784d41c3612a41408ba48755e48790a96b61a76362059031a0509092106f5cbd1c6dd74b6d8dd50261d8f533a47b8df787be83bdfa780b6c20387bdad27232
+  data.tar.gz: d4c730abe51cd1ba28b3dbda73f3ad862b034215a054b904d2d6ab0b81c873c7b676e7e79aedd37ed6ca0cff40627daa7486ab8a4c48fc79be8e35b47fc198fd

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

@@ -144,53 +144,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.6'
+    VERSION = '0.3.10'
   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.6
+  version: 0.3.10
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-17 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,6 +49,7 @@ 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
@@ -58,15 +59,16 @@ 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
-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
@@ -81,8 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.14.4
+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!