sahara 0.0.5 → 0.0.8

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    sahara (0.0.5)
+    sahara (0.0.8)
       popen4 (~> 0.1.2)
       thor (~> 0.14.6)
-      vagrant (~> 0.8.1)
+      vagrant (~> 0.8.2)
 
 GEM
   remote: http://rubygems.org/
@@ -23,7 +23,7 @@ GEM
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     thor (0.14.6)
-    vagrant (0.8.1)
+    vagrant (0.8.2)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.7.0)
       i18n (~> 0.5.0)
@@ -31,8 +31,8 @@ GEM
       net-scp (~> 1.0.4)
       net-ssh (~> 2.1.4)
       thor (~> 0.14.6)
-      virtualbox (~> 0.9.0)
-    virtualbox (0.9.0)
+      virtualbox (~> 0.9.1)
+    virtualbox (0.9.1)
       ffi (~> 1.0.9)
 
 PLATFORMS

data/README.md

@@ -1,14 +1,14 @@
 # Description
 
-Sahara allows vagrant to operate in sandbox mode
+Sahara allows vagrant to operate in sandbox mode.
 
 Typical usage:
 
 - Enter sandbox mode: <pre>vagrant sandbox on</pre>
 - Do some stuff: <pre>vagrant ssh </pre>
-- If satisfied apply the changes: <pre>vagrant sandbox commit</pre>
-- If not satisfied you can rollback: <pre>vagrant sandbox rollback</pre>
-- To leave sandbox mod: <pre>vagrant sandbox off</pre>
+- If satisfied, apply the changes permanently: <pre>vagrant sandbox commit</pre>
+- If not satisfied, rollback to the previous commit: <pre>vagrant sandbox rollback</pre>
+- Exit sandbox mode: <pre>vagrant sandbox off</pre>
 
 Many kudos go to the creators of [vagrant](http://vagrantup.com)
 

data/lib/sahara/session.rb

@@ -40,7 +40,7 @@ module Sahara
           #Creating a snapshot
           puts "[#{boxname}] - Enabling sandbox"
 
-          execute("#{@vboxcmd} snapshot '#{instance_name}' take '#{@sandboxname}'")
+          execute("#{@vboxcmd} snapshot '#{instance_name}' take '#{@sandboxname}' --pause")
         end
 
       end
@@ -64,7 +64,7 @@ module Sahara
           #Now retake the snapshot
           puts "[#{boxname}] - fastforwarding sandbox"
 
-          execute("#{@vboxcmd} snapshot '#{instance_name}' take '#{@sandboxname}'")
+          execute("#{@vboxcmd} snapshot '#{instance_name}' take '#{@sandboxname}' --pause")
           
         end
 
@@ -87,6 +87,10 @@ module Sahara
           #Poweroff machine
           execute("#{@vboxcmd} controlvm '#{instance_name}' poweroff")
 
+          #Poweroff takes a second or so to complete; Virtualbox will throw errors
+          #if you try to restore a snapshot before it's ready.
+          sleep 2
+
           puts "[#{boxname}] - roll back machine"
 
           #Rollback until snapshot
@@ -95,8 +99,22 @@ module Sahara
           puts "[#{boxname}] - starting the machine again"
 
           #Startvm again
-          execute("#{@vboxcmd} startvm --type headless '#{instance_name}' ")
-          
+          #
+          # Grab the boot_mode setting from the Vagrantfile
+          config_boot_mode="#{@vagrant_env.config.vm.boot_mode.to_s}"
+
+          case config_boot_mode
+            when 'vrdp'
+              boot_mode='headless'
+            when 'gui'
+              boot_mode='gui'
+            else
+              puts "Vagrantfile config.vm.boot_mode=#{config_boot_mode} setting unknown - defaulting to headless"
+              boot_mode='headless'
+          end
+
+          execute("#{@vboxcmd} startvm --type #{boot_mode} '#{instance_name}' ")
+
         end
 
       end

data/lib/sahara/version.rb

@@ -1,3 +1,3 @@
 module Sahara
-  VERSION = "0.0.5"
+  VERSION = "0.0.8"
 end

data/sahara.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "sahara"
 
-  s.add_dependency "vagrant", "~> 0.8.1"
+  s.add_dependency "vagrant", "~> 0.8.2"
   s.add_dependency "popen4", "~> 0.1.2"
   s.add_dependency "thor", "~> 0.14.6"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sahara
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 +10:00
+date: 2011-11-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 59
         segments: 
         - 0
         - 8
-        - 1
-        version: 0.8.1
+        - 2
+        version: 0.8.2
   type: :runtime
   requirement: *id001
   name: vagrant