mbailey-ruby-xen 0.1.1 → 0.1.2

data/lib/xen/backup.rb

@@ -16,17 +16,14 @@ module Xen
       archive_name="#{name}-#{version}#{backup_file_ext}"
             
       slice = Xen::Slice.find(name) # XXX test for failure
-      if slice.running?
-        slice.stop
-        sleep 10
+      if slice.running?        
+        slice.stop(:blocking => true)
         restart_slice = true
       end
 
       temp_mount = `mktemp -d -p /mnt #{name}-XXXXX`.chomp # XXX test for failure
       `mount #{slice.root_disk.path} #{temp_mount}` # XXX test for failure
       
-      
-
       FileUtils.mkdir_p backup_dir
       
       # Creating archive at backup_dir/archive_name ...
@@ -57,7 +54,7 @@ module Xen
     def self.find(*args)
       # return all
       slice = args.first
-      Dir.glob("#{Xen::BACKUP_DIR}/*-*#{Xen::BACKUP_FILE_EXT}").collect { |file|
+      Dir.glob("#{Xen::BACKUP_DIR}/*-*#{Xen::BACKUP_FILE_EXT}").sort.collect { |file|
         if match = File.basename(file, Xen::BACKUP_FILE_EXT).match(/(#{ slice || '.*' })-(.*)/)
           new(:name => match[1], :version => match[2])
         end

data/lib/xen/command.rb

@@ -74,8 +74,8 @@ module Xen
       `xm create #{config_file}`
     end
   
-    def self.shutdown_instance(name, blocking=false)
-      `xm shutdown #{'-w' if blocking} #{name}`
+    def self.shutdown_instance(name, options={})
+      `xm shutdown #{'-w' if options[:blocking]} #{name}`
     end
   
     # Xen::Command.create_image('memory=512', :size => '10Gb')

data/lib/xen/slice.rb

@@ -105,8 +105,8 @@ module Xen
       @instance = Xen::Instance.find(@name)
     end
   
-    def stop
-      Xen::Instance.shutdown(@name)
+    def stop(options={})
+      Xen::Instance.shutdown(@name, options)
       @instance = Xen::Instance.find(@name)
     end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbailey-ruby-xen
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mike Bailey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency