sheldon 6.1.0 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e453e21aa4dff4ea4eff7005a4b39361309ff2598f6a0fb51089d2493d6371
-  data.tar.gz: 73d869ad35ffc2c51f7f3f397c593c7f0c7f1c2e9ed923828de28eef931d2bda
+  metadata.gz: 2da25030d7b1b8c75d8086d1fe49b93b235e403db8fe458462f9ffc4cbb02ebe
+  data.tar.gz: e5beeae34230723afe2045230030a65258b09f66466745fa02c31383a8652aba
 SHA512:
-  metadata.gz: f1e0bfd62594680c986726e42b5dd732bcce8082df572c62118ffee062d9c6542347fdb1fcbbbe7ee6224f0035800527f871a908be0eb8028b1624175ddfe02b
-  data.tar.gz: c1553d90cd57ee0e3d285e70403f03c34bf1faae8aa8bde9a69362a008b4b5e8c9424aae27ffdce5f6c37de438936292812a631a5975129693ff6869e9b47e11
+  metadata.gz: 117fce31072b4899578ca2da01146b3c0094c674b1b0fe69336266a8f2aa686dad02885c982d5973d90ded664ef5d7147c2b29f3c0cb90bce4ed47fa5a300a4f
+  data.tar.gz: 50b1ea6cc8ad3b08bbd71aca9d28ef1f90bfc57ab1efd57320816824c712bd9a1119bff9a3d23f35de3490217921aefed5325741482b6605d6ce3d19d804808b

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,16 +47,29 @@ class Brain
     memory.present?
   end
 
-  def recall(recall_cue)
+  def recall(recall_cue, opts={})
+    # Compute the absolute paths for recall
+    brain_path = brain_directory_for_cue(recall_cue)
     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)
 
+    # Handle the destination file / directory already existing on the filesystem
+    if File.exist?(destination_path) || File.symlink?(destination_path)
+      if opts[:overwrite]
+        FileUtils.remove_dir(destination_path) # this (badly named) method deletes both files and folders
+      else
+        raise DestinationNotEmptyException, "#{destination_path} already exists."
+      end
+    end
+
+    # Create the destination directory if required
     FileUtils.mkdir_p(destination_dir) unless File.directory?(destination_dir)
-    brain_path = brain_directory_for_cue(recall_cue)
+
+    # Create the symbolic link between sheldon's brain and the destination
     FileUtils.ln_s(get_content(brain_path), destination_path)
-    return true
+
+    return recalled?(recall_cue)
   end
 
   def recalled?(recall_cue)

data/lib/sheldon/builder.rb

@@ -2,7 +2,7 @@ class Builder
   require "fileutils"
 
   def build(abs_build_path)
-    entries = Dir.glob(abs_build_path + "/*")
+    entries = Dir.glob(abs_build_path + "/*").sort
     master_content = entries.inject("") do |buffer, entry|
       is_config?(entry) ? add_entry_to_buffer(entry, buffer) : buffer
     end

data/lib/sheldon/sheldon.rb

@@ -1,7 +1,7 @@
 require "fileutils"
 
 class Sheldon
-  VERSION = "6.1.0".freeze
+  VERSION = "6.2.2".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.0
+  version: 6.2.2
 platform: ruby
 authors:
 - David Jones
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -101,7 +101,7 @@ homepage: https://github.com/dvjones89/sheldon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Another config and dotfile manager for unix environments
 test_files: []