notenote 0.0.11 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2ca9ac9b7e3fcdabdd2220dcd873c7b89f66d7c11b45a1b8d185896a88cd31
-  data.tar.gz: 06ee75f466f902f8410a69dbea73922ab388b1d5312e70e05659f26b317aea6d
+  metadata.gz: 2c1d8aaf090a602327ca4668ddf2302f8f44c0d9b8214b6b5ee5ef3e4708a4df
+  data.tar.gz: 430c780ce77443c2d35e59df835c700b4083ead5277cda6fd5e0a6b2835aeb5f
 SHA512:
-  metadata.gz: bd59e18ea0114467337e2ecd78073f13cb5ab064e949d607f0a72c70c1e1143031bf046f18020acffbfca69188b2ee6720ebaa736e56494483693d716bc6e9f9
-  data.tar.gz: bacd3fded636daea0f74957a4e8015c589e34c48b722d8a0632c9bc8022119f250c8b8c047de26e1a322edffaef4dc7085ccf1a35cd1997cf1e194195f4f371d
+  metadata.gz: 7d2813c76e15f4752700371fbbbc7d3d8ceb369f4591cacb541437c577f91d94df6dd43d50e8f65f7984df240bab6bafec268d41f40afaffc4aa8fc7b5dacf80
+  data.tar.gz: ab3916c6b9b49da5ac7861f6687eeba44528e46b523c1f965d53c58af031140ed25d8f17a8fce07905cb915a29014c74d8aa02fdc561db13927ed53ec227fb6c

data/lib/note/cli.rb

@@ -3,15 +3,18 @@
 require "optparse"
 require "json"
 require "date"
+require_relative "helpers"
 
 $LOAD_PATH << File.expand_path(__dir__)
 
 module Note
   class CLI
+    include Helpers
+
+    CONFIG_FILE_NAME = ".notenote"
+
     def run(args = [])
       if args.first == "init"
-        require "fileutils"
-
         notes_folder = args[1]
 
         if notes_folder.nil?
@@ -26,13 +29,32 @@ module Note
           Dir.mkdir(notes_folder)
         end
 
+        vscode_config_folder = File.join(notes_folder, ".vscode")
+        unless Dir.exists?(vscode_config_folder)
+          Dir.mkdir(vscode_config_folder)
+        end
+
+        vscode_settings_file = File.join(vscode_config_folder, "settings.json")
+        if File.exist?(vscode_settings_file)
+          vscode_settings = JSON.parse(File.read(vscode_settings_file))
+
+          vscode_settings["markdown.editor.drop.enabled"] = false
+
+          File.open(vscode_settings_file, "w") do |f|
+            f.puts(JSON.pretty_generate(vscode_settings))
+          end
+        else
+          File.open(vscode_settings_file, "w") do |f|
+            f.puts(JSON.pretty_generate({ "markdown.editor.drop.enabled": false }))
+          end
+        end
+
         notes_folder_full_path = File.join(Dir.pwd, notes_folder)
 
         create_config_file(notes_folder: notes_folder_full_path)
         create_readme_file
         create_note_file
 
-
         puts %(Your note folder "#{notes_folder}" and the first log file are created. You're ready to go! 🚀)
 
         0
@@ -74,6 +96,10 @@ module Note
       elsif args.first == "push!"
         push_notes(force: true)
 
+        0
+      elsif args.first == "version"
+        puts Note::VERSION
+
         0
       elsif args.size == 0
         notes_folder = notenote_config["notes_folder"]
@@ -90,6 +116,8 @@ module Note
         0
       else
         puts "Hm, looks like there's no such command. 🤔"
+
+        0
       end
     end
 
@@ -110,31 +138,33 @@ module Note
     end
 
     def create_config_file(notes_folder:)
+      config_file = File.join(Dir.home, CONFIG_FILE_NAME)
+
+      if File.exist?(config_file)
+        puts "📢 You already have a config file: ~/#{CONFIG_FILE_NAME}"
+        return
+      end
+
       config_template = File.read(File.join(File.dirname(__FILE__), "config.json.template"))
 
-      config = safe_tt(config_template, {
+      config = hash_format(config_template, {
         notes_folder: notes_folder
       })
 
-      config_file = File.join(Dir.home, ".notenote")
-
       File.open(config_file, "w") do |f|
         f.puts(config)
       end
     end
 
-    def create_note_file(note_name: "#{notenote_config["default_note_file_name"]}.md")
+    def create_note_file(note_name: notenote_config["default_note_file_name"])
       notes_folder = notenote_config["notes_folder"]
 
       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")
+      file_name = markdown_file_name(note_name: note_name)
+
       note_file = File.join(today_folder, file_name)
 
       if File.exist?(note_file)
@@ -142,7 +172,7 @@ module Note
       else
         File.open(note_file, "w") do |file|
           file.puts unindent <<-TEXT
-            # #{note_name.capitalize}
+            # #{upcate_first(note_name)}
 
 
           TEXT
@@ -153,7 +183,7 @@ module Note
     end
 
     def notenote_config
-      config_file = File.join(Dir.home, ".notenote")
+      config_file = File.join(Dir.home, CONFIG_FILE_NAME)
 
       JSON.parse(File.read(config_file))
     end
@@ -164,18 +194,6 @@ module Note
       system("#{editor_command} #{path}")
     end
 
-    def mac?
-      RbConfig::CONFIG["host_os"] =~ /darwin/
-    end
-
-    def osascript(script)
-      system "osascript", *unindent(script).split(/\n/).map { |line| ['-e', line] }.flatten
-    end
-
-    def unindent(str)
-      str.gsub(/^#{str.scan(/^[ \t]+(?=\S)/).min}/, "")
-    end
-
     # This function parses the output of diffstat:
     #
     # git diff HEAD | diffstat -Cm
@@ -231,18 +249,6 @@ module Note
       system "git pull --ff-only"
     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
-
     def formatted_todays_date
       date_format = notenote_config["date_format"]
 

data/lib/note/config.json.template

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

data/lib/note/helpers.rb

@@ -0,0 +1,59 @@
+module Helpers
+  private
+
+  def markdown_file_name(note_name:)
+    note_name.strip.downcase.
+      gsub(/[^a-z0-9]+/, "_").
+      gsub(/\A\_+/, "").
+      gsub(/\_+\z/, "").
+      concat(".md")
+  end
+
+  def upcate_first(str)
+    return if str.nil?
+    return "" if str.empty?
+
+    str.dup.tap { |s| s[0] = s[0].upcase }
+  end
+
+  # A custom string format method to avoid type
+  # errors when using str % hash.
+  def hash_format(str, hash)
+    return if str.nil?
+
+    str_copy = str.dup
+
+    hash.each do |key, value|
+      str_copy.gsub!("%{#{key}}", value.to_s)
+    end
+
+    str_copy
+  end
+
+  def unindent(str)
+    return if str.nil?
+
+    str_copy = str.dup
+    lines = str_copy.split("\n")
+
+    first_char = str_copy[0]
+
+    while lines.all? { |l| l.start_with?(first_char) } &&
+      (first_char == " " || first_char == "\t")
+
+      lines.map! { |l| l[1..-1] }
+
+      first_char = lines.first[0]
+    end
+
+    return lines.join("\n")
+  end
+
+  def mac?
+    RbConfig::CONFIG["host_os"] =~ /darwin/
+  end
+
+  def osascript(script)
+    system "osascript", *unindent(script).split(/\n/).map { |line| ["-e", line] }.flatten
+  end
+end

data/lib/note/version.rb

@@ -1,3 +1,3 @@
 module Note
-  VERSION = "0.0.11".freeze
+  VERSION = "0.0.18".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notenote
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.18
 platform: ruby
 authors:
 - Anatoli Makarevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CLI tool to keep daily notes.
 email:
 - makaroni4@gmail.com
@@ -79,6 +93,7 @@ files:
 - lib/note.rb
 - lib/note/cli.rb
 - lib/note/config.json.template
+- lib/note/helpers.rb
 - lib/note/version.rb
 homepage: https://github.com/makaroni4/note
 licenses: