cleanfb 0.2.1.15 → 0.2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e9028d4dea1140877c53b5bd70389f01134765
-  data.tar.gz: 88637152d27244aea6a09b3c9967585da51b426c
+  metadata.gz: 370081ee67f4323fae0a4d7b9062587f7667b601
+  data.tar.gz: e662e75e235c4c12071276eb8e83f9f5c96db2d9
 SHA512:
-  metadata.gz: 287b727ac47eea116c53a02433ef0d1abfefb3e33f8d2e19005c9a79e9ad45808e1a1d16b20c3f87da9e1e17a97b1d9c4982b782e0c4473ce720b998a05ce11b
-  data.tar.gz: 36e4a2030dd6d70348f2e30b485d4f0c72c546d9d5c6db37df2bff43f461136f7d567319fa86fd9fd8789ede8c6ee6f9c71c17829275509296d624578885554d
+  metadata.gz: 7686159e3736e345c03dd483c11fe398711a54b4230e0704f2c8fd71da9de28db962c27b0858d090175cfa7af45dc1c236d265d93bf37a211cad6f392c048fa5
+  data.tar.gz: 13bdc61276ef2877060cb4532e1142817835a57a979469e68b797e5a4a672e78850fae48330b8da7eb412d84bb0ea77e3adf64baad925f88365709f6bf42113e

data/lib/cleanfb/version.rb

@@ -1,3 +1,3 @@
 module Cleanfb
-  VERSION = "0.2.1.15"
+  VERSION = "0.2.1.16"
 end

data/lib/cleanfb.rb

@@ -6,8 +6,7 @@ module Cleanfb
   
   class Clean
     
-    public options = {}
-    hostname = ""
+    attr_accessor :options = {}
 
     def show_help
       puts "HELP"
@@ -18,24 +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 }
+        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
 
-      parse_input
-      
-      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
 
@@ -45,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			
         
@@ -76,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?)
@@ -125,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cleanfb
 version: !ruby/object:Gem::Version
-  version: 0.2.1.15
+  version: 0.2.1.16
 platform: ruby
 authors:
 - lhoffl