work_md 0.2.7 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240715cce22ce57249e206aaccb86151732c059fa4af0f00b1b3d2c8f47389bb
-  data.tar.gz: 436b17f29758239fe959abdf6d8ffaf24f629ba3fb41315bf92e8c42eaaac4cb
+  metadata.gz: 11398053e95da7ddd262275d8df76965fdf1eadce26a7854a1b1c1b63ab04f43
+  data.tar.gz: a3fb3c6ccb1ff57f9597ac2ac7b42031284fb3e17e6d229248c8bdf7270d7afc
 SHA512:
-  metadata.gz: 595cc7e93141034918c3076dcf1416fe46ba9c0194fd06026e117269c73482a595d8d6cfdf7b23cc73e67a60880971d3ba2c76453a567ea6581d273c529414d7
-  data.tar.gz: e9599c13e70ade59262afb89dca054c8dc54821906e9eca4a113efc579716f3df2e1e2f91819d1a0b0edb77a632b8d227233aa3912b70fd87dcb509b984cd0ed
+  metadata.gz: 94d7ca6109f744ecc6e7042a78a154a79bbd6dd5e4fe209b09ca5e5911628644cc417f7e6066c6b3abaf2ba945178ef83f1cb0f79987dbed12352f63871974ed
+  data.tar.gz: f18458c73cfbcf5d5838d7e9fdaa0d3bc39cd6b102abe80c4c61e34a62473a39d18ea334d76df684a258f5a0f099736c1011a63756c59f950b0f830d8a0b9f9c

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

data/lib/work_md/cli.rb

@@ -9,11 +9,10 @@ module WorkMd
         '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
 
@@ -26,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,
@@ -49,8 +48,9 @@ module WorkMd
         '- 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

@@ -65,7 +65,14 @@ module WorkMd
               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
@@ -76,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}",
                 "",

data/lib/work_md/commands/tyesterday.rb

@@ -5,8 +5,12 @@ module WorkMd
     class Tyesterday
       class << self
         def execute(_argv = [])
-          WorkMd::File.open_or_create(DateTime.now)
-          WorkMd::File.open_or_create(Date.today.prev_day)
+          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

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' =>
         {
@@ -25,7 +25,18 @@ module WorkMd
           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
@@ -47,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

@@ -3,47 +3,56 @@
 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[:observations]}:\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

@@ -75,20 +75,29 @@ module WorkMd
       end
 
       def average_pomodoros
-        if @parsed_files.size.positive? && pomodoros.positive?
-          return (pomodoros.to_f / @parsed_files.size).round(1)
+        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

data/lib/work_md/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_md
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -51,6 +51,7 @@ 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