cleanfb 0.2.1.122 → 0.2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e97bfe9d3804f18b7e531c62511c7c6d06ab5f
-  data.tar.gz: f868cc0c89b1d4f1e918b26bda9f16cd73fc7736
+  metadata.gz: f491b92acd5cc8e0c705a5d768eeee7a2d5f1e22
+  data.tar.gz: 28abe3e63df503fb2cf8b8d863fbfdd2f26b0b34
 SHA512:
-  metadata.gz: 5487df3cc63b0970f91888f80f21d156d3de2f50ea6e6c718d2576f595f1d969ea79d111d96ec9a7e2e1f2eddb660ceb3a383015c59efa30755e29dfd4362c32
-  data.tar.gz: 8b13121342737d031c4ec104c22a6b420eca87f860622ff1cc4709399b92e087c0d0de1c547c8d4c7834ea233ff00cbed11293f92eee46d8a7f20d99d225989b
+  metadata.gz: 7a378da897a522873c33a0ebc7cb6014b763dd7b82b5803149b8054b5fa984cb29792192722d93a4441a5b46045c60e71c239e457b3d79c8948d8cdd62b9181e
+  data.tar.gz: 103c90e3e5183e2fc3a1886b9ea520305ddf73472e8405a4e4f54bd51038c5d9dce432fac9e447a5a33e800c24440fefe990f952409055aaed54a849bf9ccdbe

data/lib/cleanfb/version.rb

@@ -1,3 +1,3 @@
 module Cleanfb
-  VERSION = "0.2.1.122"
+  VERSION = "0.2.2.1"
 end

data/lib/cleanfb.rb

@@ -6,8 +6,7 @@ module Cleanfb
   
   class Clean
     
-    options = {}
-    hostname = ""
+    attr_accessor :options
 
     def show_help
       puts "HELP"
@@ -18,23 +17,22 @@ module Cleanfb
       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
+        opts.on("-f", "--force", "Ignore all prompts") { |f| @options[:force] = f }
+        opts.on("-nNAME", "--name=NAME", "Hostname") { |n| @options[:hostname] = n }
+      end.parse!
     end
 
+    def remove
 
-    def remove()
-      
-      unless options[:force]  
-        print "Remove #{hostname} ? y|n: "
+      unless @options[:force]  
+        print "Remove #{@options[:hostname]} ? y|n: "
         ans = STDIN.gets.chomp
       end
 
-      if(options[:force] || ans =~ /^y/) 
-        cmd = `puppet filebucket list -l|grep -i #{hostname}`
+      if(@options[:force] || ans =~ /^y/) 
+        cmd = `puppet filebucket list -l|grep -i #{@options[:hostname]}`
           
-        unless options[:force] 
+        unless @options[:force] 
           test = cmd.split(" ").last
           multi_match = false
 
@@ -44,7 +42,7 @@ module Cleanfb
             print "Matched multiple hosts. Remove all? y|n: "
             ans = STDIN.gets.chomp
                 
-            return "Ending run"	unless (options[:force] || ans =~/^y/)
+            return "Ending run"	unless (@options[:force] || ans =~/^y/)
           end
         end			
         
@@ -56,10 +54,10 @@ module Cleanfb
           
             start = (sum.scan /\w/).join("/")
                 
-            file = line.split(" ")[3].split("/").last
             name = file.split("_")[0]
             date = line.split(" ")[1]
             time = line.split(" ")[2]
+            file = line.split(" ")[3].split("/").last
                 
             save_dir = "/root/saved_configs/"
               
@@ -75,19 +73,19 @@ module Cleanfb
               cmd = `mv -f #{path}contents /root/saved_configs/#{name}/#{date}_#{time}_#{file}`
               cmd = `rm -rf #{path}`
             else
-              puts "No file #{hostname} found."
+              puts "No file #{@options[:hostname]} found."
             end
           end
         end
       
       else
-        puts "No file #{hostname} found."
+        puts "No file #{@options[:hostname]} found."
       end
       
       return 
     end
     
-    def store(host)
+    def store host
 
       cmd = `puppet filebucket list -l|grep -i #{host}`
       unless(cmd.nil? || cmd.empty?)
@@ -96,10 +94,10 @@ module Cleanfb
           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]
+          file = line.split(" ")[3].split("/").last
                     
           save_dir = "/root/saved_configs/"
 
@@ -124,7 +122,7 @@ module Cleanfb
       return 
     end
 
-    def restore()
+    def restore
 
       return "Please supply a file" if (ARGV[0].nil? || ARGV[0].empty?)
         

metadata

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