sahara 0.0.16 → 0.0.17

data/.gitignore

@@ -7,3 +7,5 @@ Vagrantfile
 Gemfile.lock
 .bundle/
 vendor/
+.idea/
+*.iml

data/lib/sahara/command/commit.rb

@@ -24,6 +24,7 @@ module Sahara
             next
           end
           if ses.is_snapshot_mode_on? then
+            puts "[#{machine.name}] Committing the virtual machine..."
             ses.commit
           else
             puts "[#{machine.name}] Not sandbox mode now"

data/lib/sahara/command/off.rb

@@ -24,6 +24,7 @@ module Sahara
             next
           end
           if ses.is_snapshot_mode_on? then
+            puts "[#{machine.name}] Stopping sandbox mode..."
             ses.off
           else
             puts "[#{machine.name}] Not sandbox mode now"

data/lib/sahara/command/on.rb

@@ -24,6 +24,7 @@ module Sahara
             next
           end
           if !ses.is_snapshot_mode_on? then
+            puts "[#{machine.name}] Starting sandbox mode..."
             ses.on
           else
             puts "[#{machine.name}] Already sandbox mode"

data/lib/sahara/command/rollback.rb

@@ -25,10 +25,10 @@ module Sahara
           end
           if !ses.is_snapshot_mode_on? then
             puts "[#{machine.name}] Not sandbox mode now"
-            next
+          else
+            puts "[#{machine.name}] Rolling back the virtual machine..."
+            ses.rollback
           end
-          ses.rollback
-
         end
       end
     end

data/lib/sahara/command/root.rb

@@ -55,7 +55,7 @@ module Sahara
       # Prints the help out for this command
       def help
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant plugin <command> [<args>]"
+          o.banner = "Usage: vagrant sandbox <command> [<args>]"
           o.separator ""
           o.separator "Available subcommands:"
 
@@ -69,7 +69,7 @@ module Sahara
           end
 
           o.separator ""
-          o.separator "For help on any individual command run `vagrant plugin COMMAND -h`"
+          o.separator "For help on any individual command run `vagrant sandbox <command> -h`"
         end
 
         @env.ui.info(opts.help, :prefix => false)

data/lib/sahara/errors.rb

@@ -29,5 +29,9 @@ module Sahara
       error_key("snapshot_reversion_error")
     end
 
+    class HostOsNotSupported < Sahara::Errors::Error
+      error_key("host_os_not_supported")
+    end
+
   end
 end

data/lib/sahara/session/factory.rb

@@ -11,6 +11,12 @@ module Sahara
         when :libvirt
           require_relative "libvirt"
           Libvirt.new(machine)
+        when :parallels
+          require_relative "parallels"
+          Parallels.new(machine)
+        when :vmware_fusion
+          require_relative "vmware"
+          VMWare.new(machine)
         else
           raise Sahara::Errors::ProviderNotSupported
         end

data/lib/sahara/session/libvirt.rb

@@ -8,7 +8,7 @@ module Sahara
         @machine=machine
         @sandboxname="sahara-sandbox"
         @connection=connect_to_libvirt
-        @domain = @connection.client.lookup_domain_by_uuid(@machine.id)
+        @domain=get_domain
       end
 
       # based on VagrantPlugins::ProviderLibvirt::Action::ConnectLibvirt
@@ -18,6 +18,10 @@ module Sahara
 
         # Setup connection uri.
         uri = config.driver
+        if uri == "kvm"
+          uri = "qemu"
+        end
+
         if config.connect_via_ssh
           uri << '+ssh://'
           if config.username
@@ -53,6 +57,14 @@ module Sahara
         end
       end
 
+      def get_domain
+        if is_vm_created?
+          return @connection.client.lookup_domain_by_uuid(@machine.id)
+        else
+          return nil
+        end
+      end
+
       def get_snapshot_if_exists
         # if we can get snapshot description without exception it exists
         begin

data/lib/sahara/session/parallels.rb

@@ -0,0 +1,70 @@
+module Sahara
+  module Session
+    class Parallels
+
+      def initialize(machine)
+        @machine=machine
+        @instance_id = @machine.id
+        @prlctl="prlctl"
+        @sandboxname="sahara-sandbox"
+        @snapshots=list_snapshots
+      end
+
+      def list_snapshots
+        snapshotlist = Hash.new
+        output = `#{@prlctl} snapshot-list "#{@instance_id}" --tree`
+        snapshot_ids=output.scan(/\{([\w-]*)?\}/).flatten
+        snapshot_ids.each do |id|
+          res = `#{@prlctl} snapshot-list "#{@instance_id}" -i "#{id}"`
+          if res =~ (/^Name:\s(.*)$/)
+            snapshotlist[$1] = id
+          end
+        end
+        snapshotlist
+      end
+
+      def get_snapshot_id
+        # if we can get snapshot description without exception it exists
+        begin
+          snapshot_id = @snapshots.fetch(@sandboxname)
+        rescue
+          raise Sahara::Errors::SnapshotMissing
+        end
+        return snapshot_id
+      end
+
+      def is_snapshot_mode_on?
+        begin
+          snapshot_id = get_snapshot_id
+        rescue Sahara::Errors::SnapshotMissing
+          return false
+        end
+        return true
+      end
+
+      def off
+        snapshot_id = get_snapshot_id
+        `#{@prlctl} snapshot-delete "#{@instance_id}" --id "#{snapshot_id}" `
+      end
+
+      def on
+        `#{@prlctl} snapshot "#{@instance_id}" --name "#{@sandboxname}"`
+      end
+
+      def commit
+        off
+        on
+      end
+
+      def rollback
+        snapshot_id = get_snapshot_id
+        `#{@prlctl} snapshot-switch "#{@instance_id}" --id "#{snapshot_id}" `
+      end
+
+      def is_vm_created?
+        return !@machine.id.nil?
+      end
+
+    end
+  end
+end

data/lib/sahara/session/virtualbox.rb

@@ -11,10 +11,11 @@ module Sahara
 
       def determine_vboxcmd
         if windows?
-          # On Windows, we use the VBOX_INSTALL_PATH environmental
-          if ENV.has_key?("VBOX_INSTALL_PATH")
+          # On Windows, we use the VBOX_INSTALL_PATH and VBOX_MSI_INSTALL_PATH environmental
+          if ENV.has_key?("VBOX_INSTALL_PATH") || ENV.has_key?("VBOX_MSI_INSTALL_PATH")
             # The path usually ends with a \ but we make sure here
-            path = File.join(ENV["VBOX_INSTALL_PATH"], "VBoxManage.exe")
+            path = ENV["VBOX_INSTALL_PATH"] || ENV["VBOX_MSI_INSTALL_PATH"]
+            path = File.join(path, "VBoxManage.exe")
             return "\"#{path}\""
           end
         else

data/lib/sahara/session/vmware.rb

@@ -0,0 +1,58 @@
+module Sahara
+  module Session
+    class VMWare
+
+      def initialize(machine)
+        @machine=machine
+        @vmx_path=@machine.provider.driver.vmx_path
+        @vmwarecmd=@machine.provider.driver.instance_variable_get(:@vmrun_path).to_s.gsub(" ", "\\ ")
+        @sandboxname="sahara-sandbox"
+        if @machine.provider.driver.class.to_s != "HashiCorp::VagrantVMwarefusion::Driver::Fusion"
+          raise Sahara::Errors::ProviderNotSupported
+        end
+      end
+
+      def list_snapshots
+        output = `#{@vmwarecmd} listSnapshots "#{@vmx_path}"`
+        output.rstrip.split(/\r?\n/).map {|line| line.chomp }
+      end
+
+      def is_snapshot_mode_on?
+        snapshots=self.list_snapshots
+        return snapshots.include?(@sandboxname)
+      end
+
+      def off
+        `#{@vmwarecmd} -T ws deleteSnapshot "#{@vmx_path}" "#{@sandboxname}"`
+      end
+
+      def on
+        `#{@vmwarecmd} -T ws snapshot "#{@vmx_path}" "#{@sandboxname}"`
+      end
+
+      def commit
+        `#{@vmwarecmd} -T ws deleteSnapshot "#{@vmx_path}" "#{@sandboxname}"`
+        `#{@vmwarecmd} -T ws snapshot "#{@vmx_path}" "#{@sandboxname}"`
+      end
+
+      def rollback
+        `#{@vmwarecmd} -T ws revertToSnapshot "#{@vmx_path}" "#{@sandboxname}" `
+        sleep 2
+
+        gui_boot = @machine.provider_config.gui
+        if gui_boot
+          boot_mode = "gui"
+        else
+          boot_mode = "nogui"
+        end
+        # restore boot mode
+        `#{@vmwarecmd} -T ws start "#{@vmx_path}" #{boot_mode} `
+      end
+
+      def is_vm_created?
+        return !@machine.id.nil?
+      end
+
+    end
+  end
+end

data/lib/sahara/version.rb

@@ -1,3 +1,3 @@
 module Sahara
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/sahara.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "sahara"
 
   s.add_dependency "popen4", "~> 0.1.2"
-  s.add_dependency "thor", "> 0.14"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sahara
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: popen4
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +64,9 @@ files:
 - lib/sahara/errors.rb
 - lib/sahara/session/factory.rb
 - lib/sahara/session/libvirt.rb
+- lib/sahara/session/parallels.rb
 - lib/sahara/session/virtualbox.rb
+- lib/sahara/session/vmware.rb
 - lib/sahara/version.rb
 - locales/en.yml
 - sahara.gemspec
@@ -98,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2734223008788270957
+      hash: 55792310888730998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: