sheldon 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fcd9ba0fc6e8476ca29295ab5cabd422e9c173fd44081d3c609938f50c4264e
-  data.tar.gz: a89f27bb6197bac5852a97ddbe7dc3439931b3c7a440ed5d2705ec062b970900
+  metadata.gz: ae77eea72d0cbd8122af494ca74a65b695239441e9404ec638264d177c3402e4
+  data.tar.gz: d75771ef4eeefc50b7d7797d3a7e0acc9bade0b1e82d0f4c7b05868414339c61
 SHA512:
-  metadata.gz: 1ccb496b56e38481a305313bc81f3bf4cfcd41ffc034e750a5a9d2c386608b82845229d9e4cbbdaa4345a662c79df43d84013c7e96d034b2dc1e9b71e06d2439
-  data.tar.gz: 03b69b577dc3089beae54eae843327eb1f7471c4362d215afe31b7e8a70bd81fa4d76b90895712b7cff61449b1f5cb54c6864b7b80b44c6ffbe39f647a864d13
+  metadata.gz: 8a23ca4c9ad09b76eeaba8b08bc080867dce4525a5ac6257efeb9455252686cbba41bdf6429110b25053ecb0c0c319f73e8c7c36be4969ce1498ea9c1172a446
+  data.tar.gz: 1292f1dc3fd7929d64c216381204d3faaf73cc230246f944fe5e2b7c9ba45452b08630645b84aa4af781bfccd743210ffc10df390a84dd4578fd294a904d315f

data/bin/sheldon

@@ -66,12 +66,12 @@ module CLI
 
       if options[:i]
         cue_options.each do |recall_cue|
-          answer = prompt.yes?("Recall #{recall_cue}?")
-          with_exception_handling { sheldon.recall(recall_cue) if answer == true }
+          recall_confirmed = prompt.yes?("Recall #{recall_cue}?")
+          perform_recall(recall_cue) if recall_confirmed
         end
       else
         recall_cue ||= cue_picker("What would you like to recall?", cue_options)
-        with_exception_handling { sheldon.recall(recall_cue) }
+        perform_recall(recall_cue)
         prompt.ok("Sheldon recall complete: #{recall_cue}")
       end
     end
@@ -101,17 +101,28 @@ module CLI
 
     private
 
+    def cue_picker(message, options=sheldon.list_cues)
+      prompt.select(message, options, per_page: 20, filter: true)
+    end
+
     def error_and_exit(message)
       prompt.error(message)
       exit!
     end
 
-    def prompt
-      @prompt ||= TTY::Prompt.new(interrupt: :exit)
+    def perform_recall(recall_cue)
+      with_exception_handling do
+        begin
+          sheldon.recall(recall_cue)
+        rescue DestinationNotEmptyException => e
+          overwrite_confirmed = prompt.yes?("File/target already exists. Overwrite?")
+          sheldon.recall(recall_cue, overwrite: true) if overwrite_confirmed
+        end
+      end
     end
 
-    def cue_picker(message, options=sheldon.list_cues)
-      prompt.select(message, options, per_page: 20, filter: true)
+    def prompt
+      @prompt ||= TTY::Prompt.new(interrupt: :exit)
     end
 
     def read_from_dotfile(key)

data/lib/sheldon/brain.rb

@@ -47,15 +47,16 @@ class Brain
     memory.present?
   end
 
-  def recall(recall_cue)
+  def recall(recall_cue, opts={})
     entry = memory.recall(recall_cue)
     destination_path = add_home(entry[:filepath])
     destination_dir = File.dirname(destination_path)
-    raise DestinationNotEmptyException, "#{destination_path} already exists." if File.exist?(destination_path)
+
+    raise DestinationNotEmptyException, "#{destination_path} already exists." if File.exist?(destination_path) && !opts[:overwrite]
 
     FileUtils.mkdir_p(destination_dir) unless File.directory?(destination_dir)
     brain_path = brain_directory_for_cue(recall_cue)
-    FileUtils.ln_s(get_content(brain_path), destination_path)
+    FileUtils.ln_s(get_content(brain_path), destination_path, force: opts[:overwrite])
     return true
   end
 

data/lib/sheldon/sheldon.rb

@@ -1,7 +1,7 @@
 require "fileutils"
 
 class Sheldon
-  VERSION = "6.1.1".freeze
+  VERSION = "6.2.0".freeze
   attr_reader :brain, :builder
 
   def initialize(sheldon_data_dir)
@@ -29,8 +29,8 @@ class Sheldon
     brain.list_cues
   end
 
-  def recall(recall_cue)
-    brain.recall(recall_cue)
+  def recall(recall_cue, opts={})
+    brain.recall(recall_cue, opts)
   end
 
   def setup!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sheldon
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor