sahara 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    sahara (0.0.10)
+    sahara (0.0.11)
       popen4 (~> 0.1.2)
       thor (~> 0.14.6)
-      vagrant (~> 0.9)
+      vagrant (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
@@ -27,9 +27,9 @@ GEM
       open4 (>= 0.4.0)
     rake (0.9.2.2)
     thor (0.14.6)
-    vagrant (0.9.5)
+    vagrant (1.0.2)
       archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.0)
+      childprocess (~> 0.3.1)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
       json (~> 1.5.1)

data/README.md

@@ -16,4 +16,12 @@ Many kudos go to the creators of [vagrant](http://vagrantup.com)
 
 This is now available as gem:
 
-<pre>gem install sahara</pre>
+<pre>gem install sahara</pre>
+
+# Windows Notes
+
+It works on Windows, but you need to have:
+
+- Vagrant 1.0.x installed (with patch for [issue#817](https://github.com/mitchellh/vagrant/issues/817))
+- VBoxManage.exe in the PATH <pre>set PATH=C:\Program Files\Oracle\VirtualBox\;%PATH%</pre>
+- grep.exe and cut.exe in the PATH: <pre>set PATH=D:\vagrant\embedded\bin;%PATH%</pre>

data/lib/sahara/session.rb

@@ -40,7 +40,7 @@ module Sahara
           #Creating a snapshot
           puts "[#{boxname}] - Enabling sandbox"
 
-          execute("#{@vboxcmd} snapshot '#{instance_uuid}' take '#{@sandboxname}' --pause")
+          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" take \"#{@sandboxname}\" --pause")
         end
 
       end
@@ -59,12 +59,12 @@ module Sahara
 
           #Discard snapshot so current state is the latest state
           puts "[#{boxname}] - unwinding sandbox"
-          execute("#{@vboxcmd} snapshot '#{instance_uuid}' delete '#{@sandboxname}'")
+          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" delete \"#{@sandboxname}\"")
 
           #Now retake the snapshot
           puts "[#{boxname}] - fastforwarding sandbox"
 
-          execute("#{@vboxcmd} snapshot '#{instance_uuid}' take '#{@sandboxname}' --pause")
+          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" take \"#{@sandboxname}\" --pause")
           
         end
 
@@ -85,7 +85,7 @@ module Sahara
           puts "[#{boxname}] - powering off machine"
 
           #Poweroff machine
-          execute("#{@vboxcmd} controlvm '#{instance_uuid}' poweroff")
+          execute("#{@vboxcmd} controlvm \"#{instance_uuid}\" poweroff")
 
           #Poweroff takes a second or so to complete; Virtualbox will throw errors
           #if you try to restore a snapshot before it's ready.
@@ -94,7 +94,7 @@ module Sahara
           puts "[#{boxname}] - roll back machine"
 
           #Rollback until snapshot
-          execute("#{@vboxcmd} snapshot '#{instance_uuid}' restore '#{@sandboxname}'")
+          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" restore \"#{@sandboxname}\"")
 
           puts "[#{boxname}] - starting the machine again"
 
@@ -115,7 +115,7 @@ module Sahara
               boot_mode='headless'
           end
 
-          execute("#{@vboxcmd} startvm --type #{boot_mode} '#{instance_uuid}' ")
+          execute("#{@vboxcmd} startvm --type #{boot_mode} \"#{instance_uuid}\" ")
 
         end
 
@@ -140,7 +140,7 @@ module Sahara
           # We might wanna check for sandbox changes or not
 
           #Discard snapshot
-          execute("#{@vboxcmd} snapshot '#{instance_uuid}' delete '#{@sandboxname}' ")
+          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" delete \"#{@sandboxname}\" ")
 
         end
 
@@ -166,7 +166,7 @@ module Sahara
 
       instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
       snapshotlist=Array.new
-      snapshotresult=execute("#{@vboxcmd} showvminfo --machinereadable '#{instance_uuid}' |grep ^SnapshotName| cut -d '=' -f 2")
+      snapshotresult=execute("#{@vboxcmd} showvminfo --machinereadable \"#{instance_uuid}\" |grep ^SnapshotName| cut -d '=' -f 2")
       snapshotresult.each do |result|
         clean=result.gsub(/\"/,'').chomp
         snapshotlist << clean

data/lib/sahara/version.rb

@@ -1,3 +1,3 @@
 module Sahara
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 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.9"
+  s.add_dependency "vagrant", "~> 1.0"
   s.add_dependency "popen4", "~> 0.1.2"
   s.add_dependency "thor", "~> 0.14.6"
 
@@ -24,4 +24,3 @@ Gem::Specification.new do |s|
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sahara
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 Z
+date: 2012-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -24,11 +24,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 9
-        version: "0.9"
+        version: "1.0"
   prerelease: false
   name: vagrant
   version_requirements: *id001