sahara 0.0.8 → 0.0.9

data/Gemfile.lock

@@ -1,39 +1,40 @@
 PATH
   remote: .
   specs:
-    sahara (0.0.8)
+    sahara (0.0.9)
       popen4 (~> 0.1.2)
       thor (~> 0.14.6)
-      vagrant (~> 0.8.2)
+      vagrant (~> 0.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
     Platform (0.4.0)
     archive-tar-minitar (0.5.2)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
     erubis (2.7.0)
-    ffi (1.0.9)
-    i18n (0.5.0)
-    json (1.5.3)
+    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.1.4)
-    open4 (1.1.0)
+    net-ssh (2.2.2)
+    open4 (1.3.0)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     thor (0.14.6)
-    vagrant (0.8.2)
+    vagrant (0.9.5)
       archive-tar-minitar (= 0.5.2)
+      childprocess (~> 0.3.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.5.0)
+      i18n (~> 0.6.0)
       json (~> 1.5.1)
+      log4r (~> 1.1.9)
       net-scp (~> 1.0.4)
-      net-ssh (~> 2.1.4)
-      thor (~> 0.14.6)
-      virtualbox (~> 0.9.1)
-    virtualbox (0.9.1)
-      ffi (~> 1.0.9)
+      net-ssh (~> 2.2.2)
 
 PLATFORMS
   ruby

data/lib/sahara.rb

@@ -1,2 +1 @@
 require 'vagrant'
-require 'sahara/command'

data/lib/sahara/command/commit.rb

@@ -0,0 +1,26 @@
+module Sahara
+  module Command
+    class Commit < ::Vagrant::Command::Base
+      def execute
+
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Commits changes - moves sandbox initial state to currentstate"
+          opts.separator ""
+          opts.separator "Usage: vagrant sandbox commit <vmname>"
+
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        boxname=argv[0]
+        begin
+          Sahara::Session.commit(boxname)
+        end
+      end
+    end
+  end
+end

data/lib/sahara/command/off.rb

@@ -0,0 +1,26 @@
+module Sahara
+  module Command
+    class Off < ::Vagrant::Command::Base
+      def execute
+
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Leaves sandbox state"
+          opts.separator ""
+          opts.separator "Usage: vagrant sandbox off <vmname>"
+
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        boxname=argv[0]
+        begin
+          Sahara::Session.off(boxname)
+        end
+      end
+    end
+  end
+end

data/lib/sahara/command/on.rb

@@ -0,0 +1,26 @@
+module Sahara
+  module Command
+    class On < ::Vagrant::Command::Base
+      def execute
+
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Enters sandbox state"
+          opts.separator ""
+          opts.separator "Usage: vagrant sandbox on <vmname>"
+
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        boxname=argv[0]
+        begin
+          Sahara::Session.on(boxname)
+        end
+      end
+    end
+  end
+end

data/lib/sahara/command/rollback.rb

@@ -0,0 +1,26 @@
+module Sahara
+  module Command
+    class Rollback < ::Vagrant::Command::Base
+      def execute
+
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Rollback changes since sandbox state was entered"
+          opts.separator ""
+          opts.separator "Usage: vagrant sandbox rollback <vmname>"
+
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        boxname=argv[0]
+        begin
+          Sahara::Session.rollback(boxname)
+        end
+      end
+    end
+  end
+end

data/lib/sahara/command/sandbox.rb

@@ -0,0 +1,65 @@
+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 Command
+    class Sandbox < ::Vagrant::Command::Base
+      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 }
+      end
+
+      def execute
+        if @main_args.include?("-h") || @main_args.include?("--help")
+          # Print the help for all the box commands.
+          return help
+        end
+
+        # If we reached this far then we must have a subcommand. If not,
+        # then we also just print the help and exit.
+        command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+        return help if !command_class || !@sub_command
+        @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+        # Initialize and execute the command class
+        command_class.new(@sub_args, @env).execute
+      end
+
+      # 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:"
+
+          # Add the available subcommands as separators in order to print them
+          # out as well.
+          keys = []
+          @subcommands.each { |key, value| keys << key.to_s }
+
+          keys.sort.each do |key|
+            opts.separator "     #{key}"
+          end
+
+          opts.separator ""
+          opts.separator "For help on any individual command run `vagrant sandbox COMMAND -h`"
+        end
+
+        @env.ui.info(opts.help, :prefix => false)
+      end
+    end
+  end
+end

data/lib/sahara/command/status.rb

@@ -0,0 +1,29 @@
+require 'optparse'
+
+module Sahara
+  module Command
+    class Status < ::Vagrant::Command::Base
+
+      def execute
+
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Shows the status of the sandbox"
+          opts.separator ""
+          opts.separator "Usage: vagrant sandbox status <vmname>"
+
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        boxname=argv[0]
+        begin
+          Sahara::Session.status(boxname)
+        end
+      end
+    end
+  end
+end

data/lib/sahara/command/vagrant.rb

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

data/lib/sahara/version.rb

@@ -1,3 +1,3 @@
 module Sahara
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/vagrant_init.rb

@@ -1,6 +1,8 @@
 begin
-  require 'sahara'
+  require 'vagrant'
+  require 'sahara/command/vagrant'
 rescue LoadError
   require 'rubygems'
-  require 'sahara'
+  require 'vagrant'
+  require 'sahara/command/vagrant'
 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.8.2"
+  s.add_dependency "vagrant", "~> 0.9"
   s.add_dependency "popen4", "~> 0.1.2"
   s.add_dependency "thor", "~> 0.14.6"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sahara
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,27 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 +01:00
-default_executable: 
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 25
         segments: 
         - 0
-        - 8
-        - 2
-        version: 0.8.2
-  type: :runtime
-  requirement: *id001
-  name: vagrant
+        - 9
+        version: "0.9"
   prerelease: false
+  name: vagrant
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +45,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
-  requirement: *id002
-  name: popen4
   prerelease: false
+  name: popen4
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +61,12 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
-  type: :runtime
-  requirement: *id003
-  name: thor
   prerelease: false
+  name: thor
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,10 +77,9 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  requirement: *id004
-  name: bundler
   prerelease: false
+  name: bundler
+  version_requirements: *id004
 description: Allows you to sandbox your vagrant
 email: 
 - patrick.debois@jedi.be
@@ -101,13 +99,18 @@ files:
 - Vagrantfile.multi
 - Vagrantfile.single
 - lib/sahara.rb
-- lib/sahara/command.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/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
-has_rdoc: true
 homepage: http://github.com/jedi4ever/sahara/
 licenses: []
 
@@ -139,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sahara
-rubygems_version: 1.4.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Vagrant box creation

data/lib/sahara/command.rb

@@ -1,33 +0,0 @@
-require 'sahara/session'
-
-module Sahara
-	class Command < Vagrant::Command::GroupBase
-	  register "sandbox","Manages a sandbox"
-
-	  desc "status [NAME]", "Shows the status of the sandbox"
-	  def status(boxname=nil)
-	    Sahara::Session.status(boxname)
-	  end
-
-	  desc "on [NAME]", "Enters sandbox state"
-	  def on(boxname=nil)
-	    Sahara::Session.on(boxname)
-	  end
-
-	  desc "commit [NAME]", "Commits changes - moves sandbox initial state to currentstate"
-	  def commit(boxname=nil)
-	    Sahara::Session.commit(boxname)
-	  end
-
-	  desc "rollback [NAME]", "Rollback changes since sandbox state was entered "
-	  def rollback(boxname=nil)
-	    Sahara::Session.rollback(boxname)
-	  end
-	  
-	  desc "off [NAME] ", "Leaves sandbox state"
-	  def off(boxname=nil)
-	    Sahara::Session.off(boxname)
-	  end
-    
-	end
-end