cleanfb 0.2.1.10 → 0.2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434be941563759cbc0ead8756df2a75e49889362
-  data.tar.gz: 792c9163eead44fe621e28f13483cb8b6a19d5c4
+  metadata.gz: 47a5c62040029128339ab8591ced402e43adee9d
+  data.tar.gz: 41b51a7a1c0535dd6a9e1a3ac53774683e0b0abd
 SHA512:
-  metadata.gz: 1f657f39c34d663eb3834f280e53b27c7b24de0df905524919352a86211d37097e935a809c933d24a0644ee829f70a87085679b16a18443c763469f7118ead48
-  data.tar.gz: 69a0ab512d7e7e66dc18c94af52f54757a3cce41b5279550457e3b03674a58a7f28218637631ca3a37e01a7abafac67d56353b06691fcbfb60dfaa74828bec57
+  metadata.gz: 399afa597c525eef0e258fe698ebc771794184f85f33d7f35fe17c257e6a10f027de45f8de21dee5cf3b71264056f70a6c2853cf575a24b51054b6944f175e08
+  data.tar.gz: b685481743b2eef13658a318ad2930a89442a5eac72719faf7cf20008577ca3ac735b40d6204dfcd5f28d416bf7c8ea4436646ad6c505594f2651ed5aae7b0fa

data/exe/cleanfb

@@ -3,19 +3,19 @@
 require 'cleanfb'
 
 class String
-	def magenta;	"\e[35m#{self}\e[0m" end
+  def magenta;  "\e[35m#{self}\e[0m" end
 end
 
 cleaner = Cleanfb::Clean.new
 
 unless ARGV.include? "restore"
-	response = cleaner.remove
+  response = cleaner.remove
 else
-	respone = cleaner.restore
+  respone = cleaner.restore
 end
 
 unless response.nil? || response.empty? || (response.include? "Please")
-	puts response.magenta
+  puts response.magenta
 else
-	puts response
+  puts response
 end

data/lib/cleanfb/version.rb

@@ -1,3 +1,3 @@
 module Cleanfb
-  VERSION = "0.2.1.10"
+  VERSION = "0.2.1.11"
 end

data/lib/cleanfb.rb

@@ -1,49 +1,50 @@
 require "cleanfb/version"
 require 'digest'
+require 'optparse'
 
 module Cleanfb
-
+  
   class Clean
+    
+    options = {}
+    hostname = ""
 
-    def remove()
-
-      return "Please supply a file" if (ARGV[0].nil? || ARGV[0].empty?)
-      
-      help_msg = "Remove backups of an agent from the Puppet master filebucket.\nBackups are stored at /root/saved_configs/\n\n"
+    def show_help
+      puts "HELP"
+      exit 0
+    end
 
-      return help_msg if ((ARGV.include? "-h") || (ARGV.include? "--help"))
+    def parse_input
+      OptionParser.new do |opts|
+        opts.banner = ""
+        opts.on("-h", "--help", "Display help information") {show_help}
+        opts.on("-f", "--force", "Ignore all prompts") { |f| options[:force] = f }
+        opts.on("-nNAME", "--name=NAME", "Hostname") { |n| hostname = n }
+      end
+    end
 
-      arg = ARGV[0]	
 
-      if (!ARGV.nil? && (ARGV.include? "-y") && ARGV.length > 1)
-        ans = "y"
-        arg = ARGV[1] if (ARGV.index("-y") == 0)
-        
-      else
-        print "Remove #{arg} ? y|n: "
+    def remove()
+      
+      unless options[:force]  
+        print "Remove #{hostname} ? y|n: "
         ans = STDIN.gets.chomp
       end
 
-      if ans == "y" || ans == "yes"
-        cmd = `puppet filebucket list -l|grep -i #{arg}`
+      if(options[:force] || ans =~ /^y/) 
+        cmd = `puppet filebucket list -l|grep -i #{hostname}`
           
-        unless (ARGV.include? "-y")
+        unless options[:force] 
           test = cmd.split(" ").last
           multi_match = false
 
-          cmd.each_line do |line|
-            if !line.include? test
-              multi_match = true
-            end
-          end	
+          cmd.each_line { |line| (multi_match = true) if (!line.include? test) }
             
           if multi_match
             print "Matched multiple hosts. Remove all? y|n: "
             ans = STDIN.gets.chomp
                 
-            unless ans == "y" || ans == "yes"
-              return "Ending run"	
-            end
+            return "Ending run"	unless (options[:force] || ans =~/^y/)
           end
         end			
         
@@ -61,14 +62,10 @@ module Cleanfb
             time = line.split(" ")[2]
                 
             save_dir = "/root/saved_configs/"
+              
+            Dir.mkdir(File.join(Dir.home("root"), "saved_configs"), 0700) unless (Dir.exist? save_dir)
 
-            unless Dir.exist? save_dir
-              Dir.mkdir(File.join(Dir.home("root"), "saved_configs"), 0700)
-            end
-
-            unless Dir.exist? "#{save_dir}/#{name}/"
-              Dir.mkdir(File.join("#{save_dir}", "#{name}"), 0700)
-            end
+            Dir.mkdir(File.join("#{save_dir}", "#{name}"), 0700) unless (Dir.exist? "#{save_dir}/#{name}/")
                 
             path += "/" + start[0..15] + sum + "/"
                     
@@ -78,20 +75,22 @@ module Cleanfb
               cmd = `mv -f #{path}contents /root/saved_configs/#{name}/#{date}_#{time}_#{file}`
               cmd = `rm -rf #{path}`
             else
-              puts "No file #{arg} found."
+              puts "No file #{hostname} found."
             end
+          end
         end
+      
       else
-        puts "No file #{arg} found."
+        puts "No file #{hostname} found."
       end
-    end
-        return 
+      
+      return 
     end
     
     def store(host)
 
       cmd = `puppet filebucket list -l|grep -i #{host}`
-      unless cmd.nil? || cmd.empty?
+      unless(cmd.nil? || cmd.empty?)
         cmd.each_line do |line|
           path = "/opt/puppetlabs/puppet/cache/bucket"
           sum = line.split(" ")[0]
@@ -105,8 +104,7 @@ module Cleanfb
           save_dir = "/root/saved_configs/"
 
           Dir.mkdir(File.join(Dir.home("root"), "saved_configs"), 0700) unless (Dir.exist? save_dir)
-
-          Dir.mkdir(File.join("#{save_dir}", "#{name}"), 0700) unless Dir.exist? "#{save_dir}/#{name}/"
+          Dir.mkdir(File.join("#{save_dir}", "#{name}"), 0700) unless (Dir.exist? "#{save_dir}/#{name}/")
                 
           path += "/" + start[0..15] + sum + "/"
                     
@@ -128,7 +126,7 @@ module Cleanfb
 
     def restore()
 
-      return "Please supply a file" if ARGV[0].nil? || ARGV[0].empty?
+      return "Please supply a file" if (ARGV[0].nil? || ARGV[0].empty?)
         
       arg = ARGV[1]	
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cleanfb
 version: !ruby/object:Gem::Version
-  version: 0.2.1.10
+  version: 0.2.1.11
 platform: ruby
 authors:
 - lhoffl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler