sheldon 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ee0b52887749915716704a2fb573bc331cdc0db
-  data.tar.gz: fbc15b025c4a3fd9168ab2f6792306e4fa149312
+  metadata.gz: e3849dcc28716d5aafca1ee0dafda7347d12ae85
+  data.tar.gz: e6a90dc5d6027d5f4e7114aecae52d5b14db2995
 SHA512:
-  metadata.gz: b05a5a1b7bee03e34ee6d361e934f9c96cfddde840d6ba7482554862c0b349b0addfc5fcb9bbd3a4aed28e21563d407a3541c4daf7f04057d8992c0f6a6d0e58
-  data.tar.gz: 9bbee9aa6a3f825f7280dd38df53ca342af1eb4df7c8367cd21f6beb8f97b5bdd6a199e83f2d54dfa959e083443ba9a8609c8a63f072c147c3b90619add4e643
+  metadata.gz: fc98eca6fdbb01a0c384aa029620c0286764f36f3d3599ac3dcd9751b07b81eb9548ec108e3421adda50da998949af08942d15adb3ccd91d93a774a9f8d52577
+  data.tar.gz: 58a7b7b0dddead7f6363b513198026bc7501d4f980c1d71ad38d5ac0d333aa9ccefbd8c78d55cad428239cb8efeaf07575b94c7aa25c5cbc166ce122ae9e06c4

data/bin/sheldon

@@ -25,7 +25,7 @@ module CLI
 
     desc "forget recall_cue", "Remove file/folder from Sheldon's brain"
     def forget(recall_cue=nil)
-      recall_cue ||= prompt_user("Recall Cue For File/Folder")
+      recall_cue ||= ask("Recall Cue For File/Folder")
       with_exception_handling { sheldon.forget(recall_cue) }
       announce("I've forgotten about #{recall_cue}. Let us never mention it again.")
     end
@@ -34,7 +34,7 @@ module CLI
     def learn(rel_path_to_target)
       abs_learn_path = File.expand_path(rel_path_to_target)
       default_cue = File.basename(rel_path_to_target)
-      recall_cue = prompt_user("Recall Cue For File/Folder (#{default_cue})") || default_cue
+      recall_cue = ask("Recall Cue For File/Folder", default: default_cue)
       with_exception_handling { sheldon.learn(recall_cue, abs_learn_path) }
       with_exception_handling { sheldon.recall(recall_cue) }
     end
@@ -42,7 +42,7 @@ module CLI
     desc "list", "List all recall cues known by Sheldon"
     def list
       sheldon.list_cues.each do |recall_cue|
-        sheldon.recalled?(recall_cue) ? green(recall_cue) : red(recall_cue)
+        sheldon.recalled?(recall_cue) ? say(recall_cue, :green) : say(recall_cue, :red)
       end
     end
 
@@ -52,11 +52,11 @@ module CLI
     def recall(recall_cue=nil)
       if options[:i]
         sheldon.list_cues.each do |recall_cue|
-          answer = prompt_user("Recall #{recall_cue}? (Y/N)")
+          answer = ask("Recall #{recall_cue}? (Y/N)")
           with_exception_handling { sheldon.recall(recall_cue) if answer.downcase == "y" }
         end
       else
-        recall_cue ||= prompt_user("Recall Cue For File/Folder")
+        recall_cue ||= ask("Recall Cue For File/Folder")
         with_exception_handling { sheldon.recall(recall_cue) }
       end
 
@@ -65,16 +65,16 @@ module CLI
 
     desc "setup path_to_data_directory", "Setup Sheldon on this host, supplying the path that where Sheldon's data directory can be found, or should be created."
     def setup(rel_data_path=nil)
-      rel_data_path ||= prompt_user("Please supply location for new/existing data directory")
+      rel_data_path ||= ask("Please supply location for new/existing data directory")
       abs_data_path = File.expand_path(rel_data_path)
       with_exception_handling do
         sheldon = ::Sheldon.new(abs_data_path)
 
         if sheldon.brain.present?
-          green "Using existing Sheldon database found at #{abs_data_path}."
+          say("Using existing Sheldon database found at #{abs_data_path}.", :green)
         else
           sheldon.setup!
-          green "New Sheldon database created at #{abs_data_path}"
+          say("New Sheldon database created at #{abs_data_path}", :green)
         end
 
         write_to_dotfile("data_directory", sheldon.brain.location)
@@ -93,25 +93,11 @@ module CLI
       puts logo + " Sheldon" + logo + "  #{message}"
     end
 
-    def green(message)
-      puts "\e[32m#{message}\e[0m"
-    end
-
-    def prompt_user(prompt)
-      print(prompt + ": ")
-      input = STDIN.gets.chomp.strip
-      input.empty? ? nil : input
-    end
-
     def read_from_dotfile(key)
       dotfile = YAML::Store.new(add_home(".sheldon"))
       dotfile.transaction { dotfile[key] }
     end
 
-    def red(message)
-      puts "\e[31m#{message}\e[0m"
-    end
-
     def sheldon
       with_exception_handling { @sheldon ||= ::Sheldon.new(sheldon_data_dir) }
     end
@@ -127,7 +113,7 @@ module CLI
       if options[:debug]
         puts ([e.inspect] + e.backtrace).join("\n")
       else
-        red(e.message + "\nUse --debug to print backtrace")
+        say(e.message + "\nUse --debug to print backtrace", :red)
       end
       exit!
     end

data/lib/sheldon/sheldon.rb

@@ -1,7 +1,7 @@
 require "fileutils"
 
 class Sheldon
-  VERSION = "0.5.4".freeze
+  VERSION = "0.5.5".freeze
   attr_reader :brain, :builder
 
   def initialize(sheldon_data_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sheldon
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - David Jones