work-md 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ab4b3285e24c96c695dbded250664fc83981e18794011d77a9ecaae7556359
-  data.tar.gz: 93e48d1e25b612021ae73de244767c4ccf905cae237dc8a6361a3331bd179451
+  metadata.gz: 1d958b459035344108c414ccf382b6bce83acba70585accb0c4584b634d62808
+  data.tar.gz: db98f8a2b2a2d5dacd81cfa3951b92407455e0dffacd15e2d6e08ca6f237a98c
 SHA512:
-  metadata.gz: 8a55fd04880ddd3c4d31d556e0165794370248a681888de20ed7cd2d4650d281e0aa56e28f407fe07ea3c84d54226e79d9521e5855e484220490169214477c83
-  data.tar.gz: d462dc1ab849cb87a1cce0882350db98e53f7edbf1ed7907fdb2bd57016f73ecb607fca551c6b8d3302f8122f161e7e286cd9a05b87fba92544252458a087e37
+  metadata.gz: 48b5aad2d02b382d86ccf273518f87ccfd3fd7248feac6de4eca364461019533dd3497066c99139dac7c34ade603459ab806f35d646ad8cfadb664bb8e4fcfc7
+  data.tar.gz: 5d8e4ab76582f9e462a2d6286d1f5aef1a26b8e118a0f8c711ce36e1917f5f9c500c24c3357b5ef1985060d75cc0a3a777c14ef7ceba055e0791ceb41fee119c

data/lib/work/md/cli.rb

@@ -10,12 +10,14 @@ module Work
           't' => 'today',
           'ty' => 'tyesterday',
           'y' => 'yesterday',
+          'to' => 'tomorrow',
           'c' => 'config',
           'p' => 'parse',
           'pl' => 'plast',
           'a' => 'annotations',
-          'l' => 'last',
           'o' => 'open',
+          'd' => 'delete',
+          'l' => 'last',
           'tl' => 'tlast'
         }.freeze
 
@@ -62,6 +64,7 @@ module Work
           '- work-md today',
           '- work-md yesterday',
           '- work-md tyesterday',
+          '- work-md tomorrow',
           '- work-md last',
           '- work-md tlast',
           '- work-md parse',

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_names = Work::Md::DateFile.list_file_names_by_argv_query(argv)
+
+            if file_names == []
+              puts ::TTY::Box.frame(
+                "message: File(s) not found!",
+                **Work::Md::Cli.error_frame_style
+              )
+
+              return
+            end
+
+            file_names.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!",
+                '',
+                '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/open.rb

@@ -6,40 +6,9 @@ module Work
       class Open
         class << self
           def execute(argv = [])
-            to_open = []
+            file_names = Work::Md::DateFile.list_file_names_by_argv_query(argv)
 
-            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 == []
+            if file_names == []
               puts ::TTY::Box.frame(
                   "message: File(s) not found!",
                   **Work::Md::Cli.error_frame_style
@@ -48,7 +17,7 @@ module Work
               return
             end
 
-            Work::Md::File.open_in_editor(to_open)
+            Work::Md::File.open_in_editor(file_names)
           rescue StandardError
             Work::Md::Cli.help(
               ::TTY::Box.frame(

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_names_by_argv_query(argv)
+              .each { |file_name| parser.add_file(file_name) }
 
             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

@@ -9,6 +9,41 @@ module Work
         )
       end
 
+      def self.list_file_names_by_argv_query(argv)
+        file_names = []
+
+        argv_keys_to_files = -> (argv_keys, acc_file_names) {
+          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_open = lambda do |day|
+            day = "0#{day.to_i}" if day.to_i < 10
+
+            file_name = Work::Md::Config.work_dir + "/#{year}/#{month}/#{day}.md"
+
+            acc_file_names.push(file_name) if ::File.exist? 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_open.call(day) }
+          else
+            argv_keys['d'].split(',').each { |day| add_file_to_open.call(day) }
+          end
+
+          acc_file_names
+        }
+
+        argv.join('#').split('#and#').map { |v| v.split("#") }.each do |args|
+          argv_keys_to_files.(Work::Md::Cli.fetch_argv_keys(args), file_names)
+        end
+
+        file_names
+      end
+
       def self.create_if_not_exist(some_date, dir: nil)
         t = Work::Md::Config.translations
         work_dir = dir || Work::Md::Config.work_dir

data/lib/work/md/version.rb

@@ -2,6 +2,6 @@
 
 module Work
   module Md
-    VERSION = '0.4.6'
+    VERSION = '0.4.8'
   end
 end

data/lib/work/md.rb

@@ -7,11 +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.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2021-12-29 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,12 +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