Added conditionals to avoid having to go through prompts for selections when -o|--output-file is specified during restores

README.md

@@ -26,3 +26,6 @@ This will allow you to restore a file on disk to the specific version that is st
 
 ### Get
 The utility will allow you to get the contents of a backup up file and have it output to the terminal.
+
+### Delete
+The utility allows you to delete entries/backups in the bucket if you choose to do so.

bucket-tool

@@ -15,11 +15,11 @@ def usage
 #{__FILE__} [ACTION <arg>] [<flags>]
 
 Description:
-  This utlity is meant to be used to interact with & manage the filebucket on P4 nodes due to the 
-  utility for that `puppet filebucket -l <action>` being nonfunctional.
+  This utlity is meant to be used to interact with & manage the filebucket in the same capacity as 
+  the builtin filebucket utility. However, it does not handle any puppet tie ins.
 
-  This implements the same functionality (minus the puppet tie-in) and will allow the user to 
-  search the filebucket and restore from it.
+  I created this due to the puppet filebucket utility in my companies P4 envrionments not 
+  functioning
 
 Actions:
   search <term>              : Search for bucket entries matching a portion of the filepath
@@ -29,7 +29,8 @@ Actions:
   restore <value>            : Restore previous state of file stored in bucket. Value can be hash or filename/filepath 
                              : Note: To restore to an alternate path you will need to provide the path via the -o flag
                              :
-  backup <file>              : Backup the file to the bucket (will work relatively unless full path is provided)
+  backup <file>              : Backup the file to the bucket 
+  delete <hash>              : Delete the entry from the bucket
 
 Restore Flags:
   -o | --output-file <file>  : Used to provide an alternate restoral path for the restore function
@@ -235,7 +236,7 @@ if not (ARGV & ['-d', '--debug']).empty?
 end
 i=0
 case ARGV[i] 
-  when 'search', 'get', 'restore', 'backup'
+  when 'search', 'get', 'restore', 'backup', 'delete'
     $CONFIG[:action]=ARGV[i]
     log "$CONFIG[:action] was set to #{ARGV[i]}"
     log "user provided search action ARGV[i.next] == #{ARGV[i.next]}"
@@ -277,20 +278,23 @@ while i < ARGV.count
     when '-o', '--output-file'
       log "user provided ARGV[i.next] == #{ARGV[i.next]}"
       if ARGV[i.next] != "" and not ARGV[i.next] =~ FLAG_REGEX
-        $CONFIG[:alt_filepath]=ARGV[i.next]
-        log "search_term was set to #{ARGV[i.next]}"
+        $CONFIG[:alt_filepath]=File.expand_path(ARGV[i.next])
+        log "search_term was set to #{$CONFIG[:alt_filepath]}"
         i+=2
       else
         puts "Flag[#{ARGV[i]}] : Argument[#{ARGV[i.next]}] : Either the argument was not provided or it was a flag"
         usage
         exit
       end
+    when '-d', '--debug'
+      log "#{ARGV[i]} as specified, and the $CONFIG[:debug] flag was already enabled"
+      i+=1
 
     when '-b', '--bucket'
       log "user provided ARGV[i.next] == #{ARGV[i.next]}"
       if ARGV[i.next] != "" and not ARGV[i.next] =~ FLAG_REGEX
-        $CONFIG[:bucketdir]=ARGV[i.next]
-        log "$CONFIG[:bucketdir] was set to #{ARGV[i.next]}"
+        $CONFIG[:bucket_dir]=ARGV[i.next]
+        log "$CONFIG[:bucket_dir] was set to #{ARGV[i.next]}"
         i+=2
       else
         puts "Flag[#{ARGV[i]}] : Argument[#{ARGV[i.next]}] : Either the argument was not provided or it was a flag"
@@ -333,8 +337,8 @@ if $CONFIG[:action] == ""
   puts "Action was not provided"
 end
 
-if not Dir.exist? $CONFIG[:bucketdir]
-  puts "BucketDir[#{$CONFIG[:bucketdir]}] Does not exist. Please check to make sure configuration is correct"
+if not Dir.exist? $CONFIG[:bucket_dir]
+  puts "BucketDir[#{$CONFIG[:bucket_dir]}] Does not exist. Please check to make sure configuration is correct"
   exit
 end
 
@@ -350,6 +354,8 @@ case $CONFIG[:action]
     if not File.exist? $CONFIG[:search_term]
       puts "File #{$CONFIG[:search_term]} does not exist. Please check to make sure that there are not typos and attempt the run again."
       exit
+    else
+      $CONFIG[:search_term] = File.expand_path($CONFIG[:search_term])
     end
 end
 
@@ -411,6 +417,54 @@ class BucketEntry
     end
   end
 
+  def delete
+    returncode = true
+    log "User has chosen to delete this BucketEntry"
+
+    Dir.chdir(@entry_dir){
+      log "Changed to #{@entry_dir} to delete children files"
+      Dir.children(@entry_dir).each{|file| 
+        log "Deleting #{file}"
+        if File.unlink(file)
+          log "#{file} deleted"
+        else
+          puts "There was an issue deleting #{File.expand_path(file)}"
+          exit
+        end
+      }
+    }
+
+    log "Deleting #{@entry_dir}"
+    if Dir.delete(@entry_dir)
+      log "Deleted #{@entry_dir}"
+    else
+      puts "There was an issue when attempting to delete #{@entry_dir}"
+    end
+
+    dir = @entry_dir
+
+    log "Beginning to delete trailing dirs unless one has children other than those that make up #{File.dirname(@entry_dir)}"
+    for i in 1..8
+      dir = File.dirname(dir)
+      log "Beginning to delete #{dir}"
+      children = Dir.children(dir)
+      log "Dir[#{dir}] children found to be #{children.join(',')}"
+      if children.empty?
+        if Dir.delete(dir)
+          log "Deleted #{dir}"
+        else
+          puts "There was an issue when attempting to delete #{dir}"
+          exit
+        end
+      else
+        log "#{dir} showed to contain another child directory. Not deleting and breaking loop"
+        break
+      end
+    end
+
+    returncode
+  end
+
 end
 
 class Bucket
@@ -514,6 +568,10 @@ def get_entry_by_file (bucket, filenames)
     end
   end
 
+  if $CONFIG[:alt_filepath] != ""
+      return entry, $CONFIG[:alt_filepath]
+  end
+
   if filename[0] != '/'
     filename = "/#{filename}"
   end
@@ -524,6 +582,12 @@ end
 def get_entry_by_hash (bucket)
   if bucket.entries.has_key? $CONFIG[:search_term]
     entry = bucket.entries[$CONFIG[:search_term]]
+
+    if $CONFIG[:alt_filepath] != ""
+      log "$CONFIG[:alt_filepath] was set. Skipping prompts asking for filepaths"
+      return entry, $CONFIG[:alt_filepath]
+    end
+
     filepath = ""
     if entry.filepaths.count == 1
       filepath = entry.filepaths[0]
@@ -551,10 +615,6 @@ def restore_entry (bucket)
     entry, filepath = get_entry_by_hash bucket
   end
 
-  if $CONFIG[:alt_filepath] != ""
-    filepath=$CONFIG[:alt_filepath]
-  end
-
   if get_verification "Are you sure you want to overwrite #{filepath}?" 
     File.open(filepath,'w') do |file|
       file.write(entry.content)
@@ -646,6 +706,26 @@ def backup_file (bucket)
   puts "File #{$CONFIG[:search_term]} was backed up to #{entry_dir}"
 end
 
+def delete_entry (bucket)
+  if bucket.entries.has_key? $CONFIG[:search_term]
+    entry = bucket.entries[$CONFIG[:search_term]]
+  else
+    puts "BucketEntry[#{$CONFIG[:search_term]}] Does not exist. Please make sure you provided the correct hash value"
+    exit
+  end
+
+  puts "Corresponding Entry: #{entry.info}"
+  if get_verification "Are you sure you want to delete BucketEntry[#{entry.hash}]? " 
+    if get_verification "This cannot be undone. Are you sure you want to continue?: "
+      if entry.delete
+        puts "Ok. BucketEntry[#{entry.hash}] Has been deleted"
+      end
+    end
+  end
+
+
+end
+
 # END: Work Functions
 
 
@@ -672,6 +752,9 @@ if __FILE__ == $0
 
     when 'backup'
       backup_file bucket
+
+    when 'delete'
+      delete_entry bucket
   end
 
 end