sahara 0.0.13 → 0.0.15

data/.gitignore

@@ -4,3 +4,4 @@ pkg/*
 tmp/*
 .vagrant
 Vagrantfile
+Gemfile.lock

data/Gemfile

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

data/README.md

@@ -1,3 +1,9 @@
+# Notice
+
+- Sahara does not work with Vagrant 1.0 or lower.
+- If you want to install an old version for Vagrant 1.0, you have to run the command like "gem install sahara -v 0.0.13"
+- But I strongly recommend you to upgrade your Vagrant to latest version.
+
 # Description
 
 Sahara allows vagrant to operate in sandbox mode.
@@ -14,10 +20,17 @@ Many kudos go to the creators of [vagrant](http://vagrantup.com)
 
 # Installation
 
-This is now available as gem:
+From source:
+<pre>
+bundle install
+rake build
+vagrant plugin install pkg/sahara-0.0.xx.gem
+</pre>
 
-<pre>gem install sahara</pre>
-
-# Windows Notes
+This is now available as gem:
+<pre>
+vagrant plugin install sahara
+</pre>
 
-It works on Windows with Vagrant 1.0.x installed (with patch for [issue#817](https://github.com/mitchellh/vagrant/issues/817))
+# License
+This is licensed under the MIT license.

data/lib/sahara.rb

@@ -1 +1,19 @@
-require 'vagrant'
+# -*- encoding: utf-8 -*-
+# vim: set fileencoding=utf-8
+
+require "vagrant"
+require File.expand_path("../sahara/session", __FILE__)
+
+module Sahara 
+  class Plugin < Vagrant.plugin("2")
+    name "sahara"
+    description <<-DESC
+    Sahara
+    DESC
+
+    command("sandbox") do
+      require File.expand_path("../sahara/command/root", __FILE__)
+      Command::Root
+    end
+  end
+end

data/lib/sahara/command/commit.rb

@@ -1,6 +1,6 @@
 module Sahara
   module Command
-    class Commit < ::Vagrant::Command::Base
+    class Commit < Vagrant.plugin("2", :command)
       def execute
 
         options = {}
@@ -16,9 +16,10 @@ module Sahara
         argv = parse_options(opts)
         return if !argv
 
-        boxname=argv[0]
-        begin
-          Sahara::Session.commit(boxname)
+        ses = Sahara::Session::Command.new(@app, @env)
+
+        with_target_vms(argv, :reverse => true) do |machine|
+          ses.commit(machine)
         end
       end
     end

data/lib/sahara/command/off.rb

@@ -1,6 +1,6 @@
 module Sahara
   module Command
-    class Off < ::Vagrant::Command::Base
+    class Off < Vagrant.plugin("2", :command)
       def execute
 
         options = {}
@@ -16,9 +16,10 @@ module Sahara
         argv = parse_options(opts)
         return if !argv
 
-        boxname=argv[0]
-        begin
-          Sahara::Session.off(boxname)
+        ses = Sahara::Session::Command.new(@app, @env)
+
+        with_target_vms(argv, :reverse => true) do |machine|
+          ses.off(machine)
         end
       end
     end

data/lib/sahara/command/on.rb

@@ -1,6 +1,8 @@
+require "optparse"
+
 module Sahara
   module Command
-    class On < ::Vagrant::Command::Base
+    class On < Vagrant.plugin("2", :command)
       def execute
 
         options = {}
@@ -16,9 +18,10 @@ module Sahara
         argv = parse_options(opts)
         return if !argv
 
-        boxname=argv[0]
-        begin
-          Sahara::Session.on(boxname)
+        ses = Sahara::Session::Command.new(@app, @env)
+
+        with_target_vms(argv, :reverse => true) do |machine|
+           ses.on(machine)
         end
       end
     end

data/lib/sahara/command/rollback.rb

@@ -1,6 +1,6 @@
 module Sahara
   module Command
-    class Rollback < ::Vagrant::Command::Base
+    class Rollback < Vagrant.plugin("2", :command)
       def execute
 
         options = {}
@@ -16,9 +16,10 @@ module Sahara
         argv = parse_options(opts)
         return if !argv
 
-        boxname=argv[0]
-        begin
-          Sahara::Session.rollback(boxname)
+        ses = Sahara::Session::Command.new(@app, @env)
+
+        with_target_vms(argv, :reverse => true) do |machine|
+          ses.rollback(machine)
         end
       end
     end

data/lib/sahara/command/{sandbox.rb → root.rb}

@@ -1,30 +1,43 @@
-require 'sahara'
 require 'optparse'
-require 'sahara/command/status'
-require 'sahara/command/on'
-require 'sahara/command/commit'
-require 'sahara/command/rollback'
-require 'sahara/command/off'
 
-module Sahara
+module Sahara 
   module Command
-    class Sandbox < ::Vagrant::Command::Base
-      def initialize(argv,env)
+    class Root < Vagrant.plugin("2", :command)
+      def initialize(argv, env)
         super
 
         @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 
-        @subcommands = ::Vagrant::Registry.new
-        @subcommands.register(:status) { Sahara::Command::Status }
-        @subcommands.register(:on) { Sahara::Command::On }
-        @subcommands.register(:off) { Sahara::Command::Off }
-        @subcommands.register(:commit) { Sahara::Command::Commit }
-        @subcommands.register(:rollback) { Sahara::Command::Rollback }
+        @subcommands = Vagrant::Registry.new
+        @subcommands.register(:on) do
+          require_relative "on"
+          On 
+        end
+
+        @subcommands.register(:off) do
+          require_relative "off"
+          Off 
+        end
+
+        @subcommands.register(:commit) do
+          require_relative "commit"
+          Commit 
+        end
+
+        @subcommands.register(:rollback) do
+          require_relative "rollback"
+          Rollback
+        end
+
+        @subcommands.register(:status) do
+          require_relative "status"
+          Status 
+        end
       end
 
       def execute
         if @main_args.include?("-h") || @main_args.include?("--help")
-          # Print the help for all the box commands.
+          # Print the help for all the sub-commands.
           return help
         end
 
@@ -40,10 +53,10 @@ module Sahara
 
       # Prints the help out for this command
       def help
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant sandbox <command> [<args>]"
-          opts.separator ""
-          opts.separator "Available subcommands:"
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant plugin <command> [<args>]"
+          o.separator ""
+          o.separator "Available subcommands:"
 
           # Add the available subcommands as separators in order to print them
           # out as well.
@@ -51,11 +64,11 @@ module Sahara
           @subcommands.each { |key, value| keys << key.to_s }
 
           keys.sort.each do |key|
-            opts.separator "     #{key}"
+            o.separator "     #{key}"
           end
 
-          opts.separator ""
-          opts.separator "For help on any individual command run `vagrant sandbox COMMAND -h`"
+          o.separator ""
+          o.separator "For help on any individual command run `vagrant plugin COMMAND -h`"
         end
 
         @env.ui.info(opts.help, :prefix => false)

data/lib/sahara/command/status.rb

@@ -2,7 +2,7 @@ require 'optparse'
 
 module Sahara
   module Command
-    class Status < ::Vagrant::Command::Base
+    class Status < Vagrant.plugin("2", :command)
 
       def execute
 
@@ -19,9 +19,10 @@ module Sahara
         argv = parse_options(opts)
         return if !argv
 
-        boxname=argv[0]
-        begin
-          Sahara::Session.status(boxname)
+        ses = Sahara::Session::Command.new(@app, @env)
+
+        with_target_vms(argv, :reverse => true) do |machine|
+          ses.status(machine)
         end
       end
     end

data/lib/sahara/session.rb

@@ -1,240 +1,135 @@
 require 'pp'
 
-require 'sahara/shell'
-
 module Sahara
   module Session
+    class Command 
 
-    def self.determine_vboxcmd
-      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}\""
+      def initialize(app, env)
+        @app = app
+        @env = env
+        @vboxcmd=determine_vboxcmd
+        @sandboxname="sahara-sandbox"
+      end
+  
+      def determine_vboxcmd
+        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
-      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)
+  
+      def windows?
+        %W[mingw mswin].each do |text|
+          return true if RbConfig::CONFIG["host_os"].downcase.include?(text)
+        end
+        false
       end
-      false
-    end
-
-    def self.initialize
-      @vagrant_env=Vagrant::Environment.new
-      @vboxcmd=determine_vboxcmd
-      @sandboxname="sahara-sandbox"
-    end
-
-    def self.status(selection)
-      self.initialize
-
-      on_selected_vms(selection) do |boxname|
-        if is_snapshot_mode_on?(boxname)
-          puts "[#{boxname}] - snapshot mode is on"
-        else
-          puts "[#{boxname}] - snapshot mode is off"
+  
+      def list_snapshots(machine)
+        snapshotlist=Array.new
+        instance_id = machine.id
+        output = `#{@vboxcmd} showvminfo --machinereadable "#{instance_id}"`
+        snapshotresult=output.scan(/SnapshotName.*=(.*)/).flatten
+        snapshotresult.each do |result|
+          clean=result.gsub(/\"/,'').chomp
+          snapshotlist << clean
         end
+        snapshotlist
       end
-
-    end
-
-    def self.on(selection)
-      self.initialize
-
-      on_selected_vms(selection) do |boxname|
-        if is_snapshot_mode_on?(boxname)
-          puts "[#{boxname}] - snapshot mode is already on"
+  
+      def status(machine)
+        if !self.is_vm_created?(machine) then
+          puts "[#{machine.name}] VM is not created"
+          return
+        end
+        if self.is_snapshot_mode_on?(machine) then
+          puts "[#{machine.name}] Sandbox mode is on"
         else
-          instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
-
-          #Creating a snapshot
-          puts "[#{boxname}] - Enabling sandbox"
-
-          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" take \"#{@sandboxname}\" --pause")
+          puts "[#{machine.name}] Sandbox mode is off"
         end
-
       end
-    end
-
-    def self.commit(selection)
-
-      self.initialize
-      on_selected_vms(selection) do |boxname|
-
-
-        if !is_snapshot_mode_on?(boxname)
-          puts "[#{boxname}] - this requires that sandbox mode is on."
+  
+      def is_snapshot_mode_on?(machine)
+        snapshots=self.list_snapshots(machine)
+        return snapshots.include?(@sandboxname)
+      end
+  
+      def off(machine)
+        if !self.is_vm_created?(machine) then
+          puts "[#{machine.name}] VM is not created"
+          return
+        end
+        if self.is_snapshot_mode_on?(machine) then
+          instance_id = machine.id
+          `#{@vboxcmd} snapshot "#{instance_id}" delete "#{@sandboxname}" `
         else
-          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_uuid}\" delete \"#{@sandboxname}\"")
-
-          #Now retake the snapshot
-          puts "[#{boxname}] - fastforwarding sandbox"
-
-          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" take \"#{@sandboxname}\" --pause")
-
+          puts "[#{machine.name}] Not sandbox mode now"
         end
-
       end
-
-    end
-
-    def self.rollback(selection)
-      self.initialize
-
-      on_selected_vms(selection) do |boxname|
-
-        if !is_snapshot_mode_on?(boxname)
-          puts "[#{boxname}] - this requires that sandbox mode is on."
+  
+      def on(machine)
+        if !self.is_vm_created?(machine) then
+          puts "[#{machine.name}] VM is not created"
+          return
+        end
+        if !self.is_snapshot_mode_on?(machine) then
+          instance_id = machine.id
+          `#{@vboxcmd} snapshot "#{instance_id}" take "#{@sandboxname}" --pause`
         else
-          instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
-
-          puts "[#{boxname}] - powering off machine"
-
-          #Poweroff machine
-          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.
-          sleep 2
-
-          puts "[#{boxname}] - roll back machine"
-
-          #Rollback until snapshot
-          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.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'
-          end
-
-          execute("#{@vboxcmd} startvm --type #{boot_mode} \"#{instance_uuid}\" ")
-
+          puts "[#{machine.name}] Already sandbox mode"
         end
-
       end
-
-
-    end
-
-    def self.off(selection)
-      self.initialize
-
-      on_selected_vms(selection) do |boxname|
-
-
-        instance_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
-
-        if !is_snapshot_mode_on?(boxname)
-          puts "[#{boxname}] - this requires that sandbox mode is on."
+  
+      def commit(machine)
+        if !self.is_vm_created?(machine) then
+          puts "[#{machine.name}] VM is not created"
+          return
+        end
+        if self.is_snapshot_mode_on?(machine) then
+          instance_id = machine.id
+          `#{@vboxcmd} snapshot "#{instance_id}" delete "#{@sandboxname}"`
+          `#{@vboxcmd} snapshot "#{instance_id}" take "#{@sandboxname}" --pause`
         else
-          puts "[#{boxname}] - switching sandbox off"
-
-          # We might wanna check for sandbox changes or not
-
-          #Discard snapshot
-          execute("#{@vboxcmd} snapshot \"#{instance_uuid}\" delete \"#{@sandboxname}\" ")
-
+          puts "[#{machine.name}] Not sandbox mode now"
         end
-
       end
-    end
-
-    def self.execute(command)
-      #puts "#{command}"
-      output=Sahara::Shell.execute("#{command}")
-      return output
-    end
-
-    def self.is_vm_created?(boxname)
-      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_uuid="#{@vagrant_env.vms[boxname.to_sym].uuid}"
-      snapshotlist=Array.new
-      output=execute("#{@vboxcmd} showvminfo --machinereadable \"#{instance_uuid}\"").join
-      snapshotresult=output.scan(/SnapshotName.*=(.*)/).flatten
-      snapshotresult.each do |result|
-        clean=result.gsub(/\"/,'').chomp
-        snapshotlist << clean
-      end
-      return snapshotlist
-    end
-
-    def self.is_snapshot_mode_on?(boxname)
-      snapshots=list_snapshots(boxname)
-      return snapshots.include?(@sandboxname)
-    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 not created"
-              end
-            end
-          else
-            if is_vm_created?(name)
-              yield name
-            else
-              puts "[#{name}] - machine not created"
-            end
-          end
+  
+      def rollback(machine)
+        if !self.is_vm_created?(machine) then
+          puts "[#{machine.name}] VM is not created"
+          return
+        end
+        if !self.is_snapshot_mode_on?(machine) then
+          puts "[#{machine.name}] Not sandbox mode now"
+          return
         end
-      else
-        if is_vm_created?(selection)
-          yield selection
+  
+        instance_id = machine.id
+        `#{@vboxcmd} controlvm "#{instance_id}" poweroff `
+        sleep 2
+        `#{@vboxcmd} snapshot "#{instance_id}" restore "#{@sandboxname}"`
+  
+        gui_boot = machine.provider_config.gui
+        if gui_boot 
+          boot_mode = "gui"
         else
-          puts "[#{selection}] - machine not created"
+          boot_mode = "headless"
         end
+        # restore boot mode
+        `#{@vboxcmd} startvm --type #{boot_mode} "#{instance_id}" `
       end
+  
+      def is_vm_created?(machine)
+        return !machine.id.nil?
+      end
+  
     end
   end
 end
-
-
-#command="#{@vboxcmd} unregistervm  '#{boxname}' --delete"    
-#puts command
-#puts "Deleting vm #{boxname}"
-
-#Exec and system stop the execution here
-#Veewee::Shell.execute("#{command}")
-

data/lib/sahara/version.rb

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

data/sahara.gemspec

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

metadata

@@ -1,149 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sahara
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.0.15
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 13
-  version: 0.0.13
 platform: ruby
-authors: 
+authors:
 - Patrick Debois
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-06-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: popen4
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  prerelease: false
-  name: vagrant
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.1.2
-  prerelease: false
-  name: popen4
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 14
-        version: "0.14"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
   prerelease: false
-  name: thor
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  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
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
+  type: :development
   prerelease: false
-  name: bundler
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Allows you to sandbox your vagrant
-email: 
+email:
 - patrick.debois@jedi.be
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
-- .rvmrc
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
-- Vagrantfile.multi
-- Vagrantfile.single
 - lib/sahara.rb
 - lib/sahara/command/commit.rb
 - lib/sahara/command/off.rb
 - lib/sahara/command/on.rb
 - lib/sahara/command/rollback.rb
-- lib/sahara/command/sandbox.rb
+- lib/sahara/command/root.rb
 - lib/sahara/command/status.rb
-- lib/sahara/command/vagrant.rb
 - lib/sahara/session.rb
-- lib/sahara/shell.rb
 - lib/sahara/version.rb
-- lib/vagrant_init.rb
 - sahara.gemspec
 homepage: http://github.com/jedi4ever/sahara/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2159711704490986345
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: sahara
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Vagrant box creation
 test_files: []
-

data/.rvmrc

@@ -1,5 +0,0 @@
-rvm use ruby-1.8.7
-rvm_gemset_create_on_use_flag=1
-rvm gemset use sahara
-alias vagrant="bundle exec vagrant"
-alias irb="bundle exec irb"

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sahara (0.0.13)
-      popen4 (~> 0.1.2)
-      thor (> 0.14)
-      vagrant (~> 1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    Platform (0.4.0)
-    archive-tar-minitar (0.5.2)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    i18n (0.6.0)
-    json (1.5.4)
-    log4r (1.1.10)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
-    open4 (1.3.0)
-    popen4 (0.1.2)
-      Platform (>= 0.4.0)
-      open4 (>= 0.4.0)
-    rake (0.9.2.2)
-    thor (0.15.2)
-    vagrant (1.0.3)
-      archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.1)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      json (~> 1.5.1)
-      log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  sahara!

data/Vagrantfile.multi

@@ -1,12 +0,0 @@
-Vagrant::Config.run do |config|
-
-  config.vm.define :one do |admin_config|
-  	admin_config.vm.box = "maverick64"
-  end
-
-  config.vm.define :two do |fe_config|
-  	fe_config.vm.box = "maverick64"
-  end
-
-end
-

data/Vagrantfile.single

@@ -1,33 +0,0 @@
-Vagrant::Config.run do |config|
-
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "maverick64"
-
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-   #config.vm.provision :chef_server do |chef|
-     #chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-     #chef.validation_key_path = "ORGNAME-validator.pem"
-   #end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # IF you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
-end
-

data/lib/sahara/command/vagrant.rb

@@ -1,5 +0,0 @@
-require 'sahara'
-require 'sahara/session'
-require 'sahara/command/sandbox'
-
-Vagrant.commands.register(:sandbox) { Sahara::Command::Sandbox }

data/lib/sahara/shell.rb

@@ -1,58 +0,0 @@
-#require 'open4'
-
-module Sahara
-  class Shell
- 
-    def self.execute(command,options = {})
-      STDOUT.sync = true
-      output=nil
-      result=IO.popen("#{command}") {|f| output=f.readlines}
-      #{ |f| print "#{f}, #{f.class}" }
-#      output=result.read
-      return output
-    end
-    
-    #pty allows you to gradually see the output of a local command
-    #http://www.shanison.com/?p=415
-      def self.execute2(command, options = {} )
-        require "pty"
-            begin
-              PTY.spawn( command ) do |r, w, pid|
-                begin
-                  #r.each { }      
-                  r.each { |line| print line;}      
-
-               rescue Errno::EIO        
-               end      
-             end  
-           rescue PTY::ChildExited => e
-              puts "The child process exited!"
-           end
-      end
-
-      #occassinally fails with 'no child processes
-      def self.execute3(command, options = {} )
-        defaults= { :port => "22", :exitcode => "0", :user => "root"}
-          options=defaults.merge(options) 
-
-          status = POpen4::popen4(command) do |stdout,stderr,stdin|
-            stdout.each do |line|
-              puts line
-            end
-          end
-          
-        @status=status.to_i
-  
-        if (@status.to_s != options[:exitcode] )
-          if (options[:exitcode]=="*")
-            #its a test so we don't need to worry
-          else
-            raise "Exitcode was not what we expected"
-          end
-
-        end
-
-      end
-
-  end #Class
-end #Module

data/lib/vagrant_init.rb

@@ -1,8 +0,0 @@
-begin
-  require 'vagrant'
-  require 'sahara/command/vagrant'
-rescue LoadError
-  require 'rubygems'
-  require 'vagrant'
-  require 'sahara/command/vagrant'
-end