knife-backup 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36390e9342000ad1b041f6ce2070558bff7abccb
-  data.tar.gz: 0056c9f916c433aeb1f22522d833ab853fbf7f97
+  metadata.gz: 918be2fa6d1491b4927ecf0da398fbe091996932
+  data.tar.gz: d5020e9bee1536d0972bcaa54237705d4d352c72
 SHA512:
-  metadata.gz: 2c2b968a7742955e20f09609964be820a796db2bfda9753dca9b68d1b897449389b5568c753f00134e2a0771762ec5749a7b1e108679dec604ea8041174cff19
-  data.tar.gz: 02951b27f37b7a24aa1a3a0723fae58dda4bb393c2b0110e29a26653b5b01293dde45a99590d18a931a5d9ad92d0eda705ad43faad4049d0aadb1f2c13b901e5
+  metadata.gz: 85dad02bd0ec4235da0f74814a1397083aaca2c63647862c7c1610e77908208e52998c5694d9488b9ae5b55c709a52565805833b9786c3f65d19f4ab10d19474
+  data.tar.gz: f15c5518f7844177800a3dc27b0c7e377ec06df850a969da78391dce7b4d557f3077294b456ddd483283020b0af45ae06901f7596737ca56150dc78d523db148

data/README.md

@@ -15,7 +15,7 @@ knife-backup will backup all cookbook versions available on the chef server. Coo
 
 Users are a bit tricky, knife-backup can't gather the crypted passwords via the chef server so it's forced to reset them to a random string on restore. Be sure to copy them from the restore output or reset them.
 
-*Known limitation*: currently it is not possible to overwritte a client object already available on the target server and these will be skipped. 
+*Known limitation*: currently it is not possible to overwrite a client object already available on the target server and these will be skipped.
 
 ## Installation
 
@@ -27,26 +27,30 @@ gem install knife-backup
 
 ## Usage
 
-For a list of commands:
-
-```bash
-knife backup --help
-```
-
 Currently the available commands are:
 
 ```bash
-knife backup export [component component ...] [-D DIR]
+knife backup export [component component ...] [-D DIR] [options]
 knife backup restore [component component ...] [-D DIR]
 
 #Example:
 knife backup export cookbooks roles environments -D ~/my_chef_backup
 ```
+#### Optional Switches for export
+
+- `-N`, `--latest` only download the latest version of a cookbook
+- `-I`, `--ignore-permissions` ignore any permission errors during export
+
+For more information on commands:
+
+```bash
+knife backup SUB-COMMAND --help
+```
 
 Note: you should treat this as beta software; I'm using it with success for my needs and hopefully you will find it useful too.
 
 ## Todo/Ideas
-  
+
   * Timestamp for the backup folder
   * Track the failed downloads and report them at the end
   * Find out if there is a way to overwrite a client object.

data/lib/chef/knife/backup_export.rb

@@ -46,6 +46,12 @@ module ServerBackup
       :description => "The version of the cookbook to download",
       :boolean => true
 
+    option :ignore_perm,
+      :short => "-I",
+      :long => "--ignore-permissions",
+      :description => "Continue in case a permission problem occurs",
+      :boolean => true
+
     def run
       validate!
       components = name_args.empty? ? COMPONENTS : name_args
@@ -72,7 +78,7 @@ module ServerBackup
       backup_standard("clients", Chef::ApiClient)
     end
 
-    def users 
+    def users
       if Chef::VERSION =~ /^1[1-9]\./
         backup_standard("users", Chef::User)
       else
@@ -130,6 +136,13 @@ module ServerBackup
         try += 1
         load_object(klass, name, try)
       end
+    rescue Net::HTTPServerException => e
+      if config[:ignore_perm]
+        ui.warn "Problem loading #{name} #{e.message}."
+        ui.warn "Possibly an issue with permissions on the chef server... Skipping"
+      else
+        raise
+      end
     end
 
     def cookbooks

data/lib/chef/knife/backup_restore.rb

@@ -47,7 +47,7 @@ module ServerBackup
     def run
       ui.warn "This will overwrite existing data!"
       ui.warn "Backup is at least 1 day old" if (Time.now - File.atime(config[:backup_dir])) > 86400
-      ui.confirm "Do you want to restore backup, possibly overwriting exisitng data"
+      ui.confirm "Do you want to restore backup, possibly overwriting existing data"
       validate!
       components = name_args.empty? ? COMPONENTS : name_args
       Array(components).each { |component| self.send(component) }
@@ -123,7 +123,8 @@ module ServerBackup
           rest.post_rest("clients", {
             :name => client['name'],
             :public_key => client['public_key'],
-            :admin => client['admin']
+            :admin => client['admin'],
+            :validator => client['validator']
           })
         rescue Net::HTTPServerException => e
           handle_error 'client', client['name'], e
@@ -159,12 +160,14 @@ module ServerBackup
     def cookbooks
       ui.info "=== Restoring cookbooks ==="
       cookbooks = Dir.glob(File.join(config[:backup_dir], "cookbooks", '*'))
-      cookbooks.each do |cb|
+      #Make tmp dir
+       cookbooks.each do |cb|
+        FileUtils.rm_rf(config[:backup_dir] + "/tmp")
+        Dir.mkdir config[:backup_dir] + "/tmp"
         full_cb = File.expand_path(cb)
         cb_name = File.basename(cb)
         cookbook = cb_name.reverse.split('-',2).last.reverse
-        full_path = File.join(File.dirname(full_cb), cookbook)
-
+        full_path = File.join(config[:backup_dir] + "/tmp", cookbook) 
         begin
           File.symlink(full_cb, full_path)
           cbu = Chef::Knife::CookbookUpload.new
@@ -178,6 +181,7 @@ module ServerBackup
         ensure
           File.unlink(full_path)
         end
+        FileUtils.rm_rf(config[:backup_dir] + "/tmp")
       end
     end
 

data/lib/knife-backup/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Backup
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-backup
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Marius Ducea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -61,8 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: knife-backup
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Chef knife plugins to help backup and restore chef servers
 test_files: []
+has_rdoc: