vagrantup 0.5.2 → 0.5.3

data/test/vagrant/util/translator_test.rb

@@ -0,0 +1,61 @@
+require "test_helper"
+
+class TranslatorUtilTest < Test::Unit::TestCase
+  include Vagrant::Util
+
+  setup do
+    @klass = Translator
+  end
+
+  context "loading the errors from the YML" do
+    setup do
+      YAML.stubs(:load_file)
+      @klass.reset!
+    end
+
+    should "load the file initially, then never again unless reset" do
+      YAML.expects(:load_file).with(File.join(PROJECT_ROOT, "templates", "strings.yml")).once
+      @klass.strings
+      @klass.strings
+      @klass.strings
+      @klass.strings
+    end
+
+    should "reload if reset! is called" do
+      YAML.expects(:load_file).with(File.join(PROJECT_ROOT, "templates", "strings.yml")).twice
+      @klass.strings
+      @klass.reset!
+      @klass.strings
+    end
+  end
+
+  context "getting the string translated" do
+    setup do
+      @strings = {}
+      @strings[:foo] = "foo bar baz"
+      @klass.stubs(:strings).returns(@strings)
+    end
+
+    should "render the error string" do
+      TemplateRenderer.expects(:render_string).with(@strings[:foo], anything).once
+      @klass.t(:foo)
+    end
+
+    should "pass in any data entries" do
+      data = mock("data")
+      TemplateRenderer.expects(:render_string).with(@strings[:foo], data).once
+      @klass.t(:foo, data)
+    end
+
+    should "return the result of the render" do
+      result = mock("result")
+      TemplateRenderer.expects(:render_string).returns(result)
+      assert_equal result, @klass.t(:foo)
+    end
+
+    should "return an unknown if the key doesn't exist" do
+      result = @klass.t(:unknown)
+      assert result =~ /Unknown/i
+    end
+  end
+end

data/test/vagrant/util_test.rb

@@ -0,0 +1,27 @@
+require "test_helper"
+
+class UtilTest < Test::Unit::TestCase
+  class UtilIncludeTest
+    include Vagrant::Util
+  end
+
+  setup do
+    @klass = UtilIncludeTest
+  end
+
+  context "with a class" do
+    should "have the util methods" do
+      assert @klass.respond_to?(:error_and_exit)
+    end
+  end
+
+  context "with an instance" do
+    setup do
+      @instance = @klass.new
+    end
+
+    should "have the util methods" do
+      assert @instance.respond_to?(:error_and_exit)
+    end
+  end
+end

data/test/vagrant/vm_test.rb

@@ -0,0 +1,228 @@
+require "test_helper"
+
+class VMTest < Test::Unit::TestCase
+  setup do
+    @mock_vm = mock("vm")
+
+    @persisted_vm = mock("persisted_vm")
+
+    @env = mock_environment
+    @env.stubs(:vm).returns(@persisted_vm)
+
+    Net::SSH.stubs(:start)
+  end
+
+  context "finding a VM" do
+    should "return return an uncreated VM object if the VM is not found" do
+      VirtualBox::VM.expects(:find).returns(nil)
+      result = Vagrant::VM.find("foo")
+      assert result.is_a?(Vagrant::VM)
+      assert !result.created?
+    end
+
+    should "return a Vagrant::VM object for that VM if found" do
+      VirtualBox::VM.expects(:find).with("foo").returns("bar")
+      result = Vagrant::VM.find("foo", mock_environment)
+      assert result.is_a?(Vagrant::VM)
+      assert_equal "bar", result.vm
+    end
+  end
+
+  context "vagrant VM instance" do
+    setup do
+      @vm_name = "foo"
+      @vm = Vagrant::VM.new(:env => @env, :vm => @mock_vm, :vm_name => @vm_name)
+      @mock_vm.stubs(:uuid).returns("foo")
+    end
+
+    context "checking if created" do
+      should "return true if the VM object is not nil" do
+        @vm.stubs(:vm).returns(:foo)
+        assert @vm.created?
+      end
+
+      should "return false if the VM object is nil" do
+        @vm.stubs(:vm).returns(nil)
+        assert !@vm.created?
+      end
+    end
+
+    context "accessing the SSH object" do
+      setup do
+        # Reset this to nil to force the reload
+        @vm.instance_variable_set(:@ssh, nil)
+
+        @ssh = mock("ssh")
+        Vagrant::SSH.stubs(:new).returns(@ssh)
+      end
+
+      should "load it the first time" do
+        Vagrant::SSH.expects(:new).with(@vm.env).once.returns(@ssh)
+        @vm.ssh
+        @vm.ssh
+        @vm.ssh
+      end
+
+      should "use the same value once its loaded" do
+        result = @vm.ssh
+        assert_equal result, @vm.ssh
+      end
+    end
+
+    context "loading associated system" do
+      should "error and exit if system is not specified" do
+        @vm.env.config.vm.system = nil
+
+        @vm.expects(:error_and_exit).with(:system_unspecified).once
+        @vm.load_system!
+      end
+
+      context "with a class" do
+        class FakeSystemClass
+          def initialize(vm); end
+        end
+
+        should "initialize class if given" do
+          @vm.env.config.vm.system = Vagrant::Systems::Linux
+
+          @vm.expects(:error_and_exit).never
+          @vm.load_system!
+
+          assert @vm.system.is_a?(Vagrant::Systems::Linux)
+        end
+
+        should "error and exit if class has invalid parent" do
+          @vm.env.config.vm.system = FakeSystemClass
+          @vm.expects(:error_and_exit).with(:system_invalid_class, :system => @vm.env.config.vm.system.to_s).once
+          @vm.load_system!
+        end
+      end
+
+      context "with a symbol" do
+        should "initialize proper symbols" do
+          valid = {
+            :linux => Vagrant::Systems::Linux
+          }
+
+          valid.each do |symbol, klass|
+            @vm.env.config.vm.system = symbol
+            @vm.expects(:error_and_exit).never
+            @vm.load_system!
+
+            assert @vm.system.is_a?(klass)
+            assert_equal @vm, @vm.system.vm
+          end
+        end
+
+        should "error and exit with invalid symbol" do
+          @vm.env.config.vm.system = :shall_never_exist
+          @vm.expects(:error_and_exit).with(:system_unknown_type, :system => @vm.env.config.vm.system.to_s).once
+          @vm.load_system!
+        end
+      end
+    end
+
+    context "uuid" do
+      should "call UUID on VM object" do
+        uuid = mock("uuid")
+        @mock_vm.expects(:uuid).once.returns(uuid)
+        assert_equal uuid, @vm.uuid
+      end
+
+      should "return nil if vm is nil" do
+        @vm.expects(:vm).returns(nil)
+        assert @vm.uuid.nil?
+      end
+    end
+
+    context "reloading" do
+      should "load the same VM and set it" do
+        new_vm = mock("vm")
+        VirtualBox::VM.expects(:find).with(@mock_vm.uuid).returns(new_vm)
+        @vm.reload!
+        assert_equal new_vm, @vm.vm
+      end
+    end
+
+    context "packaging" do
+      should "execute the package action" do
+        @vm.env.actions.expects(:run).with(:package, :foo => :bar).once
+        @vm.package(:foo => :bar)
+      end
+    end
+
+    context "upping" do
+      should "execute the up action" do
+        @vm.env.actions.expects(:run).with(:up, nil).once
+        @vm.up
+      end
+    end
+
+    context "halting" do
+      should "execute the halt action" do
+        @vm.env.actions.expects(:run).with(:halt, :foo => :bar).once
+        @vm.halt({:foo => :bar})
+      end
+    end
+
+    context "reloading action" do
+      should "execute the reload action" do
+        @vm.env.actions.expects(:run).with(:reload).once
+        @vm.reload
+      end
+    end
+
+    context "provisioning" do
+      should "execute the provision action" do
+        @vm.env.actions.expects(:run).with(:provision).once
+        @vm.provision
+      end
+    end
+
+    context "destroying" do
+      should "execute the destroy action" do
+        @vm.env.actions.expects(:run).with(:destroy).once
+        @vm.destroy
+      end
+    end
+
+    context "suspending" do
+      should "execute the suspend action" do
+        @vm.env.actions.expects(:run).with(:suspend).once
+        @vm.suspend
+      end
+    end
+
+    context "resuming" do
+      should "execute the resume action" do
+        @vm.env.actions.expects(:run).with(:resume).once
+        @vm.resume
+      end
+    end
+
+    context "starting" do
+      setup do
+        @mock_vm.stubs(:running?).returns(false)
+        @mock_vm.stubs(:saved?).returns(false)
+      end
+
+      should "not do anything if the VM is already running" do
+        @mock_vm.stubs(:running?).returns(true)
+        @vm.expects(:execute!).never
+        @vm.start
+      end
+
+      should "execute the resume action if saved" do
+        @mock_vm.expects(:saved?).returns(true)
+        @vm.expects(:resume).once
+        @vm.env.actions.expects(:run).with(:start).never
+        @vm.start
+      end
+
+      should "execute the start action" do
+        @vm.env.actions.expects(:run).with(:start).once
+        @vm.start
+      end
+    end
+  end
+end

data/vagrant.gemspec

@@ -0,0 +1,34 @@
+require File.expand_path("../lib/vagrant/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name          = "vagrantup"
+  s.version       = Vagrant::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = ["Mitchell Hashimoto", "John Bender"]
+  s.email         = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
+  s.homepage      = "http://vagrantup.com"
+  s.summary       = "Build and distribute virtualized development environments."
+  s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "vagrant"
+
+  s.add_dependency("virtualbox", "~> 0.7.3")
+  s.add_dependency("net-ssh", ">= 2.0.19")
+  s.add_dependency("net-scp", ">= 1.0.2")
+  s.add_dependency("json", ">= 1.4.3")
+  s.add_dependency("archive-tar-minitar", "= 0.5.2")
+  s.add_dependency("mario", "~> 0.0.6")
+  s.add_dependency("erubis", ">= 2.6.6")
+
+  s.add_development_dependency("rake")
+  s.add_development_dependency("contest", ">= 0.1.2")
+  s.add_development_dependency("mocha")
+  s.add_development_dependency("ruby-debug")
+  s.add_development_dependency("bundler", ">= 1.0.0.rc.5")
+
+  s.files         = `git ls-files`.split("\n")
+  s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path  = 'lib'
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -95,6 +95,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,22 +165,47 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc.5
 description: Vagrant is a tool for building and distributing virtualized development
   environments.
 email:
 - mitchell.hashimoto@gmail.com
 - john.m.bender@gmail.com
 executables:
+- .gitignore
 - vagrant
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
+- bin/.gitignore
 - bin/vagrant
 - config/default.rb
 - keys/README.md
 - keys/vagrant
 - keys/vagrant.ppk
 - keys/vagrant.pub
+- lib/vagrant.rb
+- lib/vagrant/action.rb
 - lib/vagrant/action/action_exception.rb
 - lib/vagrant/action/box/destroy.rb
 - lib/vagrant/action/box/download.rb
@@ -208,16 +247,15 @@ files:
 - lib/vagrant/action/vm/resume.rb
 - lib/vagrant/action/vm/share_folders.rb
 - lib/vagrant/action/vm/suspend.rb
-- lib/vagrant/action.rb
 - lib/vagrant/active_list.rb
 - lib/vagrant/box.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/box/repackage.rb
-- lib/vagrant/commands/box.rb
 - lib/vagrant/commands/destroy.rb
 - lib/vagrant/commands/halt.rb
 - lib/vagrant/commands/init.rb
@@ -246,6 +284,7 @@ files:
 - lib/vagrant/ssh.rb
 - lib/vagrant/systems/base.rb
 - lib/vagrant/systems/linux.rb
+- lib/vagrant/util.rb
 - lib/vagrant/util/busy.rb
 - lib/vagrant/util/glob_loader.rb
 - lib/vagrant/util/plain_logger.rb
@@ -254,10 +293,9 @@ files:
 - lib/vagrant/util/stacked_proc_runner.rb
 - lib/vagrant/util/template_renderer.rb
 - lib/vagrant/util/translator.rb
-- lib/vagrant/util.rb
 - lib/vagrant/version.rb
 - lib/vagrant/vm.rb
-- lib/vagrant.rb
+- templates/Vagrantfile.erb
 - templates/chef_server_client.erb
 - templates/chef_solo_solo.erb
 - templates/network_entry.erb
@@ -268,9 +306,92 @@ files:
 - templates/strings.yml
 - templates/unison/crontab_entry.erb
 - templates/unison/script.erb
-- templates/Vagrantfile.erb
-- LICENSE
-- README.md
+- test/test_helper.rb
+- test/vagrant/action/box/destroy_test.rb
+- test/vagrant/action/box/download_test.rb
+- test/vagrant/action/box/package_test.rb
+- test/vagrant/action/box/unpackage_test.rb
+- test/vagrant/action/box/verify_test.rb
+- test/vagrant/action/builder_test.rb
+- test/vagrant/action/env/error_halt_test.rb
+- test/vagrant/action/env/set_test.rb
+- test/vagrant/action/environment_test.rb
+- test/vagrant/action/exception_catcher_test.rb
+- test/vagrant/action/general/package_test.rb
+- test/vagrant/action/vm/boot_test.rb
+- test/vagrant/action/vm/check_box_test.rb
+- test/vagrant/action/vm/check_guest_additions_test.rb
+- test/vagrant/action/vm/clean_machine_folder_test.rb
+- test/vagrant/action/vm/clear_forwarded_ports_test.rb
+- test/vagrant/action/vm/clear_nfs_exports_test.rb
+- test/vagrant/action/vm/clear_shared_folders_test.rb
+- test/vagrant/action/vm/customize_test.rb
+- test/vagrant/action/vm/destroy_test.rb
+- test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb
+- test/vagrant/action/vm/disable_networks_test.rb
+- test/vagrant/action/vm/discard_state_test.rb
+- test/vagrant/action/vm/export_test.rb
+- test/vagrant/action/vm/forward_ports_helpers_test.rb
+- test/vagrant/action/vm/forward_ports_test.rb
+- test/vagrant/action/vm/halt_test.rb
+- test/vagrant/action/vm/import_test.rb
+- test/vagrant/action/vm/match_mac_address_test.rb
+- test/vagrant/action/vm/network_test.rb
+- test/vagrant/action/vm/nfs_helpers_test.rb
+- test/vagrant/action/vm/nfs_test.rb
+- test/vagrant/action/vm/package_test.rb
+- test/vagrant/action/vm/package_vagrantfile_test.rb
+- test/vagrant/action/vm/persist_test.rb
+- test/vagrant/action/vm/provision_test.rb
+- test/vagrant/action/vm/resume_test.rb
+- test/vagrant/action/vm/share_folders_test.rb
+- test/vagrant/action/vm/suspend_test.rb
+- test/vagrant/action_test.rb
+- test/vagrant/active_list_test.rb
+- test/vagrant/box_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/box/repackage_test.rb
+- test/vagrant/commands/destroy_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
+- 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/environment_test.rb
+- test/vagrant/hosts/base_test.rb
+- test/vagrant/hosts/bsd_test.rb
+- test/vagrant/hosts/linux_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_session_test.rb
+- test/vagrant/ssh_test.rb
+- test/vagrant/systems/linux_test.rb
+- test/vagrant/util/busy_test.rb
+- test/vagrant/util/plain_logger_test.rb
+- test/vagrant/util/platform_test.rb
+- test/vagrant/util/resource_logger_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
 homepage: http://vagrantup.com
 licenses: []
 metadata: {}
@@ -287,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: vagrant
 rubygems_version: 2.0.0