work-md 0.4.2 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f71380cbbd01039015727e92f5de5e621b1a3511914e4a6b81ef50de192ea43d
-  data.tar.gz: 7952a1d0d8c232a40ac18bdf90ff5f3b728aa57b3868170821204136492b04ff
+  metadata.gz: f5ab4b3285e24c96c695dbded250664fc83981e18794011d77a9ecaae7556359
+  data.tar.gz: 93e48d1e25b612021ae73de244767c4ccf905cae237dc8a6361a3331bd179451
 SHA512:
-  metadata.gz: 11d3bc8deb4aa7ba041a171a28b825eed5ce1690a53644ab331583f219f970a58c1dfcfcf7c95460e4ab2634efad01f5bdfe9e68a754da7f859ae40c43ab9a5d
-  data.tar.gz: e4a5616a87b0d249ef703b775f6956af217f578bd9fc3cd88e2becd43a45d96f5daed154704e174c7e1724cf703234be2e848e5e805932275b407727c709cef6
+  metadata.gz: 8a55fd04880ddd3c4d31d556e0165794370248a681888de20ed7cd2d4650d281e0aa56e28f407fe07ea3c84d54226e79d9521e5855e484220490169214477c83
+  data.tar.gz: d462dc1ab849cb87a1cce0882350db98e53f7edbf1ed7907fdb2bd57016f73ecb607fca551c6b8d3302f8122f161e7e286cd9a05b87fba92544252458a087e37

data/lib/work/md/cli.rb

@@ -15,11 +15,20 @@ module Work
           'pl' => 'plast',
           'a' => 'annotations',
           'l' => 'last',
+          'o' => 'open',
           'tl' => 'tlast'
         }.freeze
 
       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?
 
@@ -30,7 +39,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!",
@@ -56,22 +65,34 @@ module Work
           '- work-md last',
           '- work-md tlast',
           '- work-md parse',
+          '- work-md plast',
           '- work-md annotations',
+          '- work-md open',
           '- work-md config',
           '',
-          'more information in github.com/work-md',
-          padding: 1,
-          title: { top_left: '(work-md)', bottom_right: "(v#{Work::Md::VERSION})" }
+          'for more information: github.com/work-md',
+          **normal_frame_style
         )
         # rubocop:enable Layout/LineLength
       end
 
+      def self.normal_frame_style
+        {
+          padding: 1,
+          title: { top_left: '(work-md)', bottom_right: "(v#{Work::Md::VERSION})" }
+        }
+      end
+
       def self.error_frame_style
         {
           padding: 1,
           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/last.rb

@@ -5,31 +5,74 @@ module Work
     module Commands
       class Last
         class << self
-          def execute(_argv = [])
-            found_file = false
-            current_day = Date.today.prev_day
+          def execute(argv = [])
             work_dir = Work::Md::Config.work_dir
 
-            (1..160).each do
-              file_name = "#{current_day.strftime('%Y/%m/%d')}.md"
+            if argv == []
+              current_day = Date.today.prev_day
+              found_file = false
 
-              if ::File.exist?("#{work_dir}/#{file_name}")
-                Work::Md::File.open_in_editor([file_name])
-                found_file = true
-                break
+              (1..160).each do
+                file_name = "#{current_day.strftime('%Y/%m/%d')}.md"
+
+                if ::File.exist?("#{work_dir}/#{file_name}")
+                  Work::Md::File.open_in_editor([file_name])
+                  found_file = true
+                  break
+                end
+
+                current_day = current_day.prev_day
               end
 
-              current_day = current_day.prev_day
+              unless found_file
+                Work::Md::Cli.help(
+                  ::TTY::Box.frame(
+                    "message: No file found in last 5 months",
+                    **Work::Md::Cli.error_frame_style
+                  )
+                )
+              end
+
+              return
             end
 
-            unless found_file
+            to_open = []
+            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: No file found in last 5 months",
+                  "message: 'last' command accept only numeric arguments, you give: #{argv.inspect}",
+                  '',
+                  'Usage example:',
+                  '',
+                  'work-md l 7     # open the last 7 days',
+                  'work-md l       # open the last day',
                   **Work::Md::Cli.error_frame_style
                 )
               )
+              return
             end
+
+            last_date = Date.today.prev_day
+
+            (1..last_n).map do
+              last_file_name = "#{last_date.strftime('%Y/%m/%d')}.md"
+
+              if ::File.exist?("#{work_dir}/#{last_file_name}")
+                to_open.push("#{work_dir}/#{last_file_name}")
+              else
+                nil
+              end
+
+              last_date = last_date.prev_day
+            end
+
+            Work::Md::File.open_in_editor(to_open)
           end
         end
       end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Open
+        class << self
+          def execute(argv = [])
+            to_open = []
+
+            argv_keys_to_parser = -> (argv_keys, received_to_open) {
+              year = argv_keys['y'] || Time.new.year
+              month = argv_keys['m'] || Time.new.month
+
+              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
+
+                file_name = Work::Md::Config.work_dir + "/#{year}/#{month}/#{day}.md"
+
+                if ::File.exist? file_name
+                  received_to_open.push(file_name)
+                end
+              end
+
+              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
+                argv_keys['d'].split(',').each { |day| add_file_to_parser.call(day) }
+              end
+
+              received_to_open
+            }
+
+            argv.join('#').split('#and#').map { |v| v.split("#") }.each do |args|
+              argv_keys_to_parser.(Work::Md::Cli.fetch_argv_keys(args), to_open)
+            end
+
+            if to_open == []
+              puts ::TTY::Box.frame(
+                  "message: File(s) not found!",
+                  **Work::Md::Cli.error_frame_style
+                )
+
+              return
+            end
+
+            Work::Md::File.open_in_editor(to_open)
+          rescue StandardError
+            Work::Md::Cli.help(
+              ::TTY::Box.frame(
+                "message: Some error occurred interpreting your command!",
+                '',
+                'Usage examples:',
+                '',
+                'work-md o -d=1 -m=5 -y=2000 # open day 1 from month 5 and year 2000',
+                'work-md o -d=1,2,3          # open day 1, 2 and 3 from the current month and year',
+                'work-md o -d=1,2 -m=4       # open day 1 and 2 from month 4 and current year',
+                'work-md o -d=1..10 -m=4     # open day 1 to 10 from month 4 and current year',
+                'work-md o -d=1..25 -m=2 and -d=1..25 -m=2 -y=1999     # open day 1 to 25 from month 2 and current year and 1 to 25 from month 2 in 1999',
+                **Work::Md::Cli.error_frame_style
+              )
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,9 +7,9 @@ module Work
         class << self
           def execute(argv = [])
             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
 
@@ -21,27 +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)
+              argv_keys_to_parser.(Work::Md::Cli.fetch_argv_keys(args), parser)
             end
 
             Work::Md::File.create_and_open_parsed(parser)
-          rescue StandardError => e
+          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

@@ -6,7 +6,26 @@ module Work
       class Plast
         class << self
           def execute(argv = [])
-            last_n = argv.first.to_i
+            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
@@ -23,6 +42,19 @@ module Work
             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

data/lib/work/md/file.rb

@@ -72,9 +72,9 @@ module Work
           end
 
           f.puts("\n\n")
-
-          Work::Md::File.open_in_editor([parsed_file_path])
         end
+
+        Work::Md::File.open_in_editor([parsed_file_path])
       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.2'
+    VERSION = '0.4.6'
   end
 end

data/lib/work/md.rb

@@ -11,6 +11,7 @@ require_relative 'md/commands/tyesterday'
 require_relative 'md/commands/annotations'
 require_relative 'md/commands/last'
 require_relative 'md/commands/tlast'
+require_relative 'md/commands/open'
 require_relative 'md/parser/engine'
 require_relative 'md/commands/parse'
 require_relative 'md/commands/plast'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work-md
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.6
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -55,6 +55,7 @@ files:
 - lib/work/md/commands/annotations.rb
 - lib/work/md/commands/config.rb
 - lib/work/md/commands/last.rb
+- lib/work/md/commands/open.rb
 - lib/work/md/commands/parse.rb
 - lib/work/md/commands/plast.rb
 - lib/work/md/commands/tlast.rb