cleanfb 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79a36f8652d6c3fe451a210e1f6bc781ab84d423
-  data.tar.gz: 4646a52dc67635c7327afd07ed639629a088c301
+  metadata.gz: 8ef2158d35dc60f9b8f6ed22c40137b3b5e36148
+  data.tar.gz: 9aea77568b33d0a77b3346dadfa8166c6f75a488
 SHA512:
-  metadata.gz: 6a0bdfe6b1fca8d4a7911c13c8c51a421313fcebd903e9f280f96daeb25a2c087ae83bc05a937f2b6b3a1f44b98e389f127a42bd97990a67cfaa669cf4778616
-  data.tar.gz: 8e0e615da5d19602a2296985c60e2ed533df00f13fa2c57948722ffb4d47155337ea001025bd9956beabc35f4a5868e4ba3075622454407c2fa34e54267e9e54
+  metadata.gz: dae0ebb759c5774cf7d6ac47c4b9320f1684060827e0124c74978f32dd6409825ff3dffc99fcce0ee6111efa9bef3714aa5a409fe51ef16ac7ca5d43ff2539ab
+  data.tar.gz: 8bd6c70e60fbf465e48fec0612d9c46083909195ea2872519f4e2790c0baf4961b756c4a89acc5aed6a60e37c7300ac18fac4ba9bc703a91cb24cb9c293300ac

data/README.md

@@ -6,7 +6,6 @@ This tool is intended to be used alongside a Ruby script, capture_config, that c
 If a configuration is removed from the Puppet node, a new copy is automatically retrieved from the Puppet server's filebucket.
 
 Cleanfb allows out of date configurations to be backed up on the server and for the Puppet node to capture a current configuration.
-
 Old configurations can also be restored using cleanfb.
 
 ## Installation
@@ -15,39 +14,29 @@ Old configurations can also be restored using cleanfb.
 
 ## Usage
 
-cleanfb [host] [options]
+cleanfb [options]
 
     Backup all files associated with the host on the server's filebucket.
-    -y      | answer yes to all
-    --help  | show help message
-
-cleanfb restore [file] [options]
-
-    Backup all files associated with the host on the server's filebucket, 
-    and restore the given configuration file.
-    -y      | answer yes to all
-    --help  | show help message
+    -f, --force        | answer yes to all
+    -h, --help         | show help message
+    -n, --name=NAME    | the hostname to backup
+    -r, --restore=NAME | the file to restore
 
 ## Updating Configuration
 
 Clean the configuration for a host
 
-    $ cleanfb hostname
+    $ cleanfb --name=hostname -f
 
 The configuration is now backed up on the server at /root/saved_configs/hostname/date_time_hostname_configuration.json
-
 A new configuration will be obtained for the host on the next Puppet run.
 
-
 ## Restoring a previous Configuration
 
 
 To restore a previous saved configuration issue the following command
 
-    $ cleanfb restore /root/saved_configs/hostname/date_time_host_configuration.json
-
+    $ cleanfb restore --restore=/root/saved_configs/hostname/date_time_host_configuration.json
 
 The current configuration gets backed up and the selected configuration is restored as the primary configuration.
-
 The restored configuration will be obtained by the host from the server on the next Puppet run.
-

data/exe/cleanfb

@@ -9,11 +9,7 @@ end
 cleaner = Cleanfb::Clean.new
 cleaner.parse_input
 
-unless ARGV.include? "restore"
-  response = cleaner.remove
-else
-  response = cleaner.restore
-end
+response = cleaner.run
 
 unless response.nil? || response.empty? || (response.include? "Please")
   puts response.magenta

data/lib/cleanfb/version.rb

@@ -1,3 +1,3 @@
 module Cleanfb
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/cleanfb.rb

@@ -10,6 +10,16 @@ module Cleanfb
     @hostname = ""
     @restore = ""
 
+    def run
+      if restore == ""
+        remove
+      elsif restore != ""
+        restore
+      else
+        puts "Invalid input. See cleanfb --help for usage"
+      end
+    end
+
     def parse_input
       OptionParser.new do |opts|
         opts.banner = "Usage: cleanfb [options]..."
@@ -45,17 +55,12 @@ module Cleanfb
             print "Matched multiple hosts. Remove all? (y|n): "
             ans = STDIN.gets.chomp
                 
-            return "Ending run"	unless (@force || ans =~/^y/)
+            return unless (@force || ans =~/^y/)
           end
         end			
         
         (backup cmd) unless (cmd.nil? || cmd.empty?)
-      
-      else
-        puts "No file #{@hostname} found."
       end
-      
-      return 
     end
    
     def backup cmd 
@@ -104,10 +109,8 @@ module Cleanfb
         puts  "puppet filebucket -l backup #{file}"
         cmd = `puppet filebucket -l backup #{file}`
       else
-        puts "No file #{@restore} found."
+        puts "No file #{@restore} found to restore."
       end
-     
-      return
     end
     
   end	

metadata

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