work-md 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d958b459035344108c414ccf382b6bce83acba70585accb0c4584b634d62808
-  data.tar.gz: db98f8a2b2a2d5dacd81cfa3951b92407455e0dffacd15e2d6e08ca6f237a98c
+  metadata.gz: 3333dbe54859ef57acade3b997c337b6994b64e681369e782e39a80fb478632d
+  data.tar.gz: e7de4d34bf2c5eb846fa160bf0cff93250216dbc45daa6b26035ac3a3784ede6
 SHA512:
-  metadata.gz: 48b5aad2d02b382d86ccf273518f87ccfd3fd7248feac6de4eca364461019533dd3497066c99139dac7c34ade603459ab806f35d646ad8cfadb664bb8e4fcfc7
-  data.tar.gz: 5d8e4ab76582f9e462a2d6286d1f5aef1a26b8e118a0f8c711ce36e1917f5f9c500c24c3357b5ef1985060d75cc0a3a777c14ef7ceba055e0791ceb41fee119c
+  metadata.gz: 3ea36e20ab31b4237157d55327978cba6c64c3b4f02df9987fcb56993b1af1826fa7ed5dbe2371ee83a0e06d6e2987126010e34351694f6fdb2538c68bafc356
+  data.tar.gz: 9bb98607f7e1ed8d426164b5b28a8f0406160405706adb3f2bbfcb90af6cb4cfe860b35672d147742f47fa9c89c665f4582f6a43fe4e229374ea901122f7cca3

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

@@ -8,9 +8,9 @@ module Work
           def execute(argv = [])
             prompt = TTY::Prompt.new
 
-            file_names = Work::Md::DateFile.list_file_names_by_argv_query(argv)
+            file_paths = Work::Md::DateFile.list_file_paths_by_argv_query(argv)
 
-            if file_names == []
+            if file_paths == []
               puts ::TTY::Box.frame(
                 "message: File(s) not found!",
                 **Work::Md::Cli.error_frame_style
@@ -19,7 +19,7 @@ module Work
               return
             end
 
-            file_names.each do |file_name|
+            file_paths.each do |file_name|
               if prompt.yes?("Do you really want to delete \"#{file_name}\"!?")
                 ::File.delete(file_name)
               end
@@ -27,7 +27,7 @@ module Work
           rescue StandardError
             Work::Md::Cli.help(
               ::TTY::Box.frame(
-                "message: Some error occurred interpreting your command!",
+                "message: Some error occurred interpreting your command or the date sent is invalid!",
                 '',
                 'Usage examples:',
                 '',

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

@@ -6,9 +6,13 @@ module Work
       class Open
         class << self
           def execute(argv = [])
-            file_names = Work::Md::DateFile.list_file_names_by_argv_query(argv)
+            file_paths =
+              Work::Md::DateFile.list_file_paths_by_argv_query(
+                argv,
+                create_inexistent: true
+              )
 
-            if file_names == []
+            if file_paths == []
               puts ::TTY::Box.frame(
                   "message: File(s) not found!",
                   **Work::Md::Cli.error_frame_style
@@ -17,11 +21,11 @@ module Work
               return
             end
 
-            Work::Md::File.open_in_editor(file_names)
-          rescue StandardError
+            Work::Md::File.open_in_editor(file_paths)
+          rescue
             Work::Md::Cli.help(
               ::TTY::Box.frame(
-                "message: Some error occurred interpreting your command!",
+                "message: Some error occurred interpreting your command or the date sent is invalid!",
                 '',
                 'Usage examples:',
                 '',

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

@@ -9,8 +9,8 @@ module Work
             parser = Work::Md::Parser::Engine.new
 
             Work::Md::DateFile
-              .list_file_names_by_argv_query(argv)
-              .each { |file_name| parser.add_file(file_name) }
+              .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/date_file.rb

@@ -3,60 +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.list_file_names_by_argv_query(argv)
-        file_names = []
+      def self.list_file_paths_by_argv_query(argv, create_inexistent: false)
+        file_paths = []
 
-        argv_keys_to_files = -> (argv_keys, acc_file_names) {
+        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_open = lambda do |day|
+          add_file_to_acc = 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_path = Work::Md::Config.work_dir + "/#{year}/#{month}/#{day}.md"
 
-            acc_file_names.push(file_name) if ::File.exist? file_name
+            if create_inexistent
+              create_if_not_exist(DateTime.new(year.to_i, month.to_i, day.to_i))
+
+              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_open.call(day) }
+            (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_open.call(day) }
+            argv_keys['d'].split(',').each { |day| add_file_to_acc.call(day) }
           end
 
-          acc_file_names
+          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_names)
+          argv_keys_to_files.(Work::Md::Cli.fetch_argv_keys(args), file_paths)
         end
 
-        file_names
+        file_paths
       end
 
-      def self.create_if_not_exist(some_date, dir: nil)
+      def self.create_if_not_exist(some_date)
         t = Work::Md::Config.translations
-        work_dir = dir || Work::Md::Config.work_dir
-
-        file_name = "#{some_date.strftime('%Y/%m/%d')}.md"
-
-        return file_name if ::File.exist?("#{work_dir}/#{file_name}")
+        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")
@@ -76,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.8'
+    VERSION = '0.4.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work-md
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box