work-md 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e5c50b3a58fbb2102a71ad9775bdda5a038e04b3de55239374687f8bf20ec3
-  data.tar.gz: 6d22a2e28863587fa77752ae6fa08af6f873a150673387cb8c93df7a35dc4bf2
+  metadata.gz: 6b2365dee8d1e62694565724b031df8975b11a9eafab0eb2290956915fdfcc89
+  data.tar.gz: d1ef9938b25eb53b38535374872c9d567759c1ddddcee9ad3c54030277453d61
 SHA512:
-  metadata.gz: 4a98486a920060972642e1f6b2ae2031bf86f9266142e5ea4b35dd414df1cb96c748052286b5d50a8424210cf71d787adb0ead59b562b61cbf0cbadac3854e76
-  data.tar.gz: e8ebb85ee0d061208e1160f662e2aeb3ac18810014891908f09beb5d59ed4d5e0aa082f67f99a1af85650f25e52679f6c994a54dc0de44e12bcbc79a5fba2873
+  metadata.gz: 7e2a875215334876bc1bd28be738fe2ce8500c8186604e87797439b0f654d0dfce7049ba44f6d6d78a4f5962d72a86674d4d9b5920f1a91d56f40bcff06cc574
+  data.tar.gz: 6b2696a31327292c75b1b62e8f17e1cb9b0cc483cd04f44f416412a73767a20f7f9ebf7baa95117d36382bb81a1e212825cb59a8060034a2f682dc0d959cc946

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/cli.rb

@@ -12,7 +12,9 @@ module Work
           'y' => 'yesterday',
           'c' => 'config',
           'p' => 'parse',
-          'a' => 'annotations'
+          'a' => 'annotations',
+          'l' => 'last',
+          'tl' => 'tlast'
         }.freeze
 
       def self.execute(argv)
@@ -27,7 +29,7 @@ module Work
         Object
           .const_get("Work::Md::Commands::#{command}")
           .send(:execute, argv)
-      rescue NameError
+      rescue NameError => e
         puts help(
           ::TTY::Box.frame(
             "Command '#{first_argv_argument}' not found!",
@@ -50,6 +52,8 @@ module Work
           '- work-md today',
           '- work-md yesterday',
           '- work-md tyesterday',
+          '- work-md last',
+          '- work-md tlast',
           '- work-md parse',
           '- work-md annotations',
           '- work-md config',

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Last
+        class << self
+          def execute(_argv = [])
+            found_file = false
+            current_day = Date.today.prev_day
+            work_dir = Work::Md::Config.work_dir
+
+            (1..90).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
+
+            unless found_file
+              Work::Md::Cli.help(
+                ::TTY::Box.frame(
+                  "message: No file found in last 90 days",
+                  **Work::Md::Cli.error_frame_style
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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('..')
+
+                (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
 
-            if args['d'].include?('..')
-              range = args['d'].split('..')
+              received_parser
+            }
 
-              (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.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
@@ -94,10 +102,11 @@ module Work
                 '',
                 'Usage examples:',
                 '',
-                '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',
+                'work-md p -d=1 -m=5 -y=2000 # get day 1 from month 5 and year 2000',
+                'work-md p -d=1,2,3          # get day 1, 2 and 3 from the current month and year',
+                'work-md p -d=1,2 -m=4       # get day 1 and 2 from month 4 and current year',
+                'work-md p -d=1..10 -m=4     # get day 1 to 10 from month 4 and current year',
+                'work-md p -d=1..25 -m=2 and -d=1..25 -m=2 -y=1999     # get 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
               )
             )

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Tlast
+        class << self
+          def execute(_argv = [])
+            last_date = Date.today.prev_day
+            work_dir = Work::Md::Config.work_dir
+            last_file_name = nil
+
+            (1..90).each do
+              last_file_name = "#{last_date.strftime('%Y/%m/%d')}.md"
+              break if ::File.exist?("#{work_dir}/#{last_file_name}")
+
+              last_date = last_date.prev_day
+            end
+
+            today_file_name = Work::Md::DateFile.create_if_not_exist(DateTime.now)
+
+            Work::Md::File.open_in_editor([today_file_name, last_file_name].compact)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/work/md/parser/engine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
-
 module Work
   module Md
     module Parser

data/lib/work/md/version.rb

@@ -2,6 +2,6 @@
 
 module Work
   module Md
-    VERSION = '0.3.7'
+    VERSION = '0.4.0'
   end
 end

data/lib/work/md.rb

@@ -9,6 +9,8 @@ require_relative 'md/commands/config'
 require_relative 'md/commands/yesterday'
 require_relative 'md/commands/tyesterday'
 require_relative 'md/commands/annotations'
+require_relative 'md/commands/last'
+require_relative 'md/commands/tlast'
 require_relative 'md/parser/engine'
 require_relative 'md/commands/parse'
 require_relative 'md/cli'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work-md
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-10-21 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,11 +49,14 @@ 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
 - lib/work/md/commands/config.rb
+- lib/work/md/commands/last.rb
 - lib/work/md/commands/parse.rb
+- lib/work/md/commands/tlast.rb
 - lib/work/md/commands/today.rb
 - lib/work/md/commands/tyesterday.rb
 - lib/work/md/commands/yesterday.rb
@@ -62,12 +65,12 @@ files:
 - 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
@@ -82,8 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.2.22
+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!