knife-backup 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918be2fa6d1491b4927ecf0da398fbe091996932
-  data.tar.gz: d5020e9bee1536d0972bcaa54237705d4d352c72
+  metadata.gz: e3b74fdf9a67ae00a32a68e1b37201dd7d27e318
+  data.tar.gz: 0cfa2a717cc5223e068424beab952813c250805a
 SHA512:
-  metadata.gz: 85dad02bd0ec4235da0f74814a1397083aaca2c63647862c7c1610e77908208e52998c5694d9488b9ae5b55c709a52565805833b9786c3f65d19f4ab10d19474
-  data.tar.gz: f15c5518f7844177800a3dc27b0c7e377ec06df850a969da78391dce7b4d557f3077294b456ddd483283020b0af45ae06901f7596737ca56150dc78d523db148
+  metadata.gz: 766023ac2102bc799dd8eb27af1bf53b3175ecb601007722411ca2ff88609c463ea390adf0f2df22a89e262e88699fc1e7ac9a99824a1e83ccadee8811548ef9
+  data.tar.gz: 2bd111ebe9cb9a58526293976d30a33ad92ca915ae69c7adbd164d9bb085fa49e13876945dafbbcbd4f406983263345cfd05a72585d0135396e4a31832dc2ae7

data/.gitignore

@@ -1,4 +1,6 @@
 *.gem
 .bundle
+.chef
 Gemfile.lock
 pkg/*
+bin/

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in knife-backup.gemspec
 gemspec

data/README.md

@@ -4,7 +4,7 @@ Knife-Backup
 Knife-Backup is a [Knife](http://wiki.opscode.com/display/chef/Knife) plugin that can help you backup and restore a chef server. It is based on the great work of [Steven Danna][stevendanna] and [Joshua Timberman][jtimberman] on the [BackupExport][backup_export] and [BackupRestore][backup_restore] plugins. Currently knife-backup has support for the following objects:
 
   * clients
-  * users (chef >= 11)
+  * users (chef 11 - Open Source)
   * nodes
   * roles
   * environments
@@ -41,6 +41,11 @@ knife backup export cookbooks roles environments -D ~/my_chef_backup
 - `-N`, `--latest` only download the latest version of a cookbook
 - `-I`, `--ignore-permissions` ignore any permission errors during export
 
+#### Optional Switches for restore
+
+- `-I`, `--ignore-metadata-errors` Ignore json metadata errors when restoring cookbooks
+
+
 For more information on commands:
 
 ```bash

data/lib/chef/knife/backup_export.rb

@@ -19,7 +19,8 @@
 
 require 'chef/node'
 require 'chef/api_client'
-if Chef::VERSION =~ /^1[1-9]\./
+
+if Chef::VERSION =~ /^11\./
   require 'chef/user'
 end
 require 'chef/knife/cookbook_download'
@@ -79,10 +80,10 @@ module ServerBackup
     end
 
     def users
-      if Chef::VERSION =~ /^1[1-9]\./
+      if Chef::VERSION =~ /^1[1]\./
         backup_standard("users", Chef::User)
       else
-        ui.warn "users export only supported on chef >= 11"
+        ui.warn "users export only supported on chef == 11"
       end
     end
 
@@ -117,7 +118,7 @@ module ServerBackup
       klass.list.each do |component_name, url|
         next if component == "environments" && component_name == "_default"
         ui.msg "Backing up #{component} #{component_name}"
-        component_obj = load_object(klass, component_name)
+        component_obj = load_object(klass, component_name).to_hash
         unless component_obj
           ui.error "Could not load #{klass} #{component_name}."
           next

data/lib/chef/knife/backup_restore.rb

@@ -44,6 +44,13 @@ module ServerBackup
       :description => "Restore backup data from DIR.",
       :default => Chef::Config[:knife][:chef_server_backup_dir] ? Chef::Config[:knife][:chef_server_backup_dir] : File.join(".chef", "chef_server_backup")
 
+    option :ignore_metadata_errors,
+      :short => "-I",
+      :long => "--ignore-metadata-errors",
+      :description => "Ignore json metadata errors when restoring cookbooks",
+      :boolean => true,
+      :default => Chef::Config[:knife][:ignore_metadata_errors] ? Chef::Config[:knife][:ignore_metadata_errors] : false
+
     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
@@ -118,6 +125,7 @@ module ServerBackup
       ui.info "=== Restoring clients ==="
       clients = Dir.glob(File.join(config[:backup_dir], "clients", "*.json"))
       clients.each do |file|
+        ui.info "Restoring clients from #{file}"
         client = JSON.parse(IO.read(file))
         begin
           rest.post_rest("clients", {
@@ -136,8 +144,8 @@ module ServerBackup
       JSON.create_id = "no_thanks"
       ui.info "=== Restoring users ==="
       users = Dir.glob(File.join(config[:backup_dir], "users", "*.json"))
-      if !users.empty? and Chef::VERSION !~ /^1[1-9]\./
-        ui.warn "users restore only supported on chef >= 11"
+      if !users.empty? and Chef::VERSION !~ /^11\./
+        ui.warn "users restore only supported on chef == 11"
         return
       end
       users.each do |file|
@@ -158,18 +166,28 @@ module ServerBackup
     end
 
     def cookbooks
+      count = 0
       ui.info "=== Restoring cookbooks ==="
       cookbooks = Dir.glob(File.join(config[:backup_dir], "cookbooks", '*'))
       #Make tmp dir
-       cookbooks.each do |cb|
-        FileUtils.rm_rf(config[:backup_dir] + "/tmp")
-        Dir.mkdir config[:backup_dir] + "/tmp"
+      FileUtils.rm_rf(config[:backup_dir] + "/tmp")
+      Dir.mkdir config[:backup_dir] + "/tmp"
+      cookbooks.each do |cb|
         full_cb = File.expand_path(cb)
         cb_name = File.basename(cb)
         cookbook = cb_name.reverse.split('-',2).last.reverse
-        full_path = File.join(config[:backup_dir] + "/tmp", cookbook) 
+        full_path = File.join(config[:backup_dir] + "/tmp", cookbook)
         begin
-          File.symlink(full_cb, full_path)
+          count += 1
+          if Chef::Platform.windows?
+            Dir.mkdir config[:backup_dir] + "/tmp/#{cb_name}"
+            full_path = File.join(config[:backup_dir] + "/tmp/#{cb_name}", cookbook)
+            ui.info "Copy cookbook #{full_cb} to #{full_path}"
+            FileUtils.copy_entry(full_cb, full_path)
+          else
+            full_path = File.join(config[:backup_dir] + "/tmp", cookbook)
+            File.symlink(full_cb, full_path)
+          end
           cbu = Chef::Knife::CookbookUpload.new
           Chef::Knife::CookbookUpload.load_deps
           cbu.name_args = [ cookbook ]
@@ -178,15 +196,27 @@ module ServerBackup
           cbu.run
         rescue Net::HTTPServerException => e
           handle_error 'cookbook', cb_name, e
+        rescue Chef::Exceptions::JSON::ParseError => e
+          handle_error 'cookbook', cb_name, e
+          throw e unless config[:ignore_metadata_errors]
         ensure
-          File.unlink(full_path)
+          if Chef::Platform.windows?
+            rm_path = config[:backup_dir] + "/tmp/#{cb_name}"
+            ui.info "remove dir #{rm_path}"
+            FileUtils.remove_dir(rm_path, force = true)
+          else
+            File.unlink(full_path)
+          end
         end
-        FileUtils.rm_rf(config[:backup_dir] + "/tmp")
       end
+      ui.info "Uploaded #{count} Cookbooks"
+      FileUtils.rm_rf(config[:backup_dir] + "/tmp")
     end
 
     def handle_error(type, name, error)
       thing = "#{type}[#{name}]"
+      return ui.error "Error parsing JSON for: #{thing}" if error.kind_of?(Chef::Exceptions::JSON::ParseError)
+
       case error.response
       when Net::HTTPConflict # 409
         ui.warn "#{thing} already exists; skipping"

data/lib/knife-backup/version.rb

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

metadata

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