work_md 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240715cce22ce57249e206aaccb86151732c059fa4af0f00b1b3d2c8f47389bb
-  data.tar.gz: 436b17f29758239fe959abdf6d8ffaf24f629ba3fb41315bf92e8c42eaaac4cb
+  metadata.gz: e7f163bb109aa82d9095042209b18157e3ba0ff0ab23456b43e0cd65ba90aeee
+  data.tar.gz: a78b3daa4090a73e1bcdda5e51eb30718a4787f2932027c5945e6e14322b826b
 SHA512:
-  metadata.gz: 595cc7e93141034918c3076dcf1416fe46ba9c0194fd06026e117269c73482a595d8d6cfdf7b23cc73e67a60880971d3ba2c76453a567ea6581d273c529414d7
-  data.tar.gz: e9599c13e70ade59262afb89dca054c8dc54821906e9eca4a113efc579716f3df2e1e2f91819d1a0b0edb77a632b8d227233aa3912b70fd87dcb509b984cd0ed
+  metadata.gz: d2e117fa8755001b8f4ccb44a77666e2c3b8f25c1deb959d8c702c55096bfb4cf625923eb09cf184ff3aef14659beabfdd3718ecd492384044efb5b01010ca29
+  data.tar.gz: 7a555df5793cbc958eff5ff7f42a5078357afeb9ab66b561ff4a82a04c0e120c565f22041e8bf1bff3b8e5f5ca345945b570cd015b66b92f037b481a4fd602b6

data/bin/work_md

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# require_relative '../lib/work_md'
 require 'work_md'
 
 WorkMd::Cli.execute(ARGV)

data/lib/work_md/commands/tyesterday.rb

@@ -5,8 +5,12 @@ module WorkMd
     class Tyesterday
       class << self
         def execute(_argv = [])
-          WorkMd::File.open_or_create(DateTime.now)
-          WorkMd::File.open_or_create(Date.today.prev_day)
+          filenames =
+            [DateTime.now, Date.today.prev_day].map do |date|
+              WorkMd::File.create_if_not_exist(date)
+            end
+
+          WorkMd::File.open_in_editor(filenames[0], filenames[1])
         end
       end
     end

data/lib/work_md/file.rb

@@ -1,49 +1,59 @@
 # frozen_string_literal: true
 
+require 'byebug'
+
 module WorkMd
   class File
     def self.open_or_create(some_date)
+      open_in_editor(create_if_not_exist(some_date))
+    end
+
+    def self.create_if_not_exist(some_date)
       t = WorkMd::Config.translations
       work_dir = WorkMd::Config.work_dir
 
       ::FileUtils
         .mkdir_p("#{work_dir}/#{some_date.strftime('%Y/%m')}")
-      unless ::File.exist?("#{work_dir}/#{some_date.strftime('%Y/%m/%d')}.md")
-        ::File.open(
-          "#{work_dir}/#{some_date.strftime('%Y/%m/%d')}.md",
-          'w+'
-        ) do |f|
-          # rubocop:disable Layout/LineLength
-          f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{WorkMd::Config.title} \n\n")
-          # rubocop:enable Layout/LineLength
-          f.puts("### #{t[:tasks]}:\n\n")
-          f.puts("- [ ]\n\n")
-          f.puts("---\n\n")
-          f.puts("### #{t[:meetings]}:\n\n")
-          f.puts("- [ ]\n\n")
-          f.puts("---\n\n")
-          f.puts("### #{t[:interruptions]}:\n\n")
-          f.puts("---\n\n")
-          f.puts("### #{t[:difficulties]}:\n\n")
-          f.puts("---\n\n")
-          f.puts("### #{t[:observations]}:\n\n")
-          f.puts("---\n\n")
-          f.puts("### #{t[:pomodoros]}:\n\n")
-          f.puts("0\n\n")
-        end
+
+      filename = "#{some_date.strftime('%Y/%m/%d')}.md"
+
+      return filename if ::File.exist?("#{work_dir}/#{filename}")
+
+      ::File.open(
+        "#{work_dir}/#{filename}",
+        'w+'
+      ) do |f|
+        # rubocop:disable Layout/LineLength
+        f.puts("# #{some_date.strftime('%d/%m/%Y')} - #{WorkMd::Config.title} \n\n")
+        # rubocop:enable Layout/LineLength
+        f.puts("### #{t[:tasks]}:\n\n")
+        f.puts("- [ ]\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:meetings]}:\n\n")
+        f.puts("- [ ]\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:interruptions]}:\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:difficulties]}:\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:observations]}:\n\n")
+        f.puts("---\n\n")
+        f.puts("### #{t[:pomodoros]}:\n\n")
+        f.puts("0\n\n")
       end
 
+      filename
+    end
+
+    def self.open_in_editor(filename1, filename2 = nil)
       editor = WorkMd::Config.editor
 
-      ::FileUtils.cd(work_dir) do
-        if editor.nil?
-          ::TTY::Editor.open("#{some_date.strftime('%Y/%m/%d')}.md")
-        else
-          ::TTY::Editor.open(
-            "#{some_date.strftime('%Y/%m/%d')}.md",
-            command: editor
-          )
-        end
+      ::FileUtils.cd(WorkMd::Config.work_dir) do
+        ENV['EDITOR'] = editor unless editor.nil?
+
+        return ::TTY::Editor.open(filename1) if filename2.nil?
+
+        ::TTY::Editor.open(filename1, filename2)
       end
     end
   end

data/lib/work_md/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WorkMd
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: work_md
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Henrique Fernandez Teixeira