sheldon 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0afba78030a4494e811effb363a21e26a7468be4
-  data.tar.gz: b70fd44995b128c4ff2f47bfb5cca1dda631af89
+  metadata.gz: c591c521b0251b14812cbd07752b6ec6fdf7c3a8
+  data.tar.gz: d8db7161ee6f3093454ff3b6c708ce58be519016
 SHA512:
-  metadata.gz: bb9d000e17243f6ea9d82a233e7a7c4769d046e17b879097e5ffbe1a7a939da9d87e9cddec94913595a6f5194cc1dc1af688fb995fd20f37860c43bbee812dfc
-  data.tar.gz: 233d738e092355e4f10fb87c45622cf3713cc37bdb7405dd5c2268e63734ce8a09f9a1b1aa69daed75bba106e02110a12cabcc9ea60bd44d303aaf95e4416361
+  metadata.gz: f06d4369c5c00f3c130ed6e74b95ac02bec327e7b0f4e8e5027b77a19e929eb81f3ef928c87e6b0f905a6d3396132d9f5a324ce62ed3fd368a144bb4424270e0
+  data.tar.gz: 6f87f3b7ee054de3d16613d4fcbc469e16460162cd885272ef25bdd1fade99bf6ec0d6c4da9793de9ca0f7182925926e6362e928b4afdc8c520171ea606128f2

data/bin/sheldon

@@ -12,16 +12,17 @@ module CLI
     desc "build path", "Tell Sheldon to build all config_ files in a directory to single master config"
     def build(rel_path_to_target)
       abs_learn_path = File.expand_path(rel_path_to_target)
-      sheldon.build(abs_learn_path)
+      with_exception_handling{ sheldon.build(abs_learn_path) }
       announce("Built #{File.basename(rel_path_to_target)}")
     end
 
     desc "learn path", "Add a new file/folder to Sheldon's brain. Supply a recall_cue at runtime."
     def learn(rel_path_to_target)
       abs_learn_path = File.expand_path(rel_path_to_target)
-      recall_cue = prompt_user("Recall Cue For File/Folder")
-      sheldon.learn(recall_cue, abs_learn_path)
-      sheldon.recall(recall_cue)
+      default_cue = File.basename(rel_path_to_target)
+      recall_cue = prompt_user("Recall Cue For File/Folder (#{default_cue})") || default_cue
+      with_exception_handling { sheldon.learn(recall_cue, abs_learn_path) }
+      with_exception_handling { sheldon.recall(recall_cue) }
     end
 
     desc "recall recall_cue", "Symlink a previously learnt file/directory to it's original location on the filesystem.\nUse `sheldon list` for available cues."
@@ -31,16 +32,23 @@ module CLI
       if options[:i]
         sheldon.list_cues.each do |recall_cue|
           answer = prompt_user("Recall #{recall_cue}? (Y/N)")
-          sheldon.recall(recall_cue) if answer.downcase == "y"
+          with_exception_handling { sheldon.recall(recall_cue) if answer.downcase == "y" }
         end
       else
         recall_cue ||= prompt_user("Recall Cue For File/Folder")
-        sheldon.recall(recall_cue)
+        with_exception_handling { sheldon.recall(recall_cue) }
       end
 
       announce("Recall Complete.")
     end
 
+    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")
+      with_exception_handling { sheldon.forget(recall_cue) }
+      announce("I've forgotten about #{recall_cue}. Let us never mention it again.")
+    end
+
     desc "list", "List all recall cues known by Sheldon"
     def list
       sheldon.list_cues.each do |recall_cue|
@@ -55,31 +63,27 @@ module CLI
 
     private
 
-    def announce(message)
-      logo = "💥".encode("utf-8")
-      puts logo + " Sheldon" + logo + "  #{message}"
+    def prompt_user(prompt)
+      print(prompt + ": ")
+      input = STDIN.gets.chomp.strip
+      input.empty? ? nil : input
     end
 
     def green(message)
       puts "\e[32m#{message}\e[0m"
     end
 
-    def prompt_user(prompt)
-      print(prompt + ": ")
-      STDIN.gets.chomp
-    end
-
     def red(message)
       puts "\e[31m#{message}\e[0m"
     end
 
+    def announce(message)
+      logo = "💥".encode("utf-8")
+      puts logo + " Sheldon" + logo + "  #{message}"
+    end
+
     def sheldon
-      begin
-        @sheldon ||= ::Sheldon.new(sheldon_data_dir)
-      rescue MissingDataDirectoryException
-        announce "The data directory (#{sheldon_data_dir}) doesn't exist. Please create the directory or set an alternative using the $SHELDON_DATA_DIR environment variable."
-        exit
-      end
+      with_exception_handling { @sheldon ||= ::Sheldon.new(sheldon_data_dir) }
     end
 
     def sheldon_data_dir
@@ -87,6 +91,13 @@ module CLI
       File.expand_path(path)
     end
 
+    def with_exception_handling(&block)
+      yield
+    rescue Exception => e
+      announce(e.message)
+      exit(1)
+    end
+
   end
 end
 

data/lib/sheldon/brain.rb

@@ -9,9 +9,9 @@ class Brain
 
 
   def learn(recall_cue, abs_learn_path)
-    cell = get_cell(recall_cue)
-    FileUtils.mkdir_p(cell)
-    FileUtils.mv(abs_learn_path, cell)
+    brain_path = brain_path_for_cue(recall_cue)
+    FileUtils.mkdir_p(brain_path)
+    FileUtils.mv(abs_learn_path, brain_path)
     entry = { filepath: remove_home(abs_learn_path) }
     memory.add(recall_cue, entry)
   end
@@ -21,8 +21,18 @@ class Brain
     destination_path = add_home(entry[:filepath])
     destination_dir = File.dirname(destination_path)
     FileUtils.mkdir_p(destination_dir) unless File.directory?(destination_dir)
-    source_cell = get_cell(recall_cue)
-    FileUtils.ln_s(read_cell(source_cell), destination_path, force: true)
+    brain_path = brain_path_for_cue(recall_cue)
+    FileUtils.ln_s(get_content(brain_path), destination_path, force: true)
+  end
+
+  def forget(recall_cue)
+    entry = memory.recall(recall_cue)
+    brain_path = brain_path_for_cue(recall_cue)
+    destination_path = add_home(entry[:filepath])
+    FileUtils.rm_r(brain_path)
+    FileUtils.rm_r(destination_path)
+
+    memory.forget(recall_cue)
   end
 
   def recalled?(recall_cue)
@@ -47,13 +57,13 @@ class Brain
 
   private
 
-  def get_cell(recall_cue)
+  def brain_path_for_cue(recall_cue)
     File.join(@brain_location, recall_cue)
   end
 
-  def read_cell(cell)
-    basename = (Dir.entries(cell) - [".", "..", ".DS_Store"]).first
-    File.join(cell, basename)
+  def get_content(path)
+    basename = (Dir.entries(path) - [".", "..", ".DS_Store"]).first
+    File.join(path, basename)
   end
 
 end

data/lib/sheldon/memory.rb

@@ -19,6 +19,11 @@ class Memory
     @database.transaction { @database[recall_cue] }
   end
 
+  def forget(recall_cue)
+    raise "no entry for cue" unless has_cue?(recall_cue)
+    @database.transaction{ @database.delete(recall_cue) }
+  end
+
   def size
     list_cues.size
   end

data/lib/sheldon/sheldon.rb

@@ -1,11 +1,14 @@
 require "fileutils"
 
 class Sheldon
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
   attr_reader :brain, :builder
 
   def initialize(sheldon_data_dir, opts = {})
-    raise MissingDataDirectoryException unless Dir.exists?(sheldon_data_dir)
+    unless Dir.exists?(sheldon_data_dir)
+      raise MissingDataDirectoryException, "The data directory (#{sheldon_data_dir}) doesn't exist. Please create the directory or set an alternative using the $SHELDON_DATA_DIR environment variable."
+    end
+
     @brain = opts[:brain] || Brain.new(sheldon_data_dir)
     @builder = opts[:builder] || Builder.new
   end
@@ -15,6 +18,7 @@ class Sheldon
   end
 
   def learn(recall_cue, abs_learn_path)
+    raise "recall cue cannot be empty." if recall_cue.strip.empty?
     if brain.has_cue?(recall_cue)
       raise "This cue has already been used."
     else
@@ -22,6 +26,16 @@ class Sheldon
     end
   end
 
+  def recall(recall_cue)
+    raise "Cue '#{recall_cue}' could not be found." unless brain.has_cue?(recall_cue)
+    brain.recall(recall_cue)
+  end
+
+  def forget(recall_cue)
+    raise "Cue '#{recall_cue}' could not be found." unless brain.has_cue?(recall_cue)
+    brain.forget(recall_cue)
+  end
+
   def list_cues
     brain.list_cues
   end
@@ -31,9 +45,4 @@ class Sheldon
     brain.recalled?(recall_cue)
   end
 
-  def recall(recall_cue)
-    raise "Cue '#{recall_cue}' could not be found." unless brain.has_cue?(recall_cue)
-    brain.recall(recall_cue)
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sheldon
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor