knife-backup 0.0.4 → 0.0.5

data/lib/chef/knife/backup_export.rb

@@ -21,7 +21,6 @@ require 'chef/node'
 require 'chef/api_client'
 require 'chef/knife/cookbook_download'
 
-
 module ServerBackup
   class BackupExport < Chef::Knife
 
@@ -30,7 +29,7 @@ module ServerBackup
       require 'chef/cookbook_loader'
     end
 
-    banner "knife backup export [-D DIR]"
+    banner "knife backup export [COMPONENT [COMPONENT ...]] [-D DIR] (options)"
 
     option :backup_dir,
     :short => "-D DIR",
@@ -45,12 +44,20 @@ module ServerBackup
      :boolean => true
 
     def run
-      clients
-      nodes
-      roles
-      data_bags
-      environments
-      cookbooks
+      validate!
+      components = name_args.empty? ? COMPONENTS.keys : name_args
+      Array(components).each { |component| self.send(component) }
+    end
+
+    private
+    COMPONENTS = %w(clients nodes roles data_bags environments cookbooks)
+
+    def validate!
+      bad_names = name_args - COMPONENTS
+      unless bad_names.empty?
+        ui.error "Component types #{bad_names.join(",")} are not valid."
+        exit 1
+      end
     end
 
     def nodes
@@ -101,7 +108,7 @@ module ServerBackup
     end
 
     def cookbooks
-      ui.msg "Backing up cookboks"
+      ui.msg "Backing up cookbooks"
       dir = File.join(config[:backup_dir], "cookbooks")
       FileUtils.mkdir_p(dir)
       if config[:latest]
@@ -110,7 +117,7 @@ module ServerBackup
         cookbooks = rest.get_rest("/cookbooks?num_versions=all")
       end
       cookbooks.keys.each do |cb|
-        ui.msg "Backing up coookbook #{cb}"
+        ui.msg "Backing up cookbook #{cb}"
         dld = Chef::Knife::CookbookDownload.new
         cookbooks[cb]['versions'].each do |ver|
           dld.name_args = [cb, ver['version']]

data/lib/chef/knife/backup_restore.rb

@@ -34,7 +34,7 @@ module ServerBackup
       require 'chef/api_client'
     end
 
-    banner "knife backup restore [-D DIR]"
+    banner "knife backup restore [COMPONENT [COMPONENT ...]] [-D DIR] (options)"
 
     option :backup_dir,
     :short => "-D DIR",
@@ -46,12 +46,20 @@ module ServerBackup
       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"
-      clients
-      nodes
-      roles
-      data_bags
-      environments
-      cookbooks
+      validate!
+      components = name_args.empty? ? COMPONENTS.keys : name_args
+      Array(components).each { |component| self.send(component) }
+    end
+
+    private
+    COMPONENTS = %w(clients nodes roles data_bags environments cookbooks)
+
+    def validate!
+      bad_names = name_args - COMPONENTS
+      unless bad_names.empty?
+        ui.error "Component types #{bad_names.join(",")} are not valid."
+        exit 1
+      end
     end
 
     def nodes

data/lib/knife-backup/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Backup
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-backup
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef