notenote 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f78d842dc42121cfc84e9610b0b7869b6c968f0dcaa4874dda75d618de9bfa81
-  data.tar.gz: 7b2efa649831bb0ce998974cfab33879864486118fab60baaa4ea313f4bf0509
+  metadata.gz: 9c7fc51bd06351a5ae925a67ac1aa684a2d15ffbc59edd798d3f302ef360b56e
+  data.tar.gz: 0e74c23606640b7eba1ad183720bfa2b847d52ee20ed49bbd47e60484377efac
 SHA512:
-  metadata.gz: 4e3962ada9564374f722f51ce976e99934c7d3bdda17a165f0c7f856a4b88d3ea53d588d4c0a916b77c8f20250cd01e2c75b06644e1ba3d3cdbe4c40118c878d
-  data.tar.gz: 7937389c96e845c4f96e70dcc005ae272be582fe0068c83deff63fb773a713a215c4b196853c1e4c5cc0e40e282b5f3b47749a4c65ca4be6a6e4de8d0da97fef
+  metadata.gz: c36db2f227e1a29144e5fbffbad8f9dcc277f514b67829b1824998d001da3839f04333c8f62d34be33fd48d70ac19f24823924dbbc5d9adea52e3befa177e235
+  data.tar.gz: 46f4e35b88ff4558849bac03353147f65d7cb717b4d7c0e76a7dd57a17211cb96572c9f393deecf6cd3b5f193e2a8eb9bff1d054a2ca44223e999c06124cd7ac

data/lib/note/cli.rb

@@ -37,9 +37,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"
@@ -99,9 +98,9 @@ module Note
     def create_config_file(notes_folder:)
       config_template = File.read(File.join(File.dirname(__FILE__), "config.json.template"))
 
-      config = config_template % {
+      config = safe_tt(config_template, {
         notes_folder: notes_folder
-      }
+      })
 
       config_file = File.join(Dir.home, ".notenote")
 
@@ -110,7 +109,7 @@ module Note
       end
     end
 
-    def create_note_file(file_name: "notes.md")
+    def create_note_file(note_name: "notes")
       notes_folder = notenote_config["notes_folder"]
       date_format = notenote_config["date_format"]
 
@@ -118,9 +117,24 @@ module Note
 
       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
@@ -197,5 +211,17 @@ module Note
 
       puts "Pushed. ✅"
     end
+
+    # A custom string format method to avoid type
+    # errors when using str % hash.
+    def safe_tt(str, hash)
+      str_copy = str
+
+      hash.each do |key, value|
+        str_copy.gsub!("%{#{key}}", value.to_s)
+      end
+
+      str_copy
+    end
   end
 end

data/lib/note/version.rb

@@ -1,3 +1,3 @@
 module Note
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.8".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notenote
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Anatoli Makarevich