work-md 0.4.5 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e11b12242f29e25b4cd175693b475d548e37c422f966cca7c4ecdd7ae7bbf23
-  data.tar.gz: 7707b5b4ddbcf93fcfa22209eafcfd214de35cf56faec7739ed2b3239af33cd1
+  metadata.gz: 3333dbe54859ef57acade3b997c337b6994b64e681369e782e39a80fb478632d
+  data.tar.gz: e7de4d34bf2c5eb846fa160bf0cff93250216dbc45daa6b26035ac3a3784ede6
 SHA512:
-  metadata.gz: 49da10202bf64a92baff477f92ad3cb510e8445ef4792b64298f0449680862b0b241ed8a710f047dd846ee5cf9d53930b9bc1594ca1a4e9fcaa29b6adef8ad0e
-  data.tar.gz: 932cc585bf763de7d26eade30b48a903885ba23a17a5a6594e3d088f598a7b99fbb99414bb98b0042b2b351f7a32e740c8c0bd74f82851afd2960235ec5aa06d
+  metadata.gz: 3ea36e20ab31b4237157d55327978cba6c64c3b4f02df9987fcb56993b1af1826fa7ed5dbe2371ee83a0e06d6e2987126010e34351694f6fdb2538c68bafc356
+  data.tar.gz: 9bb98607f7e1ed8d426164b5b28a8f0406160405706adb3f2bbfcb90af6cb4cfe860b35672d147742f47fa9c89c665f4582f6a43fe4e229374ea901122f7cca3

data/lib/work/md/cli.rb

@@ -10,10 +10,13 @@ module Work
           't' => 'today',
           'ty' => 'tyesterday',
           'y' => 'yesterday',
+          'to' => 'tomorrow',
           'c' => 'config',
           'p' => 'parse',
           'pl' => 'plast',
           'a' => 'annotations',
+          'o' => 'open',
+          'd' => 'delete',
           'l' => 'last',
           'tl' => 'tlast'
         }.freeze
@@ -61,20 +64,28 @@ module Work
           '- work-md today',
           '- work-md yesterday',
           '- work-md tyesterday',
+          '- work-md tomorrow',
           '- work-md last',
           '- work-md tlast',
           '- work-md parse',
           '- work-md plast',
           '- work-md annotations',
+          '- work-md open',
           '- work-md config',
           '',
           'for more information: github.com/work-md',
-          padding: 1,
-          title: { top_left: '(work-md)', bottom_right: "(v#{Work::Md::VERSION})" }
+          **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,

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Delete
+        class << self
+          def execute(argv = [])
+            prompt = TTY::Prompt.new
+
+            file_paths = Work::Md::DateFile.list_file_paths_by_argv_query(argv)
+
+            if file_paths == []
+              puts ::TTY::Box.frame(
+                "message: File(s) not found!",
+                **Work::Md::Cli.error_frame_style
+              )
+
+              return
+            end
+
+            file_paths.each do |file_name|
+              if prompt.yes?("Do you really want to delete \"#{file_name}\"!?")
+                ::File.delete(file_name)
+              end
+            end
+          rescue StandardError
+            Work::Md::Cli.help(
+              ::TTY::Box.frame(
+                "message: Some error occurred interpreting your command or the date sent is invalid!",
+                '',
+                'Usage examples:',
+                '',
+                'work-md d -d=1 -m=5 -y=2000 # delete day 1 from month 5 and year 2000',
+                'work-md d -d=1,2,3          # delete day 1, 2 and 3 from the current month and year',
+                'work-md d -d=1,2 -m=4       # delete day 1 and 2 from month 4 and current year',
+                'work-md d -d=1..10 -m=4     # delete day 1 to 10 from month 4 and current year',
+                'work-md d -d=1..25 -m=2 and -d=1..25 -m=2 -y=1999     # delete 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/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,45 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Open
+        class << self
+          def execute(argv = [])
+            file_paths =
+              Work::Md::DateFile.list_file_paths_by_argv_query(
+                argv,
+                create_inexistent: true
+              )
+
+            if file_paths == []
+              puts ::TTY::Box.frame(
+                  "message: File(s) not found!",
+                  **Work::Md::Cli.error_frame_style
+                )
+
+              return
+            end
+
+            Work::Md::File.open_in_editor(file_paths)
+          rescue
+            Work::Md::Cli.help(
+              ::TTY::Box.frame(
+                "message: Some error occurred interpreting your command or the date sent is invalid!",
+                '',
+                '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,34 +7,10 @@ module Work
         class << self
           def execute(argv = [])
             parser = Work::Md::Parser::Engine.new
-            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
-
-              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"
-
-                received_parser.add_file(file_name)
-              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_parser
-            }
-
-            argv.join('#').split('#and#').map { |v| v.split("#") }.each do |args|
-              argv_keys_to_parser.(Work::Md::Cli.fetch_argv_keys(args), parser)
-            end
+            Work::Md::DateFile
+              .list_file_paths_by_argv_query(argv)
+              .each { |file_path| parser.add_file(file_path) }
 
             Work::Md::File.create_and_open_parsed(parser)
           rescue Work::Md::Parser::Error => e

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Work
+  module Md
+    module Commands
+      class Tomorrow
+        class << self
+          def execute(_argv = [])
+            Work::Md::DateFile.open_or_create(Date.today.next_day)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/work/md/date_file.rb

@@ -3,25 +3,63 @@
 module Work
   module Md
     class DateFile
-      def self.open_or_create(some_date, dir: nil)
+      def self.open_or_create(some_date)
         Work::Md::File.open_in_editor(
-          [create_if_not_exist(some_date, dir: dir)], dir: dir
+          [create_if_not_exist(some_date)]
         )
       end
 
-      def self.create_if_not_exist(some_date, dir: nil)
-        t = Work::Md::Config.translations
-        work_dir = dir || Work::Md::Config.work_dir
+      def self.list_file_paths_by_argv_query(argv, create_inexistent: false)
+        file_paths = []
+
+        argv_keys_to_files = -> (argv_keys, acc_file_paths) {
+          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_acc = lambda do |day|
+            day = "0#{day.to_i}" if day.to_i < 10
+
+            file_path = Work::Md::Config.work_dir + "/#{year}/#{month}/#{day}.md"
 
-        file_name = "#{some_date.strftime('%Y/%m/%d')}.md"
+            if create_inexistent
+              create_if_not_exist(DateTime.new(year.to_i, month.to_i, day.to_i))
 
-        return file_name if ::File.exist?("#{work_dir}/#{file_name}")
+              acc_file_paths.push(file_path)
+            elsif ::File.exist? file_path
+              acc_file_paths.push(file_path)
+            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_acc.call(day) }
+          else
+            argv_keys['d'].split(',').each { |day| add_file_to_acc.call(day) }
+          end
+
+          acc_file_paths
+        }
+
+        argv.join('#').split('#and#').map { |v| v.split("#") }.each do |args|
+          argv_keys_to_files.(Work::Md::Cli.fetch_argv_keys(args), file_paths)
+        end
+
+        file_paths
+      end
+
+      def self.create_if_not_exist(some_date)
+        t = Work::Md::Config.translations
+        file = date_to_file_locations(some_date)
+        return file[:name] if ::File.exist?(file[:path])
 
         ::FileUtils
-          .mkdir_p("#{work_dir}/#{some_date.strftime('%Y/%m')}")
+          .mkdir_p(file[:dir])
 
         ::File.open(
-          "#{work_dir}/#{file_name}",
+          file[:path],
           'w+'
         ) do |f|
           f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{Work::Md::Config.title} \n\n")
@@ -41,7 +79,17 @@ module Work
           f.puts("0\n\n")
         end
 
-        file_name
+        file[:name]
+      end
+
+      def self.date_to_file_locations(some_date)
+        work_dir = Work::Md::Config.work_dir
+
+        {
+          name: "#{some_date.strftime('%Y/%m/%d')}.md",
+          dir: "#{work_dir}/#{some_date.strftime('%Y/%m')}",
+          path: "#{work_dir}/#{some_date.strftime('%Y/%m/%d')}.md"
+        }
       end
     end
   end

data/lib/work/md/file.rb

@@ -3,19 +3,6 @@
 module Work
   module Md
     class File
-      def self.open_in_editor(file_names = [], dir: nil)
-        editor = Work::Md::Config.editor
-        work_dir = dir || Work::Md::Config.work_dir
-
-        ::FileUtils.cd(work_dir) do
-          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
-
       def self.create_and_open_parsed(parser)
         parser.freeze
 
@@ -76,6 +63,19 @@ module Work
 
         Work::Md::File.open_in_editor([parsed_file_path])
       end
+
+      def self.open_in_editor(file_names = [])
+        editor = Work::Md::Config.editor
+        work_dir = Work::Md::Config.work_dir
+
+        ::FileUtils.cd(work_dir) do
+          ENV['EDITOR'] = editor unless editor.nil?
+
+          return ::TTY::Editor.open(file_names[0]) if file_names[1].nil?
+
+          ::TTY::Editor.open(*file_names)
+        end
+      end
     end
   end
 end

data/lib/work/md/version.rb

@@ -2,6 +2,6 @@
 
 module Work
   module Md
-    VERSION = '0.4.5'
+    VERSION = '0.4.9'
   end
 end

data/lib/work/md.rb

@@ -7,10 +7,13 @@ require_relative 'md/date_file'
 require_relative 'md/commands/today'
 require_relative 'md/commands/config'
 require_relative 'md/commands/yesterday'
+require_relative 'md/commands/tomorrow'
 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/commands/delete'
 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.5
+  version: 0.4.9
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
 description: 
 email:
 - hriqueft@gmail.com
@@ -54,11 +68,14 @@ files:
 - lib/work/md/cli.rb
 - lib/work/md/commands/annotations.rb
 - lib/work/md/commands/config.rb
+- lib/work/md/commands/delete.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
 - lib/work/md/commands/today.rb
+- lib/work/md/commands/tomorrow.rb
 - lib/work/md/commands/tyesterday.rb
 - lib/work/md/commands/yesterday.rb
 - lib/work/md/config.rb