vagrant 0.2.0 → 0.3.0

data/test/vagrant/vm_test.rb

@@ -3,10 +3,11 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 class VMTest < Test::Unit::TestCase
   setup do
     @mock_vm = mock("vm")
-    mock_config
 
     @persisted_vm = mock("persisted_vm")
-    Vagrant::Env.stubs(:persisted_vm).returns(@persisted_vm)
+
+    @env = mock_environment
+    @env.stubs(:vm).returns(@persisted_vm)
 
     Net::SSH.stubs(:start)
   end

data/vagrant.gemspec

@@ -5,14 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-04-15}
+  s.default_executable = %q{vagrant}
   s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
-  s.executables = ["vagrant", "vagrant-box", "vagrant-down", "vagrant-halt", "vagrant-init", "vagrant-package", "vagrant-reload", "vagrant-resume", "vagrant-ssh", "vagrant-status", "vagrant-suspend", "vagrant-up"]
+  s.executables = ["vagrant"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.md"
@@ -26,20 +27,10 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/.gitignore",
      "bin/vagrant",
-     "bin/vagrant-box",
-     "bin/vagrant-down",
-     "bin/vagrant-halt",
-     "bin/vagrant-init",
-     "bin/vagrant-package",
-     "bin/vagrant-reload",
-     "bin/vagrant-resume",
-     "bin/vagrant-ssh",
-     "bin/vagrant-status",
-     "bin/vagrant-suspend",
-     "bin/vagrant-up",
      "config/default.rb",
      "keys/README.md",
      "keys/vagrant",
+     "keys/vagrant.ppk",
      "keys/vagrant.pub",
      "lib/vagrant.rb",
      "lib/vagrant/actions/base.rb",
@@ -69,21 +60,47 @@ Gem::Specification.new do |s|
      "lib/vagrant/active_list.rb",
      "lib/vagrant/box.rb",
      "lib/vagrant/busy.rb",
-     "lib/vagrant/commands.rb",
+     "lib/vagrant/command.rb",
+     "lib/vagrant/commands/base.rb",
+     "lib/vagrant/commands/box.rb",
+     "lib/vagrant/commands/box/add.rb",
+     "lib/vagrant/commands/box/list.rb",
+     "lib/vagrant/commands/box/remove.rb",
+     "lib/vagrant/commands/destroy.rb",
+     "lib/vagrant/commands/down.rb",
+     "lib/vagrant/commands/halt.rb",
+     "lib/vagrant/commands/init.rb",
+     "lib/vagrant/commands/package.rb",
+     "lib/vagrant/commands/reload.rb",
+     "lib/vagrant/commands/resume.rb",
+     "lib/vagrant/commands/ssh.rb",
+     "lib/vagrant/commands/ssh_config.rb",
+     "lib/vagrant/commands/status.rb",
+     "lib/vagrant/commands/suspend.rb",
+     "lib/vagrant/commands/up.rb",
      "lib/vagrant/config.rb",
      "lib/vagrant/downloaders/base.rb",
      "lib/vagrant/downloaders/file.rb",
      "lib/vagrant/downloaders/http.rb",
-     "lib/vagrant/env.rb",
+     "lib/vagrant/environment.rb",
      "lib/vagrant/provisioners/base.rb",
      "lib/vagrant/provisioners/chef.rb",
      "lib/vagrant/provisioners/chef_server.rb",
      "lib/vagrant/provisioners/chef_solo.rb",
      "lib/vagrant/ssh.rb",
-     "lib/vagrant/stacked_proc_runner.rb",
      "lib/vagrant/util.rb",
+     "lib/vagrant/util/errors.rb",
+     "lib/vagrant/util/platform.rb",
+     "lib/vagrant/util/progress_meter.rb",
+     "lib/vagrant/util/stacked_proc_runner.rb",
+     "lib/vagrant/util/template_renderer.rb",
      "lib/vagrant/vm.rb",
-     "templates/Vagrantfile",
+     "templates/Vagrantfile.erb",
+     "templates/chef_server_client.erb",
+     "templates/chef_solo_solo.erb",
+     "templates/errors.yml",
+     "templates/package_Vagrantfile.erb",
+     "templates/ssh_config.erb",
      "test/test_helper.rb",
      "test/vagrant/actions/base_test.rb",
      "test/vagrant/actions/box/add_test.rb",
@@ -112,18 +129,37 @@ Gem::Specification.new do |s|
      "test/vagrant/active_list_test.rb",
      "test/vagrant/box_test.rb",
      "test/vagrant/busy_test.rb",
-     "test/vagrant/commands_test.rb",
+     "test/vagrant/command_test.rb",
+     "test/vagrant/commands/base_test.rb",
+     "test/vagrant/commands/box/add_test.rb",
+     "test/vagrant/commands/box/list_test.rb",
+     "test/vagrant/commands/box/remove_test.rb",
+     "test/vagrant/commands/destroy_test.rb",
+     "test/vagrant/commands/down_test.rb",
+     "test/vagrant/commands/halt_test.rb",
+     "test/vagrant/commands/init_test.rb",
+     "test/vagrant/commands/package_test.rb",
+     "test/vagrant/commands/reload_test.rb",
+     "test/vagrant/commands/resume_test.rb",
+     "test/vagrant/commands/ssh_config_test.rb",
+     "test/vagrant/commands/ssh_test.rb",
+     "test/vagrant/commands/status_test.rb",
+     "test/vagrant/commands/suspend_test.rb",
+     "test/vagrant/commands/up_test.rb",
      "test/vagrant/config_test.rb",
      "test/vagrant/downloaders/base_test.rb",
      "test/vagrant/downloaders/file_test.rb",
      "test/vagrant/downloaders/http_test.rb",
-     "test/vagrant/env_test.rb",
+     "test/vagrant/environment_test.rb",
      "test/vagrant/provisioners/base_test.rb",
      "test/vagrant/provisioners/chef_server_test.rb",
      "test/vagrant/provisioners/chef_solo_test.rb",
      "test/vagrant/provisioners/chef_test.rb",
      "test/vagrant/ssh_test.rb",
-     "test/vagrant/stacked_proc_runner_test.rb",
+     "test/vagrant/util/errors_test.rb",
+     "test/vagrant/util/progress_meter_test.rb",
+     "test/vagrant/util/stacked_proc_runner_test.rb",
+     "test/vagrant/util/template_renderer_test.rb",
      "test/vagrant/util_test.rb",
      "test/vagrant/vm_test.rb",
      "vagrant.gemspec"
@@ -162,18 +198,37 @@ Gem::Specification.new do |s|
      "test/vagrant/active_list_test.rb",
      "test/vagrant/box_test.rb",
      "test/vagrant/busy_test.rb",
-     "test/vagrant/commands_test.rb",
+     "test/vagrant/command_test.rb",
+     "test/vagrant/commands/base_test.rb",
+     "test/vagrant/commands/box/add_test.rb",
+     "test/vagrant/commands/box/list_test.rb",
+     "test/vagrant/commands/box/remove_test.rb",
+     "test/vagrant/commands/destroy_test.rb",
+     "test/vagrant/commands/down_test.rb",
+     "test/vagrant/commands/halt_test.rb",
+     "test/vagrant/commands/init_test.rb",
+     "test/vagrant/commands/package_test.rb",
+     "test/vagrant/commands/reload_test.rb",
+     "test/vagrant/commands/resume_test.rb",
+     "test/vagrant/commands/ssh_config_test.rb",
+     "test/vagrant/commands/ssh_test.rb",
+     "test/vagrant/commands/status_test.rb",
+     "test/vagrant/commands/suspend_test.rb",
+     "test/vagrant/commands/up_test.rb",
      "test/vagrant/config_test.rb",
      "test/vagrant/downloaders/base_test.rb",
      "test/vagrant/downloaders/file_test.rb",
      "test/vagrant/downloaders/http_test.rb",
-     "test/vagrant/env_test.rb",
+     "test/vagrant/environment_test.rb",
      "test/vagrant/provisioners/base_test.rb",
      "test/vagrant/provisioners/chef_server_test.rb",
      "test/vagrant/provisioners/chef_solo_test.rb",
      "test/vagrant/provisioners/chef_test.rb",
      "test/vagrant/ssh_test.rb",
-     "test/vagrant/stacked_proc_runner_test.rb",
+     "test/vagrant/util/errors_test.rb",
+     "test/vagrant/util/progress_meter_test.rb",
+     "test/vagrant/util/stacked_proc_runner_test.rb",
+     "test/vagrant/util/template_renderer_test.rb",
      "test/vagrant/util_test.rb",
      "test/vagrant/vm_test.rb"
   ]
@@ -183,27 +238,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<virtualbox>, [">= 0.5.3"])
+      s.add_runtime_dependency(%q<virtualbox>, ["~> 0.6.0"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_runtime_dependency(%q<net-scp>, [">= 1.0.2"])
-      s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<git-style-binaries>, [">= 0.1.10"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
+      s.add_runtime_dependency(%q<mario>, ["~> 0.0.6"])
     else
-      s.add_dependency(%q<virtualbox>, [">= 0.5.3"])
+      s.add_dependency(%q<virtualbox>, ["~> 0.6.0"])
       s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_dependency(%q<net-scp>, [">= 1.0.2"])
-      s.add_dependency(%q<json>, [">= 1.2.0"])
-      s.add_dependency(%q<git-style-binaries>, [">= 0.1.10"])
+      s.add_dependency(%q<json_pure>, [">= 1.2.0"])
       s.add_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
+      s.add_dependency(%q<mario>, ["~> 0.0.6"])
     end
   else
-    s.add_dependency(%q<virtualbox>, [">= 0.5.3"])
+    s.add_dependency(%q<virtualbox>, ["~> 0.6.0"])
     s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
     s.add_dependency(%q<net-scp>, [">= 1.0.2"])
-    s.add_dependency(%q<json>, [">= 1.2.0"])
-    s.add_dependency(%q<git-style-binaries>, [">= 0.1.10"])
+    s.add_dependency(%q<json_pure>, [">= 1.2.0"])
     s.add_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
+    s.add_dependency(%q<mario>, ["~> 0.0.6"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,21 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -07:00
-default_executable: 
+date: 2010-04-15 00:00:00 -07:00
+default_executable: vagrant
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: virtualbox
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        - 6
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -75,31 +75,31 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: git-style-binaries
+  name: archive-tar-minitar
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 10
-        version: 0.1.10
+        - 5
+        - 2
+        version: 0.5.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
+  name: mario
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        - 2
-        version: 0.5.2
+        - 0
+        - 6
+        version: 0.0.6
   type: :runtime
   version_requirements: *id006
 description: Vagrant is a tool for building and distributing virtualized development environments.
@@ -108,17 +108,6 @@ email:
 - john.m.bender@gmail.com
 executables: 
 - vagrant
-- vagrant-box
-- vagrant-down
-- vagrant-halt
-- vagrant-init
-- vagrant-package
-- vagrant-reload
-- vagrant-resume
-- vagrant-ssh
-- vagrant-status
-- vagrant-suspend
-- vagrant-up
 extensions: []
 
 extra_rdoc_files: 
@@ -133,20 +122,10 @@ files:
 - VERSION
 - bin/.gitignore
 - bin/vagrant
-- bin/vagrant-box
-- bin/vagrant-down
-- bin/vagrant-halt
-- bin/vagrant-init
-- bin/vagrant-package
-- bin/vagrant-reload
-- bin/vagrant-resume
-- bin/vagrant-ssh
-- bin/vagrant-status
-- bin/vagrant-suspend
-- bin/vagrant-up
 - config/default.rb
 - keys/README.md
 - keys/vagrant
+- keys/vagrant.ppk
 - keys/vagrant.pub
 - lib/vagrant.rb
 - lib/vagrant/actions/base.rb
@@ -176,21 +155,47 @@ files:
 - lib/vagrant/active_list.rb
 - lib/vagrant/box.rb
 - lib/vagrant/busy.rb
-- lib/vagrant/commands.rb
+- lib/vagrant/command.rb
+- lib/vagrant/commands/base.rb
+- lib/vagrant/commands/box.rb
+- lib/vagrant/commands/box/add.rb
+- lib/vagrant/commands/box/list.rb
+- lib/vagrant/commands/box/remove.rb
+- lib/vagrant/commands/destroy.rb
+- lib/vagrant/commands/down.rb
+- lib/vagrant/commands/halt.rb
+- lib/vagrant/commands/init.rb
+- lib/vagrant/commands/package.rb
+- lib/vagrant/commands/reload.rb
+- lib/vagrant/commands/resume.rb
+- lib/vagrant/commands/ssh.rb
+- lib/vagrant/commands/ssh_config.rb
+- lib/vagrant/commands/status.rb
+- lib/vagrant/commands/suspend.rb
+- lib/vagrant/commands/up.rb
 - lib/vagrant/config.rb
 - lib/vagrant/downloaders/base.rb
 - lib/vagrant/downloaders/file.rb
 - lib/vagrant/downloaders/http.rb
-- lib/vagrant/env.rb
+- lib/vagrant/environment.rb
 - lib/vagrant/provisioners/base.rb
 - lib/vagrant/provisioners/chef.rb
 - lib/vagrant/provisioners/chef_server.rb
 - lib/vagrant/provisioners/chef_solo.rb
 - lib/vagrant/ssh.rb
-- lib/vagrant/stacked_proc_runner.rb
 - lib/vagrant/util.rb
+- lib/vagrant/util/errors.rb
+- lib/vagrant/util/platform.rb
+- lib/vagrant/util/progress_meter.rb
+- lib/vagrant/util/stacked_proc_runner.rb
+- lib/vagrant/util/template_renderer.rb
 - lib/vagrant/vm.rb
-- templates/Vagrantfile
+- templates/Vagrantfile.erb
+- templates/chef_server_client.erb
+- templates/chef_solo_solo.erb
+- templates/errors.yml
+- templates/package_Vagrantfile.erb
+- templates/ssh_config.erb
 - test/test_helper.rb
 - test/vagrant/actions/base_test.rb
 - test/vagrant/actions/box/add_test.rb
@@ -219,18 +224,37 @@ files:
 - test/vagrant/active_list_test.rb
 - test/vagrant/box_test.rb
 - test/vagrant/busy_test.rb
-- test/vagrant/commands_test.rb
+- test/vagrant/command_test.rb
+- test/vagrant/commands/base_test.rb
+- test/vagrant/commands/box/add_test.rb
+- test/vagrant/commands/box/list_test.rb
+- test/vagrant/commands/box/remove_test.rb
+- test/vagrant/commands/destroy_test.rb
+- test/vagrant/commands/down_test.rb
+- test/vagrant/commands/halt_test.rb
+- test/vagrant/commands/init_test.rb
+- test/vagrant/commands/package_test.rb
+- test/vagrant/commands/reload_test.rb
+- test/vagrant/commands/resume_test.rb
+- test/vagrant/commands/ssh_config_test.rb
+- test/vagrant/commands/ssh_test.rb
+- test/vagrant/commands/status_test.rb
+- test/vagrant/commands/suspend_test.rb
+- test/vagrant/commands/up_test.rb
 - test/vagrant/config_test.rb
 - test/vagrant/downloaders/base_test.rb
 - test/vagrant/downloaders/file_test.rb
 - test/vagrant/downloaders/http_test.rb
-- test/vagrant/env_test.rb
+- test/vagrant/environment_test.rb
 - test/vagrant/provisioners/base_test.rb
 - test/vagrant/provisioners/chef_server_test.rb
 - test/vagrant/provisioners/chef_solo_test.rb
 - test/vagrant/provisioners/chef_test.rb
 - test/vagrant/ssh_test.rb
-- test/vagrant/stacked_proc_runner_test.rb
+- test/vagrant/util/errors_test.rb
+- test/vagrant/util/progress_meter_test.rb
+- test/vagrant/util/stacked_proc_runner_test.rb
+- test/vagrant/util/template_renderer_test.rb
 - test/vagrant/util_test.rb
 - test/vagrant/vm_test.rb
 - vagrant.gemspec
@@ -293,17 +317,36 @@ test_files:
 - test/vagrant/active_list_test.rb
 - test/vagrant/box_test.rb
 - test/vagrant/busy_test.rb
-- test/vagrant/commands_test.rb
+- test/vagrant/command_test.rb
+- test/vagrant/commands/base_test.rb
+- test/vagrant/commands/box/add_test.rb
+- test/vagrant/commands/box/list_test.rb
+- test/vagrant/commands/box/remove_test.rb
+- test/vagrant/commands/destroy_test.rb
+- test/vagrant/commands/down_test.rb
+- test/vagrant/commands/halt_test.rb
+- test/vagrant/commands/init_test.rb
+- test/vagrant/commands/package_test.rb
+- test/vagrant/commands/reload_test.rb
+- test/vagrant/commands/resume_test.rb
+- test/vagrant/commands/ssh_config_test.rb
+- test/vagrant/commands/ssh_test.rb
+- test/vagrant/commands/status_test.rb
+- test/vagrant/commands/suspend_test.rb
+- test/vagrant/commands/up_test.rb
 - test/vagrant/config_test.rb
 - test/vagrant/downloaders/base_test.rb
 - test/vagrant/downloaders/file_test.rb
 - test/vagrant/downloaders/http_test.rb
-- test/vagrant/env_test.rb
+- test/vagrant/environment_test.rb
 - test/vagrant/provisioners/base_test.rb
 - test/vagrant/provisioners/chef_server_test.rb
 - test/vagrant/provisioners/chef_solo_test.rb
 - test/vagrant/provisioners/chef_test.rb
 - test/vagrant/ssh_test.rb
-- test/vagrant/stacked_proc_runner_test.rb
+- test/vagrant/util/errors_test.rb
+- test/vagrant/util/progress_meter_test.rb
+- test/vagrant/util/stacked_proc_runner_test.rb
+- test/vagrant/util/template_renderer_test.rb
 - test/vagrant/util_test.rb
 - test/vagrant/vm_test.rb