sahara 0.0.9 → 0.0.10

data/Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
 gem "sahara", :path => "."
-
+gem "rake"
 #gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sahara (0.0.9)
+    sahara (0.0.10)
       popen4 (~> 0.1.2)
       thor (~> 0.14.6)
       vagrant (~> 0.9)
@@ -25,6 +25,7 @@ GEM
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
+    rake (0.9.2.2)
     thor (0.14.6)
     vagrant (0.9.5)
       archive-tar-minitar (= 0.5.2)
@@ -40,4 +41,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
   sahara!

data/lib/sahara/session.rb

@@ -35,12 +35,12 @@ module Sahara
         if is_snapshot_mode_on?(boxname)
           puts "[#{boxname}] - snapshot mode is already on"
         else
-          instance_name="#{@vagrant_env.vms[boxname.to_sym].vm.name}"
+          instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
 
           #Creating a snapshot
           puts "[#{boxname}] - Enabling sandbox"
 
-          execute("#{@vboxcmd} snapshot '#{instance_name}' take '#{@sandboxname}' --pause")
+          execute("#{@vboxcmd} snapshot '#{instance_uuid}' take '#{@sandboxname}' --pause")
         end
 
       end
@@ -55,16 +55,16 @@ module Sahara
         if !is_snapshot_mode_on?(boxname)
           puts "[#{boxname}] - this requires that sandbox mode is on."
         else
-          instance_name="#{@vagrant_env.vms[boxname.to_sym].vm.name}"
+          instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
 
           #Discard snapshot so current state is the latest state
           puts "[#{boxname}] - unwinding sandbox"
-          execute("#{@vboxcmd} snapshot '#{instance_name}' delete '#{@sandboxname}'")
+          execute("#{@vboxcmd} snapshot '#{instance_uuid}' delete '#{@sandboxname}'")
 
           #Now retake the snapshot
           puts "[#{boxname}] - fastforwarding sandbox"
 
-          execute("#{@vboxcmd} snapshot '#{instance_name}' take '#{@sandboxname}' --pause")
+          execute("#{@vboxcmd} snapshot '#{instance_uuid}' take '#{@sandboxname}' --pause")
           
         end
 
@@ -80,12 +80,12 @@ module Sahara
         if !is_snapshot_mode_on?(boxname)
           puts "[#{boxname}] - this requires that sandbox mode is on."
         else
-          instance_name="#{@vagrant_env.vms[boxname.to_sym].vm.name}"
+          instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
 
           puts "[#{boxname}] - powering off machine"
 
           #Poweroff machine
-          execute("#{@vboxcmd} controlvm '#{instance_name}' 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,18 +94,20 @@ module Sahara
           puts "[#{boxname}] - roll back machine"
 
           #Rollback until snapshot
-          execute("#{@vboxcmd} snapshot '#{instance_name}' restore '#{@sandboxname}'")
+          execute("#{@vboxcmd} snapshot '#{instance_uuid}' restore '#{@sandboxname}'")
 
           puts "[#{boxname}] - starting the machine again"
 
           #Startvm again
           #
           # Grab the boot_mode setting from the Vagrantfile
-          config_boot_mode="#{@vagrant_env.config.vm.boot_mode.to_s}"
+          config_boot_mode="#{@vagrant_env.vms[boxname.to_sym].config.vm.boot_mode.to_s}"
 
           case config_boot_mode
             when 'vrdp'
               boot_mode='headless'
+            when 'headless'
+              boot_mode='headless'
             when 'gui'
               boot_mode='gui'
             else
@@ -113,7 +115,7 @@ module Sahara
               boot_mode='headless'
           end
 
-          execute("#{@vboxcmd} startvm --type #{boot_mode} '#{instance_name}' ")
+          execute("#{@vboxcmd} startvm --type #{boot_mode} '#{instance_uuid}' ")
 
         end
 
@@ -128,7 +130,7 @@ module Sahara
       on_selected_vms(selection) do |boxname|
 
 
-        instance_name="#{@vagrant_env.vms[boxname.to_sym].vm.name}"
+        instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
 
         if !is_snapshot_mode_on?(boxname)
           puts "[#{boxname}] - this requires that sandbox mode is on."
@@ -138,7 +140,7 @@ module Sahara
           # We might wanna check for sandbox changes or not
 
           #Discard snapshot
-          execute("#{@vboxcmd} snapshot '#{instance_name}' delete '#{@sandboxname}' ")
+          execute("#{@vboxcmd} snapshot '#{instance_uuid}' delete '#{@sandboxname}' ")
 
         end
 
@@ -152,14 +154,19 @@ module Sahara
     end
 
     def self.is_vm_created?(boxname)
-      return !@vagrant_env.vms[boxname.to_sym].vm.nil?
+      if @vagrant_env.vms[boxname.to_sym].nil?
+        puts "[#{boxname}] - Box name doesn't exist in the Vagrantfile"
+        return false
+      else
+        return !@vagrant_env.vms[boxname.to_sym].uuid.nil?
+      end
     end
 
     def self.list_snapshots(boxname)
 
-      instance_name="#{@vagrant_env.vms[boxname.to_sym].vm.name}"
+      instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
       snapshotlist=Array.new
-      snapshotresult=execute("#{@vboxcmd} showvminfo --machinereadable '#{instance_name}' |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.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sahara
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime