vagrantup 0.3.4 → 0.4.0

data/vagrant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrantup}
-  s.version = "0.3.4"
+  s.version = "0.4.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-05-21}
+  s.date = %q{2010-06-10}
   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"]
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
      "lib/vagrant/actions/vm/halt.rb",
      "lib/vagrant/actions/vm/import.rb",
      "lib/vagrant/actions/vm/move_hard_drive.rb",
+     "lib/vagrant/actions/vm/network.rb",
      "lib/vagrant/actions/vm/package.rb",
      "lib/vagrant/actions/vm/provision.rb",
      "lib/vagrant/actions/vm/reload.rb",
@@ -68,10 +69,10 @@ Gem::Specification.new do |s|
      "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/provision.rb",
      "lib/vagrant/commands/reload.rb",
      "lib/vagrant/commands/resume.rb",
      "lib/vagrant/commands/ssh.rb",
@@ -88,20 +89,29 @@ Gem::Specification.new do |s|
      "lib/vagrant/provisioners/chef.rb",
      "lib/vagrant/provisioners/chef_server.rb",
      "lib/vagrant/provisioners/chef_solo.rb",
+     "lib/vagrant/resource_logger.rb",
      "lib/vagrant/ssh.rb",
+     "lib/vagrant/systems/base.rb",
+     "lib/vagrant/systems/linux.rb",
      "lib/vagrant/util.rb",
-     "lib/vagrant/util/errors.rb",
+     "lib/vagrant/util/error_helper.rb",
+     "lib/vagrant/util/glob_loader.rb",
+     "lib/vagrant/util/output_helper.rb",
+     "lib/vagrant/util/plain_logger.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/util/translator.rb",
      "lib/vagrant/vm.rb",
      "templates/Vagrantfile.erb",
      "templates/chef_server_client.erb",
      "templates/chef_solo_solo.erb",
-     "templates/errors.yml",
+     "templates/crontab_entry.erb",
+     "templates/network_entry.erb",
      "templates/package_Vagrantfile.erb",
      "templates/ssh_config.erb",
+     "templates/strings.yml",
+     "templates/sync.erb",
      "test/test_helper.rb",
      "test/vagrant/actions/base_test.rb",
      "test/vagrant/actions/box/add_test.rb",
@@ -120,6 +130,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/vm/halt_test.rb",
      "test/vagrant/actions/vm/import_test.rb",
      "test/vagrant/actions/vm/move_hard_drive_test.rb",
+     "test/vagrant/actions/vm/network_test.rb",
      "test/vagrant/actions/vm/package_test.rb",
      "test/vagrant/actions/vm/provision_test.rb",
      "test/vagrant/actions/vm/reload_test.rb",
@@ -137,10 +148,10 @@ Gem::Specification.new do |s|
      "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/provision_test.rb",
      "test/vagrant/commands/reload_test.rb",
      "test/vagrant/commands/resume_test.rb",
      "test/vagrant/commands/ssh_config_test.rb",
@@ -157,11 +168,17 @@ Gem::Specification.new do |s|
      "test/vagrant/provisioners/chef_server_test.rb",
      "test/vagrant/provisioners/chef_solo_test.rb",
      "test/vagrant/provisioners/chef_test.rb",
+     "test/vagrant/resource_logger_test.rb",
+     "test/vagrant/ssh_session_test.rb",
      "test/vagrant/ssh_test.rb",
-     "test/vagrant/util/errors_test.rb",
-     "test/vagrant/util/progress_meter_test.rb",
+     "test/vagrant/systems/linux_test.rb",
+     "test/vagrant/util/error_helper_test.rb",
+     "test/vagrant/util/output_helper_test.rb",
+     "test/vagrant/util/plain_logger_test.rb",
+     "test/vagrant/util/platform_test.rb",
      "test/vagrant/util/stacked_proc_runner_test.rb",
      "test/vagrant/util/template_renderer_test.rb",
+     "test/vagrant/util/translator_test.rb",
      "test/vagrant/util_test.rb",
      "test/vagrant/vm_test.rb",
      "vagrant.gemspec"
@@ -183,6 +200,7 @@ Gem::Specification.new do |s|
      "test/vagrant/provisioners/chef_test.rb",
      "test/vagrant/provisioners/chef_server_test.rb",
      "test/vagrant/provisioners/chef_solo_test.rb",
+     "test/vagrant/systems/linux_test.rb",
      "test/vagrant/config_test.rb",
      "test/vagrant/actions/base_test.rb",
      "test/vagrant/actions/runner_test.rb",
@@ -203,6 +221,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/vm/import_test.rb",
      "test/vagrant/actions/vm/customize_test.rb",
      "test/vagrant/actions/vm/start_test.rb",
+     "test/vagrant/actions/vm/network_test.rb",
      "test/vagrant/actions/vm/move_hard_drive_test.rb",
      "test/vagrant/actions/vm/up_test.rb",
      "test/vagrant/actions/vm/export_test.rb",
@@ -216,7 +235,6 @@ Gem::Specification.new do |s|
      "test/vagrant/commands/suspend_test.rb",
      "test/vagrant/commands/package_test.rb",
      "test/vagrant/commands/status_test.rb",
-     "test/vagrant/commands/down_test.rb",
      "test/vagrant/commands/init_test.rb",
      "test/vagrant/commands/destroy_test.rb",
      "test/vagrant/commands/halt_test.rb",
@@ -224,15 +242,21 @@ Gem::Specification.new do |s|
      "test/vagrant/commands/box/add_test.rb",
      "test/vagrant/commands/box/list_test.rb",
      "test/vagrant/commands/up_test.rb",
+     "test/vagrant/commands/provision_test.rb",
      "test/vagrant/commands/resume_test.rb",
      "test/vagrant/commands/ssh_test.rb",
+     "test/vagrant/resource_logger_test.rb",
      "test/vagrant/downloaders/base_test.rb",
      "test/vagrant/downloaders/file_test.rb",
      "test/vagrant/downloaders/http_test.rb",
      "test/vagrant/util/stacked_proc_runner_test.rb",
-     "test/vagrant/util/progress_meter_test.rb",
+     "test/vagrant/util/output_helper_test.rb",
      "test/vagrant/util/template_renderer_test.rb",
-     "test/vagrant/util/errors_test.rb",
+     "test/vagrant/util/translator_test.rb",
+     "test/vagrant/util/platform_test.rb",
+     "test/vagrant/util/error_helper_test.rb",
+     "test/vagrant/util/plain_logger_test.rb",
+     "test/vagrant/ssh_session_test.rb",
      "test/vagrant/ssh_test.rb"
   ]
 
@@ -241,14 +265,14 @@ 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.6.1"])
+      s.add_runtime_dependency(%q<virtualbox>, ["~> 0.7.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<archive-tar-minitar>, ["= 0.5.2"])
       s.add_runtime_dependency(%q<mario>, ["~> 0.0.6"])
     else
-      s.add_dependency(%q<virtualbox>, ["~> 0.6.1"])
+      s.add_dependency(%q<virtualbox>, ["~> 0.7.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"])
@@ -256,7 +280,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mario>, ["~> 0.0.6"])
     end
   else
-    s.add_dependency(%q<virtualbox>, ["~> 0.6.1"])
+    s.add_dependency(%q<virtualbox>, ["~> 0.7.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"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-05-21 00:00:00.000000000 Z
+date: 2010-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtualbox
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,7 @@ files:
 - lib/vagrant/actions/vm/halt.rb
 - lib/vagrant/actions/vm/import.rb
 - lib/vagrant/actions/vm/move_hard_drive.rb
+- lib/vagrant/actions/vm/network.rb
 - lib/vagrant/actions/vm/package.rb
 - lib/vagrant/actions/vm/provision.rb
 - lib/vagrant/actions/vm/reload.rb
@@ -156,10 +157,10 @@ files:
 - 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/provision.rb
 - lib/vagrant/commands/reload.rb
 - lib/vagrant/commands/resume.rb
 - lib/vagrant/commands/ssh.rb
@@ -176,20 +177,29 @@ files:
 - lib/vagrant/provisioners/chef.rb
 - lib/vagrant/provisioners/chef_server.rb
 - lib/vagrant/provisioners/chef_solo.rb
+- lib/vagrant/resource_logger.rb
 - lib/vagrant/ssh.rb
+- lib/vagrant/systems/base.rb
+- lib/vagrant/systems/linux.rb
 - lib/vagrant/util.rb
-- lib/vagrant/util/errors.rb
+- lib/vagrant/util/error_helper.rb
+- lib/vagrant/util/glob_loader.rb
+- lib/vagrant/util/output_helper.rb
+- lib/vagrant/util/plain_logger.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/util/translator.rb
 - lib/vagrant/vm.rb
 - templates/Vagrantfile.erb
 - templates/chef_server_client.erb
 - templates/chef_solo_solo.erb
-- templates/errors.yml
+- templates/crontab_entry.erb
+- templates/network_entry.erb
 - templates/package_Vagrantfile.erb
 - templates/ssh_config.erb
+- templates/strings.yml
+- templates/sync.erb
 - test/test_helper.rb
 - test/vagrant/actions/base_test.rb
 - test/vagrant/actions/box/add_test.rb
@@ -208,6 +218,7 @@ files:
 - test/vagrant/actions/vm/halt_test.rb
 - test/vagrant/actions/vm/import_test.rb
 - test/vagrant/actions/vm/move_hard_drive_test.rb
+- test/vagrant/actions/vm/network_test.rb
 - test/vagrant/actions/vm/package_test.rb
 - test/vagrant/actions/vm/provision_test.rb
 - test/vagrant/actions/vm/reload_test.rb
@@ -225,10 +236,10 @@ files:
 - 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/provision_test.rb
 - test/vagrant/commands/reload_test.rb
 - test/vagrant/commands/resume_test.rb
 - test/vagrant/commands/ssh_config_test.rb
@@ -245,11 +256,17 @@ files:
 - test/vagrant/provisioners/chef_server_test.rb
 - test/vagrant/provisioners/chef_solo_test.rb
 - test/vagrant/provisioners/chef_test.rb
+- test/vagrant/resource_logger_test.rb
+- test/vagrant/ssh_session_test.rb
 - test/vagrant/ssh_test.rb
-- test/vagrant/util/errors_test.rb
-- test/vagrant/util/progress_meter_test.rb
+- test/vagrant/systems/linux_test.rb
+- test/vagrant/util/error_helper_test.rb
+- test/vagrant/util/output_helper_test.rb
+- test/vagrant/util/plain_logger_test.rb
+- test/vagrant/util/platform_test.rb
 - test/vagrant/util/stacked_proc_runner_test.rb
 - test/vagrant/util/template_renderer_test.rb
+- test/vagrant/util/translator_test.rb
 - test/vagrant/util_test.rb
 - test/vagrant/vm_test.rb
 - vagrant.gemspec
@@ -289,6 +306,7 @@ test_files:
 - test/vagrant/provisioners/chef_test.rb
 - test/vagrant/provisioners/chef_server_test.rb
 - test/vagrant/provisioners/chef_solo_test.rb
+- test/vagrant/systems/linux_test.rb
 - test/vagrant/config_test.rb
 - test/vagrant/actions/base_test.rb
 - test/vagrant/actions/runner_test.rb
@@ -309,6 +327,7 @@ test_files:
 - test/vagrant/actions/vm/import_test.rb
 - test/vagrant/actions/vm/customize_test.rb
 - test/vagrant/actions/vm/start_test.rb
+- test/vagrant/actions/vm/network_test.rb
 - test/vagrant/actions/vm/move_hard_drive_test.rb
 - test/vagrant/actions/vm/up_test.rb
 - test/vagrant/actions/vm/export_test.rb
@@ -322,7 +341,6 @@ test_files:
 - test/vagrant/commands/suspend_test.rb
 - test/vagrant/commands/package_test.rb
 - test/vagrant/commands/status_test.rb
-- test/vagrant/commands/down_test.rb
 - test/vagrant/commands/init_test.rb
 - test/vagrant/commands/destroy_test.rb
 - test/vagrant/commands/halt_test.rb
@@ -330,14 +348,20 @@ test_files:
 - test/vagrant/commands/box/add_test.rb
 - test/vagrant/commands/box/list_test.rb
 - test/vagrant/commands/up_test.rb
+- test/vagrant/commands/provision_test.rb
 - test/vagrant/commands/resume_test.rb
 - test/vagrant/commands/ssh_test.rb
+- test/vagrant/resource_logger_test.rb
 - test/vagrant/downloaders/base_test.rb
 - test/vagrant/downloaders/file_test.rb
 - test/vagrant/downloaders/http_test.rb
 - test/vagrant/util/stacked_proc_runner_test.rb
-- test/vagrant/util/progress_meter_test.rb
+- test/vagrant/util/output_helper_test.rb
 - test/vagrant/util/template_renderer_test.rb
-- test/vagrant/util/errors_test.rb
+- test/vagrant/util/translator_test.rb
+- test/vagrant/util/platform_test.rb
+- test/vagrant/util/error_helper_test.rb
+- test/vagrant/util/plain_logger_test.rb
+- test/vagrant/ssh_session_test.rb
 - test/vagrant/ssh_test.rb
 has_rdoc: 

data/lib/vagrant/commands/down.rb

@@ -1,16 +0,0 @@
-module Vagrant
-  class Commands
-    # `vagrant down` is now `vagrant destroy`
-    class Down < Base
-      Base.subcommand "down", self
-
-      def execute(args=[])
-        error_and_exit(:command_deprecation_down)
-      end
-
-      def options_spec(opts)
-        opts.banner = "Usage: vagrant down"
-      end
-    end
-  end
-end

data/lib/vagrant/util/errors.rb

@@ -1,36 +0,0 @@
-require 'yaml'
-
-module Vagrant
-  module Util
-    # This class is responsible for outputting errors. It retrieves the errors,
-    # based on their key, from the error file, and then outputs it.
-    class Errors
-      @@errors = nil
-
-      class <<self
-        # Resets the internal errors hash to nil, forcing a reload on the next
-        # access of {errors}.
-        def reset!
-          @@errors = nil
-        end
-
-        # Returns the hash of errors from the error YML files. This only loads once,
-        # then returns a cached value until {reset!} is called.
-        #
-        # @return [Hash]
-        def errors
-          @@errors ||= YAML.load_file(File.join(PROJECT_ROOT, "templates", "errors.yml"))
-        end
-
-        # Renders the error with the given key and data parameters and returns
-        # the rendered result.
-        #
-        # @return [String]
-        def error_string(key, data = {})
-          template = errors[key] || "Unknown error key: #{key}"
-          TemplateRenderer.render_string(template, data)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/util/progress_meter.rb

@@ -1,33 +0,0 @@
-module Vagrant
-  module Util
-    # A mixin which allows any class to be able to show a "progress meter"
-    # to standard out. The progress meter shows the progress of an operation
-    # with console-animated text in stdout.
-    module ProgressMeter
-      # Updates the progress meter with the given progress amount and total.
-      # This method will do the math to figure out a percentage and show it
-      # within stdout.
-      #
-      # @param [Float] progress Progress
-      # @param [Float] total Total
-      def update_progress(progress, total, show_parts=true)
-        percent = (progress.to_f / total.to_f) * 100
-        print "#{cl_reset}Progress: #{percent.to_i}%"
-        print " (#{progress} / #{total})" if show_parts
-        $stdout.flush
-      end
-
-      # Completes the progress meter by resetting it off of the screen.
-      def complete_progress
-        # Just clear the line back out
-        print "#{cl_reset}"
-      end
-
-      def cl_reset
-        reset = "\r"
-        reset += "\e[0K" unless Mario::Platform.windows?
-        reset
-      end
-    end
-  end
-end

data/test/vagrant/commands/down_test.rb

@@ -1,17 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
-
-class CommandsDownTest < Test::Unit::TestCase
-  setup do
-    @klass = Vagrant::Commands::Down
-
-    @env = mock_environment
-    @instance = @klass.new(@env)
-  end
-
-  context "executing" do
-    should "just error and exit" do
-      @instance.expects(:error_and_exit).with(:command_deprecation_down)
-      @instance.execute
-    end
-  end
-end