notenote 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e739b649898fe2b3cd03fef0dc45bd728ffbce50c3ee5cb6f7d1918bf59612f
-  data.tar.gz: e23ae24148d1ef7666fd26430f3f5413b228d4a9c8563ec039c6878ef542326d
+  metadata.gz: a71839ec326f5f762ebea46f47b74d4fccd94f80961ce24b1753e9a842c39cab
+  data.tar.gz: eaeaf9f0a5bf5f24780a05dd943277d657b6731a0b21512643deb4980c820af7
 SHA512:
-  metadata.gz: a129c33ebc60c59500cac01472a99f71889579797adddc746c6b1177c9b4bbc60c1a38736b9c235d9b38df35d5091b43e84ec8da2ec98b556010b3e5b4f54924
-  data.tar.gz: aed23da98e1307fd318300a518b5c70381bb294f25b9488c850fa57ed65d235019f7793e7c7adfea97a3515ae8404fd0a694d7238c6cd0e5d76cbb1fae4305c8
+  metadata.gz: 8f0da4b7681d4680f0b81d2bad79f649304cb7c8a065f50a241f8bc6d00ca3baf2d30a01ca5341b3fa30b5cfdd08817b4254a0d6072c8f4778456d6cb05571a4
+  data.tar.gz: d953b1120e9cfcf957622a92985546d79916e4b725baaf5705737f289ffad146e189cba24ea1fa1b4b93ddd5e1bd009c9a0c9b3c885f786c4f276500ad13aee6

data/lib/note/cli.rb

@@ -2,6 +2,7 @@
 
 require "optparse"
 require "json"
+require "date"
 
 $LOAD_PATH << File.expand_path(__dir__)
 
@@ -37,9 +38,8 @@ module Note
         0
       elsif args.first == "on"
         note_name = args[1..-1].join(" ") # "tax return" for `note on tax return``
-        file_name = note_name.gsub(/[^a-z0-9\-]+/, "_")
 
-        create_note_file(file_name: "#{file_name}.md")
+        create_note_file(note_name: note_name)
 
         0
       elsif args.first == "all"
@@ -65,6 +65,8 @@ module Note
         END
 
         0
+      elsif args.first == "pull"
+        pull_notes
       elsif args.first == "push"
         push_notes
 
@@ -74,7 +76,16 @@ module Note
 
         0
       else
-        puts "Hm, I don't know this command 🤔"
+        notes_folder = notenote_config["notes_folder"]
+
+        today_folder = File.join(notes_folder, formatted_todays_date)
+        today_note_file = File.join(today_folder, "#{notenote_config["default_note_file_name"]}.md")
+
+        if File.exist?(today_note_file)
+          open_editor(path: today_note_file)
+        else
+          create_note_file
+        end
 
         0
       end
@@ -110,17 +121,31 @@ module Note
       end
     end
 
-    def create_note_file(file_name: "notes.md")
+    def create_note_file(note_name: "#{notenote_config["default_note_file_name"]}.md")
       notes_folder = notenote_config["notes_folder"]
-      date_format = notenote_config["date_format"]
 
-      today_folder = File.join(notes_folder, Time.now.strftime(date_format))
+      today_folder = File.join(notes_folder, formatted_todays_date)
 
       Dir.mkdir(today_folder) unless Dir.exist?(today_folder)
 
+      file_name = note_name.strip.downcase.
+        gsub(/[^a-z0-9\-]+/, "_").
+        gsub(/\A\_+/, "").
+        gsub(/\_+\z/, "").
+        concat(".md")
       note_file = File.join(today_folder, file_name)
 
-      FileUtils.touch(note_file)
+      if File.exist?(note_file)
+        puts "This note already exists. ⚠️"
+      else
+        File.open(note_file, "w") do |file|
+          file.puts unindent <<-TEXT
+            # #{note_name}
+
+
+          TEXT
+        end
+      end
 
       open_editor(path: note_file)
     end
@@ -198,6 +223,12 @@ module Note
       puts "Pushed. ✅"
     end
 
+    def pull_notes
+      Dir.chdir(notenote_config["notes_folder"])
+
+      system "git pull --ff-only"
+    end
+
     # A custom string format method to avoid type
     # errors when using str % hash.
     def safe_tt(str, hash)
@@ -209,5 +240,11 @@ module Note
 
       str_copy
     end
+
+    def formatted_todays_date
+      date_format = notenote_config["date_format"]
+
+      Date.today.strftime(date_format)
+    end
   end
 end

data/lib/note/config.json.template

@@ -1,6 +1,7 @@
 {
   "notes_folder": "%{notes_folder}",
   "date_format": "%d-%m-%Y",
+  "default_note_file_name: "notes",
   "editor_command": "code",
   "commit_message": "Added new notes"
 }

data/lib/note/version.rb

@@ -1,3 +1,3 @@
 module Note
-  VERSION = "0.0.7".freeze
+  VERSION = "0.0.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notenote
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Anatoli Makarevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler