sahara 0.0.12 → 0.0.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sahara (0.0.12)
+    sahara (0.0.13)
       popen4 (~> 0.1.2)
       thor (> 0.14)
       vagrant (~> 1.0)

data/README.md

@@ -20,8 +20,4 @@ This is now available as gem:
 
 # 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>
+It works on Windows with Vagrant 1.0.x installed (with patch for [issue#817](https://github.com/mitchellh/vagrant/issues/817))

data/lib/sahara/session.rb

@@ -6,7 +6,24 @@ module Sahara
   module Session
 
     def self.determine_vboxcmd
-      return "VBoxManage"
+      if windows?
+        # On Windows, we use the VBOX_INSTALL_PATH environmental
+        if ENV.has_key?("VBOX_INSTALL_PATH")
+          # The path usually ends with a \ but we make sure here
+          path = File.join(ENV["VBOX_INSTALL_PATH"], "VBoxManage.exe")
+          return "\"#{path}\""
+        end
+      else
+        # for other platforms assume it is on the PATH
+        return "VBoxManage"
+      end
+    end
+
+    def self.windows?
+      %W[mingw mswin].each do |text|
+        return true if RbConfig::CONFIG["host_os"].downcase.include?(text)
+      end
+      false
     end
 
     def self.initialize
@@ -65,7 +82,7 @@ module Sahara
           puts "[#{boxname}] - fastforwarding sandbox"
 
           execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" take \"#{@sandboxname}\" --pause")
-          
+
         end
 
       end
@@ -104,15 +121,15 @@ module Sahara
           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
-              puts "Vagrantfile config.vm.boot_mode=#{config_boot_mode} setting unknown - defaulting to headless"
-              boot_mode='headless'
+          when 'vrdp'
+            boot_mode='headless'
+          when 'headless'
+            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_uuid}\" ")
@@ -166,7 +183,8 @@ 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")
+      output=execute("#{@vboxcmd} showvminfo --machinereadable \"#{instance_uuid}\"").join
+      snapshotresult=output.scan(/SnapshotName.*=(.*)/).flatten
       snapshotresult.each do |result|
         clean=result.gsub(/\"/,'').chomp
         snapshotlist << clean
@@ -180,24 +198,24 @@ module Sahara
     end
 
     def self.on_selected_vms(selection,&block)
-      
+
       if selection.nil?
         #puts "no selection was done"
         @vagrant_env.vms.each do |name,vm|
           #puts "Processing #{name}"
           if @vagrant_env.multivm?
             if name.to_s!="default"
-            if is_vm_created?(name)
-              yield name
-            else
-              puts "[#{name}] - machine needs to be upped first"
+              if is_vm_created?(name)
+                yield name
+              else
+                puts "[#{name}] - machine not created"
+              end
             end
-          end
           else
             if is_vm_created?(name)
               yield name
             else
-              puts "[#{name}] - machine needs to be upped first"
+              puts "[#{name}] - machine not created"
             end
           end
         end
@@ -205,7 +223,7 @@ module Sahara
         if is_vm_created?(selection)
           yield selection
         else
-          puts "[#{selection}] - machine needs to be upped first"
+          puts "[#{selection}] - machine not created"
         end
       end
     end

data/lib/sahara/version.rb

@@ -1,3 +1,3 @@
 module Sahara
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sahara
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-27 00:00:00 Z
+date: 2012-08-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime