cleanfb 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec907caef2443978ba0882ead174458517237fcc
-  data.tar.gz: 29ccd78095c8009ec7b4d82edf4c05d388a95399
+  metadata.gz: 55951c522be14dc9d71fc1da2d68d8e14f425292
+  data.tar.gz: eaf665346feb36f002f5d86e01cd55e74b0350b1
 SHA512:
-  metadata.gz: cf2d771e100d8dce08740da5d6702a33d3dc07bdae9e4409659b9fee226c94d44465c76e88983d63da258e0cbdc8dac56d288a82f749a3bf059c3bbb9d34b4cf
-  data.tar.gz: 02211cfdffc069a753590cc53ce6b4a7376612010767675bd386fc21c50ddd71d2364b579958f0c70145d0ac7063025139bd4a41503c8a36a838ad1e50546623
+  metadata.gz: 7b5d5f71254d371151fdc15ace8cbf7deb87eff7bd065a9c2d7ed1c3951359f7fa4b50b17976d925d6dfb79730d3caa6c9568719ad5c13d0782e6cef79f0f57e
+  data.tar.gz: 382cfc26318ef552b7138ac52cbdd26d027b2f3028d4fe6c90178922ce0db51257a4f382776df3c536a0399abb1fe7a3d6e9e1b665a11382f6851c8f15d2145e

data/lib/cleanfb/version.rb

@@ -1,3 +1,3 @@
 module Cleanfb
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/cleanfb.rb

@@ -8,18 +8,25 @@ module Cleanfb
     
     @force = false
     @hostname = ""
+    @restore = ""
 
     def parse_input
       OptionParser.new do |opts|
-        opts.banner = ""
-        opts.on("-f", "--force", "Ignore all prompts") { |f| @force = f }
-        opts.on("-nNAME", "--name=NAME", "Hostname") { |n| @hostname = n }
-        opts.on_tail("-h", "--help", "Display help information") { puts opts; exit }
+        opts.banner = "Usage: cleanfb [options]..."
+        opts.on("-f", "--force", "ignore all prompts") { |f| @force = f }
+        opts.on("-nNAME", "--name=NAME", "hostname to clean") { |n| @hostname = n }
+        opts.on("-rRESTORE", "--restore=FILE", "file to restore") { |r| @restore = r } 
+        opts.on_tail("-h", "--help", "display this message") { puts opts; exit }
       end.parse!
     end
 
     def remove
-      
+
+      if hostname == ""
+        puts "Hostname required. See cleanfb --help for usage."
+        return
+      end
+
       unless @force  
         print "Remove #{@hostname}? (y|n): "
         ans = STDIN.gets.chomp
@@ -35,42 +42,14 @@ module Cleanfb
           cmd.each_line { |line| (multi_match = true) if (!line.include? test) }
             
           if multi_match
-            print "Matched multiple hosts. Remove all? y|n: "
+            print "Matched multiple hosts. Remove all? (y|n): "
             ans = STDIN.gets.chomp
                 
             return "Ending run"	unless (@force || ans =~/^y/)
           end
         end			
         
-        unless(cmd.nil? || cmd.empty?)
-          cmd.each_line do |line|
-            path = "/opt/puppetlabs/puppet/cache/bucket"
-            sum = line.split(" ")[0]
-          
-            start = (sum.scan /\w/).join("/")
-            
-            file = line.split(" ")[3].split("/").last
-            name = file.split("_")[0]
-            date = line.split(" ")[1]
-            time = line.split(" ")[2]
-                
-            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}/")
-                
-            path += "/" + start[0..15] + sum + "/"
-                    
-            if File.exist? "#{path}/contents"
-              puts "Storing " + path
-              puts "at /root/saved_configs/#{name}/#{date}_#{time}_#{file}"
-              cmd = `mv -f #{path}contents /root/saved_configs/#{name}/#{date}_#{time}_#{file}`
-              cmd = `rm -rf #{path}`
-            else
-              puts "No file #{@hostname} found."
-            end
-          end
-        end
+        (backup cmd) unless (cmd.nil? || cmd.empty?)
       
       else
         puts "No file #{@hostname} found."
@@ -78,58 +57,52 @@ module Cleanfb
       
       return 
     end
-    
-    def store host
-
-      cmd = `puppet filebucket list -l|grep -i #{host}`
-      unless(cmd.nil? || cmd.empty?)
-        cmd.each_line do |line|
-          path = "/opt/puppetlabs/puppet/cache/bucket"
-          sum = line.split(" ")[0]
-          start = (sum.scan /\w/).join("/")
-                    
-          name = file.split("_")[0]
-          date = line.split(" ")[1]
-          time = line.split(" ")[2]
-          file = line.split(" ")[3].split("/").last
-                    
-          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}/")
+   
+    def backup cmd 
+          
+      cmd.each_line do |line|
+        path = "/opt/puppetlabs/puppet/cache/bucket"
+        sum = line.split(" ")[0]
+          
+        start = (sum.scan /\w/).join("/")
+            
+        file = line.split(" ")[3].split("/").last
+        name = file.split("_")[0]
+        date = line.split(" ")[1]
+        time = line.split(" ")[2]
+            
+        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}/")
+            
+        path += "/" + start[0..15] + sum + "/"
                 
-          path += "/" + start[0..15] + sum + "/"
-                    
-          if File.exist? "#{path}/contents"
-            puts "Storing " + path
-            puts "at /root/saved_configs/#{name}/#{date}_#{time}_#{file}"
-            cmd = `mv -f #{path}contents /root/saved_configs/#{name}/#{date}_#{time}_#{file}`
-            cmd = `rm -rf #{path}`
-          else
-            puts "No file #{host} found."
-          end
+        if File.exist? "#{path}/contents"
+          puts "Storing " + path
+          puts "at /root/saved_configs/#{name}/#{date}_#{time}_#{file}"
+          cmd = `mv -f #{path}contents /root/saved_configs/#{name}/#{date}_#{time}_#{file}`
+          cmd = `rm -rf #{path}`
+        else
+          puts "No file #{@hostname} found."
         end
-      else
-        puts "No file #{host} found."
       end
-        
-      return 
     end
 
     def restore
       
-      #host = arg.scan(/_\w+\.\w+\.?\w+?_/).join("").gsub!("_", "")
-      #store(host)
-      #file = arg
+      host = @restore.scan(/_\w+\.\w+\.?\w+?_/).join("").gsub!("_", "")
+      backup host
+      file = host
       
-      #if File.exist? file
-      #  puts  "puppet filebucket -l backup #{file}"
-      #  cmd = `puppet filebucket -l backup #{file}`
-      #else
-      #  puts "No file #{arg} found."
-      #end
+      if File.exist? file
+        puts  "puppet filebucket -l backup #{file}"
+        cmd = `puppet filebucket -l backup #{file}`
+      else
+        puts "No file #{@restore} found."
+      end
      
-      #return
+      return
     end
     
   end	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cleanfb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - lhoffl