work_md 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 566027a143beb9e55274abe76ef2f0d0c7a44078d4773c595e9cdce2175a2c32
-  data.tar.gz: d4094062e154849f8514d26c20d52d37e931d3f844f2b162cb26eab2b7a70d5d
+  metadata.gz: db1941195d4c4dddb02ca3375e3f1dcd099e8799330f7ac6b78ac62cb39984b5
+  data.tar.gz: 92c72a7d0909f34bab420fabe8c85959b23ce069908da3704cb4b016d036316f
 SHA512:
-  metadata.gz: 41053f4429dfd6a4a3af74e52da1d6f131aac58c79c9034a201814a89dc67fd7a2e3feae74c25afa8c0ffc0b610cf9d8332392ee69cb66f43011779033a4af21
-  data.tar.gz: 4daed1478dedc190e1d3eef1719c54f16af4040519b276ab08820453e08371112fd92cd70b9aef8c3e32480cee65257daa884f3580b0748cb8d32c34c6fabd3f
+  metadata.gz: f5f618a78bab8117824f2819e7c4bf49999a4f3396e1dcd6c198fd78ef37ece4d708ffd7400f9d38eeac72a361109124bf6f9f8feb681730e44d2a65045c91f3
+  data.tar.gz: 3030407c84b51b4bb9caf485c88e851b824b1aadcda7ab1859a46c985066a623f74a19614fed3db1a0186822053637fc69deff49d288ab877f4adb9c023df4cf

data/bin/work_md

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# require_relative '../lib/work_md'
 require 'work_md'
 
 WorkMd::Cli.execute(ARGV)

data/lib/work_md.rb

@@ -4,7 +4,9 @@ require_relative 'work_md/version'
 require_relative 'work_md/config'
 require_relative 'work_md/file'
 require_relative 'work_md/commands/today'
+require_relative 'work_md/commands/config'
 require_relative 'work_md/commands/yesterday'
+require_relative 'work_md/commands/tyesterday'
 require_relative 'work_md/parser/engine'
 require_relative 'work_md/commands/parse'
 require_relative 'work_md/cli'

data/lib/work_md/cli.rb

@@ -7,12 +7,12 @@ module WorkMd
     ALIAS_COMMANDS =
       {
         't' => 'today',
+        'ty' => 'tyesterday',
         'y' => 'yesterday',
+        'c' => 'config',
         'p' => 'parse'
       }.freeze
 
-    DEFAULT_COMMAND = WorkMd::Commands::Today
-
     def self.execute(argv)
       first_argv_argument = argv.shift
 
@@ -25,17 +25,17 @@ module WorkMd
         .const_get("WorkMd::Commands::#{command}")
         .send(:execute, argv)
     rescue NameError
-      puts info(
+      puts help(
         ::TTY::Box.frame(
           "Command '#{first_argv_argument}' not found!",
           **error_frame_style
         )
       )
     rescue CommandMissing
-      DEFAULT_COMMAND.execute(argv)
+      help('Welcome! =)')
     end
 
-    def self.info(message = '')
+    def self.help(message = '')
       # rubocop:disable Layout/LineLength
       puts ::TTY::Box.frame(
         message,
@@ -46,9 +46,11 @@ module WorkMd
         '- work_md',
         '- work_md today',
         '- work_md yesterday',
+        '- work_md tyesterday',
         '- work_md parse',
+        '- work_md config',
         '',
-        'read more in github.com/henriquefernandez/work_md',
+        'more information in github.com/henriquefernandez/work_md',
         padding: 1,
         title: { top_left: '(work_md)', bottom_right: "(v#{WorkMd::VERSION})" }
       )

data/lib/work_md/commands/config.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module WorkMd
+  module Commands
+    class Config
+      class << self
+        def execute(_argv = [])
+          file_name = 'config.yml'
+          work_dir = ::WorkMd::Config::DEFAULT_WORK_DIR
+
+          unless ::File.exist?("#{work_dir}/#{file_name}")
+            ::FileUtils.mkdir_p(work_dir)
+
+            ::File.open("#{work_dir}/#{file_name}", 'w+') do |f|
+              f.puts("# Example configuration:")
+              f.puts("#")
+              f.puts("# title: Your Name")
+              f.puts("# editor: vim")
+              f.puts("# lang: en")
+              f.puts("#")
+              f.puts("title: # Title your work_md files")
+              f.puts("editor: # Your default editor")
+              f.puts("lang: # Only 'pt', 'en' and 'es' avaiable")
+            end
+          end
+
+          ::WorkMd::File.open_in_editor(
+            file_names: [file_name],
+            dir: work_dir
+          )
+        end
+      end
+    end
+  end
+end

data/lib/work_md/commands/parse.rb

@@ -17,7 +17,7 @@ module WorkMd
 
             month = "0#{month.to_i}" if month.to_i < 10
 
-            args['d'].split(',').each do |day|
+            add_file_to_parser = ->(day) do
               day = "0#{day.to_i}" if day.to_i < 10
 
               file_name = WorkMd::Config.work_dir + "/#{year}/#{month}/#{day}.md"
@@ -25,6 +25,14 @@ module WorkMd
               parser.add_file(file_name)
             end
 
+            if args['d'].include?('..')
+              range = args['d'].split('..')
+
+              (range[0].to_i..range[1].to_i).each { |day| add_file_to_parser.(day) }
+            else
+              args['d'].split(',').each { |day| add_file_to_parser.(day) }
+            end
+
             parser.freeze
 
             ::File.delete(PARSED_FILE_PATH) if ::File.exist? PARSED_FILE_PATH
@@ -51,8 +59,20 @@ module WorkMd
                 f.puts("- #{difficulty}\n\n")
               end
               f.puts("---\n\n")
+              f.puts("### #{t[:observations]} (#{parser.observations.size}):\n\n")
+              parser.observations.each do |observation|
+                f.puts("- #{observation}\n\n")
+              end
+              f.puts("---\n\n")
               f.puts("### #{t[:pomodoros]} (#{parser.average_pomodoros} #{t[:per_day]}):\n\n")
-              f.puts(parser.pomodoros)
+              f.puts(parser.pomodoros_sum)
+              f.puts("\n\n")
+
+              parser.pomodoros_bars.each do |pomodoro_bar|
+                f.puts(pomodoro_bar)
+                f.puts("\n\n")
+              end
+              f.puts("\n\n")
             end
 
             editor = WorkMd::Config.editor
@@ -63,7 +83,7 @@ module WorkMd
               ::TTY::Editor.open(PARSED_FILE_PATH)
             end
           rescue => e
-            WorkMd::Cli.info(
+            WorkMd::Cli.help(
               ::TTY::Box.frame(
                 "message: #{e.message}",
                 "",
@@ -72,6 +92,7 @@ module WorkMd
                 "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",
                 **WorkMd::Cli.error_frame_style
               )
             )

data/lib/work_md/commands/tyesterday.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module WorkMd
+  module Commands
+    class Tyesterday
+      class << self
+        def execute(_argv = [])
+          file_names =
+            [DateTime.now, Date.today.prev_day].map do |date|
+              WorkMd::File.create_if_not_exist(date)
+            end
+
+          WorkMd::File.open_in_editor(file_names: file_names)
+        end
+      end
+    end
+  end
+end

data/lib/work_md/config.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 module WorkMd
   module Config
-    DEFAULT_WORK_DIR = Dir.home + '/work_md'
+    DEFAULT_WORK_DIR = "#{Dir.home}/work_md"
     TRANSLATIONS = {
       'pt' =>
         {
@@ -12,6 +12,7 @@ module WorkMd
           meetings: 'Reuniões',
           interruptions: 'Interrupções',
           difficulties: 'Dificuldades',
+          observations: 'Observações',
           pomodoros: 'Pomodoros / Ciclos',
           per_day: 'por dia'
         },
@@ -21,9 +22,21 @@ module WorkMd
           meetings: 'Meetings',
           interruptions: 'Interruptions',
           difficulties: 'Difficulties',
+          observations: 'Observations',
           pomodoros: 'Pomodoros / Cycles',
           per_day: 'per day'
+        },
+      'es' =>
+        {
+          tasks: 'Tareas',
+          meetings: 'Reuniones',
+          interruptions: 'Interrupciones',
+          difficulties: 'Dificultades',
+          observations: 'Observaciones',
+          pomodoros: 'Pomodoros / Ciclos',
+          per_day: 'por día'
         }
+
     }.freeze
 
     def self.title
@@ -45,7 +58,7 @@ module WorkMd
     end
 
     def self.yaml_file
-      YAML.load_file(DEFAULT_WORK_DIR + '/config.yml')
+      YAML.load_file("#{DEFAULT_WORK_DIR}/config.yml")
     rescue StandardError
       {}
     end

data/lib/work_md/file.rb

@@ -1,47 +1,60 @@
 # frozen_string_literal: true
 
+require 'byebug'
+
 module WorkMd
   class File
     def self.open_or_create(some_date)
+      open_in_editor(file_names: [create_if_not_exist(some_date)])
+    end
+
+    def self.create_if_not_exist(some_date)
       t = WorkMd::Config.translations
       work_dir = WorkMd::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')}")
-      unless ::File.exist?("#{work_dir}/#{some_date.strftime('%Y/%m/%d')}.md")
-        ::File.open(
-          "#{work_dir}/#{some_date.strftime('%Y/%m/%d')}.md",
-          'w+'
-        ) do |f|
-          # rubocop:disable Layout/LineLength
-          f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{WorkMd::Config.title} \n\n")
-          # rubocop:enable Layout/LineLength
-          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[:pomodoros]}:\n\n")
-          f.puts("0\n\n")
-        end
+
+      ::File.open(
+        "#{work_dir}/#{file_name}",
+        'w+'
+      ) do |f|
+        # rubocop:disable Layout/LineLength
+        f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{WorkMd::Config.title} \n\n")
+        # rubocop:enable Layout/LineLength
+        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 = WorkMd::Config.editor
+      work_dir = dir || WorkMd::Config.work_dir
 
       ::FileUtils.cd(work_dir) do
-        if editor.nil?
-          ::TTY::Editor.open("#{some_date.strftime('%Y/%m/%d')}.md")
-        else
-          ::TTY::Editor.open(
-            "#{some_date.strftime('%Y/%m/%d')}.md",
-            command: editor
-          )
-        end
+        ENV['EDITOR'] = editor unless editor.nil?
+
+        return ::TTY::Editor.open(file_names[0]) if file_names[1].nil?
+
+        ::TTY::Editor.open(file_names[0], file_names[1])
       end
     end
   end

data/lib/work_md/parser/engine.rb

@@ -2,6 +2,7 @@
 
 module WorkMd
   module Parser
+    # rubocop:disable Metrics/ClassLength
     class Engine
       IS_FROZEN_ERROR_MESSAGE = 'WorkMd::Parser::Engine is frozen'
       IS_NOT_FROZEN_ERROR_MESSAGE = 'WorkMd::Parser::Engine is not frozen'
@@ -11,6 +12,7 @@ module WorkMd
                       :meetings,
                       :interruptions,
                       :difficulties,
+                      :observations,
                       :date,
                       :pomodoros
       end
@@ -66,21 +68,36 @@ module WorkMd
         @difficulties ||= @parsed_files.map(&:difficulties).flatten
       end
 
+      def observations
+        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
+
+        @observations ||= @parsed_files.map(&:observations).flatten
+      end
+
       def average_pomodoros
-        if @parsed_files.size.positive? && pomodoros.positive?
-          return (pomodoros / @parsed_files.size)
+        if @parsed_files.size.positive? && pomodoros_sum.positive?
+          return (pomodoros_sum.to_f / @parsed_files.size).round(1)
         end
 
         0
       end
 
-      def pomodoros
+      def pomodoros_sum
         raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
 
-        @pomodoros ||=
+        @pomodoros_sum ||=
           @parsed_files.reduce(0) { |sum, f| sum + f.pomodoros || 0 }
       end
 
+      def pomodoros_bars
+        raise IS_NOT_FROZEN_ERROR_MESSAGE unless @frozen
+
+        @pomodoros_bars ||=
+          @parsed_files.map do |f|
+            "(#{f.date}) #{(1..f.pomodoros).map { '◘' }.join}"
+          end
+      end
+
       def freeze
         @frozen = true
       end
@@ -115,7 +132,10 @@ module WorkMd
           parsed_file.difficulties = parse_list(content).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
         elsif content.start_with?(@t[:pomodoros])
           parsed_file.pomodoros = parse_pomodoro(content)
         end
@@ -148,5 +168,6 @@ module WorkMd
           .map(&:strip)
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/work_md/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WorkMd
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_md
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -51,8 +51,10 @@ files:
 - bin/work_md
 - lib/work_md.rb
 - lib/work_md/cli.rb
+- lib/work_md/commands/config.rb
 - lib/work_md/commands/parse.rb
 - lib/work_md/commands/today.rb
+- lib/work_md/commands/tyesterday.rb
 - lib/work_md/commands/yesterday.rb
 - lib/work_md/config.rb
 - lib/work_md/file.rb