vagrantup 0.7.8 → 0.8.0

data/test/vagrant/ssh_test.rb

@@ -20,10 +20,8 @@ class SshTest < Test::Unit::TestCase
       mock_ssh
       @ssh.stubs(:check_key_permissions)
       @ssh.stubs(:port).returns(2222)
-      Kernel.stubs(:exec)
+      @ssh.stubs(:safe_exec)
       Kernel.stubs(:system).returns(true)
-
-      Vagrant::Util::Platform.stubs(:leopard?).returns(false)
     end
 
     should "raise an exception if SSH is not found" do
@@ -41,7 +39,7 @@ class SshTest < Test::Unit::TestCase
     should "check key permissions prior to exec" do
       exec_seq = sequence("exec_seq")
       @ssh.expects(:check_key_permissions).with(@env.config.ssh.private_key_path).once.in_sequence(exec_seq)
-      Kernel.expects(:exec).in_sequence(exec_seq)
+      @ssh.expects(:safe_exec).in_sequence(exec_seq)
       @ssh.connect
     end
 
@@ -81,42 +79,20 @@ class SshTest < Test::Unit::TestCase
       @ssh.connect
     end
 
-    context "on leopard" do
-      setup do
-        Vagrant::Util::Platform.stubs(:leopard?).returns(true)
-      end
-
-      teardown do
-        Vagrant::Util::Platform.stubs(:leopard?).returns(false)
-      end
-
-      should "fork, exec, and wait" do
-        pid = mock("pid")
-        @ssh.expects(:fork).once.returns(pid)
-        Process.expects(:wait).with(pid)
-
-        @ssh.connect
-      end
-    end
-
     context "checking windows" do
-      teardown do
-        Mario::Platform.forced = Mario::Platform::Linux
-      end
-
       should "error and exit if the platform is windows" do
-        Mario::Platform.forced = Mario::Platform::Windows7
+        Vagrant::Util::Platform.stubs(:windows?).returns(true)
         assert_raises(Vagrant::Errors::SSHUnavailableWindows) { @ssh.connect }
       end
 
       should "not error and exit if the platform is anything other that windows" do
-        Mario::Platform.forced = Mario::Platform::Linux
+        Vagrant::Util::Platform.stubs(:windows?).returns(false)
         assert_nothing_raised { @ssh.connect }
       end
     end
 
     def ssh_exec_expect(port, key_path, uname, host)
-      Kernel.expects(:exec).with() do |arg|
+      @ssh.expects(:safe_exec).with() do |arg|
         assert arg =~ /^ssh/, "ssh command expected"
         assert arg =~ /-p #{port}/, "-p #{port} expected"
         assert arg =~ /-i #{key_path}/, "-i #{key_path} expected"
@@ -171,7 +147,7 @@ class SshTest < Test::Unit::TestCase
 
     should "yield an SSH session object" do
       raw = mock("raw")
-      Net::SSH.expects(:start).yields(raw)
+      Net::SSH.expects(:start).returns(raw)
       @ssh.execute do |ssh|
         assert ssh.is_a?(Vagrant::SSH::Session)
         assert_equal raw, ssh.session
@@ -227,13 +203,6 @@ class SshTest < Test::Unit::TestCase
       }
     end
 
-    should "return false if the connection is dropped" do
-      Net::SSH.expects(:start).raises(Net::SSH::Disconnect)
-      assert_nothing_raised {
-        assert !@ssh.up?
-      }
-    end
-
     should "specifity the timeout as an option to execute" do
       @ssh.expects(:execute).yields(true).with() do |opts|
         assert_equal @env.config.ssh.timeout, opts[:timeout]
@@ -276,15 +245,11 @@ class SshTest < Test::Unit::TestCase
       @stat.stubs(:owned?).returns(true)
       File.stubs(:stat).returns(@stat)
 
-      Mario::Platform.forced = Mario::Platform::Linux
-    end
-
-    teardown do
-      Mario::Platform.forced = Mario::Platform::Linux
+      Vagrant::Util::Platform.stubs(:windows?).returns(false)
     end
 
     should "do nothing if on windows" do
-      Mario::Platform.forced = Mario::Platform::Windows7
+      Vagrant::Util::Platform.stubs(:windows?).returns(true)
       File.expects(:stat).never
       @ssh.check_key_permissions(@key_path)
     end

data/test/vagrant/systems/linux_test.rb

@@ -31,15 +31,17 @@ class LinuxSystemTest < Test::Unit::TestCase
     setup do
       @name = "foo"
       @guestpath = "/bar"
+      @owner = "owner"
+      @group = "group"
     end
 
     should "create the dir, mount the folder, then set permissions" do
       mount_seq = sequence("mount_seq")
       @ssh.expects(:exec!).with("sudo mkdir -p #{@guestpath}").in_sequence(mount_seq)
-      @instance.expects(:mount_folder).with(@ssh, @name, @guestpath).in_sequence(mount_seq)
-      @ssh.expects(:exec!).with("sudo chown #{@vm.env.config.ssh.username} #{@guestpath}").in_sequence(mount_seq)
+      @instance.expects(:mount_folder).with(@ssh, @name, @guestpath, @owner, @group).in_sequence(mount_seq)
+      @ssh.expects(:exec!).with("sudo chown `id -u #{@owner}`:`id -g #{@group}` #{@guestpath}").in_sequence(mount_seq)
 
-      @instance.mount_shared_folder(@ssh, @name, @guestpath)
+      @instance.mount_shared_folder(@ssh, @name, @guestpath, @owner, @group)
     end
   end
 
@@ -50,6 +52,8 @@ class LinuxSystemTest < Test::Unit::TestCase
     setup do
       @name = "foo"
       @guestpath = "bar"
+      @owner = "owner"
+      @group = "group"
       @sleeptime = 0
       @limit = 10
 
@@ -57,11 +61,11 @@ class LinuxSystemTest < Test::Unit::TestCase
     end
 
     def mount_folder
-      @instance.mount_folder(@ssh, @name, @guestpath, @sleeptime)
+      @instance.mount_folder(@ssh, @name, @guestpath, @owner, @group, @sleeptime)
     end
 
     should "execute the proper mount command" do
-      @ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=`id -u #{@vm.env.config.ssh.username}`,gid=`id -g #{@vm.env.config.ssh.username}` #{@name} #{@guestpath}").returns(@success_return)
+      @ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=`id -u #{@owner}`,gid=`id -g #{@group}` #{@name} #{@guestpath}").returns(@success_return)
       mount_folder
     end
 
@@ -96,19 +100,5 @@ class LinuxSystemTest < Test::Unit::TestCase
         mount_folder
       }
     end
-
-    should "add uid AND gid to mount" do
-      uid = "foo"
-      gid = "bar"
-      env = vagrant_env(vagrantfile(<<-vf))
-        config.vm.shared_folder_uid = "#{uid}"
-        config.vm.shared_folder_gid = "#{gid}"
-      vf
-
-      @vm.stubs(:env).returns(env)
-
-      @ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=`id -u #{uid}`,gid=`id -g #{gid}` #{@name} #{@guestpath}").returns(@success_return)
-      mount_folder
-    end
   end
 end

data/test/vagrant/util/counter_test.rb

@@ -0,0 +1,29 @@
+require "test_helper"
+
+class CounterUtilTest < Test::Unit::TestCase
+  setup do
+    @klass = Class.new do
+      extend Vagrant::Util::Counter
+    end
+  end
+
+  context "basic counter" do
+    should "get and update the counter" do
+      assert_equal 1, @klass.get_and_update_counter
+      assert_equal 2, @klass.get_and_update_counter
+    end
+  end
+
+  context "multiple classes with a counter" do
+    setup do
+      @klass2 = Class.new do
+        extend Vagrant::Util::Counter
+      end
+    end
+
+    should "not affect other classes" do
+      assert_equal 1, @klass.get_and_update_counter
+      assert_equal 1, @klass2.get_and_update_counter
+    end
+  end
+end

data/test/vagrant/util/platform_test.rb

@@ -6,12 +6,12 @@ class PlatformTest < Test::Unit::TestCase
       # This constant is not defined on non-windows platforms, so define it here
       File::BINARY = 4096 unless defined?(File::BINARY)
 
-      Mario::Platform.expects(:windows?).returns(true)
+      Vagrant::Util::Platform.stubs(:windows?).returns(true)
       assert_equal Vagrant::Util::Platform.tar_file_options, File::CREAT|File::EXCL|File::WRONLY|File::BINARY
     end
 
     should "not include binary bit on other platforms" do
-      Mario::Platform.expects(:windows?).returns(false)
+      Vagrant::Util::Platform.stubs(:windows?).returns(false)
       assert_equal Vagrant::Util::Platform.tar_file_options, File::CREAT|File::EXCL|File::WRONLY
     end
   end

data/vagrant.gemspec

@@ -17,12 +17,11 @@ Gem::Specification.new do |s|
   s.add_dependency "archive-tar-minitar", "= 0.5.2"
   s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "json", "~> 1.5.1"
-  s.add_dependency "mario", "~> 0.0.6"
   s.add_dependency "net-ssh", "~> 2.1.4"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "thor", "~> 0.14.6"
-  s.add_dependency "virtualbox", "~> 0.8.3"
+  s.add_dependency "virtualbox", "~> 0.9.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -53,20 +53,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: mario
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +115,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -254,12 +240,14 @@ files:
 - lib/vagrant/action/vm/host_name.rb
 - lib/vagrant/action/vm/import.rb
 - lib/vagrant/action/vm/match_mac_address.rb
+- lib/vagrant/action/vm/modify.rb
 - lib/vagrant/action/vm/network.rb
 - lib/vagrant/action/vm/nfs.rb
 - lib/vagrant/action/vm/nfs_helpers.rb
 - lib/vagrant/action/vm/package.rb
 - lib/vagrant/action/vm/package_vagrantfile.rb
 - lib/vagrant/action/vm/provision.rb
+- lib/vagrant/action/vm/provisioner_cleanup.rb
 - lib/vagrant/action/vm/resume.rb
 - lib/vagrant/action/vm/share_folders.rb
 - lib/vagrant/action/vm/suspend.rb
@@ -314,7 +302,7 @@ files:
 - lib/vagrant/provisioners.rb
 - lib/vagrant/provisioners/base.rb
 - lib/vagrant/provisioners/chef.rb
-- lib/vagrant/provisioners/chef_server.rb
+- lib/vagrant/provisioners/chef_client.rb
 - lib/vagrant/provisioners/chef_solo.rb
 - lib/vagrant/provisioners/puppet.rb
 - lib/vagrant/provisioners/puppet_server.rb
@@ -331,16 +319,17 @@ files:
 - lib/vagrant/systems/linux/error.rb
 - lib/vagrant/systems/redhat.rb
 - lib/vagrant/systems/solaris.rb
+- lib/vagrant/systems/suse.rb
 - lib/vagrant/systems/ubuntu.rb
 - lib/vagrant/test_helpers.rb
 - lib/vagrant/ui.rb
 - lib/vagrant/util.rb
 - lib/vagrant/util/busy.rb
+- lib/vagrant/util/counter.rb
 - lib/vagrant/util/hash_with_indifferent_access.rb
-- lib/vagrant/util/plain_logger.rb
 - lib/vagrant/util/platform.rb
-- lib/vagrant/util/resource_logger.rb
 - lib/vagrant/util/retryable.rb
+- lib/vagrant/util/safe_exec.rb
 - lib/vagrant/util/stacked_proc_runner.rb
 - lib/vagrant/util/template_renderer.rb
 - lib/vagrant/version.rb
@@ -387,12 +376,14 @@ files:
 - test/vagrant/action/vm/host_name_test.rb
 - test/vagrant/action/vm/import_test.rb
 - test/vagrant/action/vm/match_mac_address_test.rb
+- test/vagrant/action/vm/modify_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/provision_test.rb
+- test/vagrant/action/vm/provisioner_cleanup_test.rb
 - test/vagrant/action/vm/resume_test.rb
 - test/vagrant/action/vm/share_folders_test.rb
 - test/vagrant/action/vm/suspend_test.rb
@@ -423,7 +414,7 @@ files:
 - test/vagrant/hosts/linux_test.rb
 - test/vagrant/plugin_test.rb
 - test/vagrant/provisioners/base_test.rb
-- test/vagrant/provisioners/chef_server_test.rb
+- test/vagrant/provisioners/chef_client_test.rb
 - test/vagrant/provisioners/chef_solo_test.rb
 - test/vagrant/provisioners/chef_test.rb
 - test/vagrant/provisioners/puppet_server_test.rb
@@ -435,10 +426,9 @@ files:
 - test/vagrant/systems/linux_test.rb
 - test/vagrant/ui_test.rb
 - test/vagrant/util/busy_test.rb
+- test/vagrant/util/counter_test.rb
 - test/vagrant/util/hash_with_indifferent_access_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/retryable_test.rb
 - test/vagrant/util/stacked_proc_runner_test.rb
 - test/vagrant/util/template_renderer_test.rb

data/lib/vagrant/util/plain_logger.rb

@@ -1,25 +0,0 @@
-require 'logger'
-
-module Vagrant
-  module Util
-    # Subclass of the standard library logger which has no format on
-    # its own. The message sent to the logger is outputted as-is.
-    class PlainLogger < ::Logger
-      # This is the method which is called for all debug, info, error,
-      # etc. methods by the logger. This is overriden to verify that
-      # the output is always flushed.
-      #
-      # Logger by default syncs all log devices but this just verifies
-      # it is truly flushed.
-      def add(*args)
-        super
-        @logdev.dev.flush if @logdev
-      end
-
-      def format_message(level, time, progname, msg)
-        # We do no formatting, its up to the user
-        "#{msg}\n"
-      end
-    end
-  end
-end

data/lib/vagrant/util/resource_logger.rb

@@ -1,63 +0,0 @@
-require 'thread'
-
-module Vagrant
-  module Util
-    # Represents a logger for a specific resource within Vagrant. Each
-    # logger should be initialized and set to represent a single
-    # resource. Each logged message will then appear in the following
-    # format:
-    #
-    #     [resource] message
-    #
-    # This class is thread safe. The backing class which actually does
-    # all the logging IO is protected.
-    class ResourceLogger
-      @@singleton_logger = nil
-      @@writer_lock = Mutex.new
-
-      # The resource which this logger represents.
-      attr_reader :resource
-
-      # The environment that this logger is part of
-      attr_reader :env
-
-      # The backing logger which actually handles the IO. This logger
-      # should be a subclass of the standard library Logger, in general.
-      # IMPORTANT: This logger must be thread-safe.
-      attr_reader :logger
-
-      class << self
-        # Returns a singleton logger. If one has not yet be
-        # instantiated, then the given environment will be used to
-        # create a new logger.
-        def singleton_logger(env=nil)
-          return PlainLogger.new(nil) if !env.loaded?
-
-          @@singleton_logger ||= begin
-            file = env.log_path.join("#{Time.now.to_i}.log")
-            PlainLogger.new(file)
-          end
-        end
-
-        # Resets the singleton logger (only used for testing).
-        def reset_singleton_logger!
-          @@singleton_logger = nil
-        end
-      end
-
-      def initialize(resource, env)
-        @resource = resource
-        @env = env
-        @logger = self.class.singleton_logger(env)
-      end
-
-      [:debug, :info, :error, :fatal].each do |method|
-        define_method(method) do |message|
-          @@writer_lock.synchronize do
-            logger.send(method, "[#{resource}] #{message}")
-          end
-        end
-      end
-    end
-  end
-end

data/test/vagrant/util/plain_logger_test.rb

@@ -1,17 +0,0 @@
-require "test_helper"
-
-class PlainLoggerUtilTest < Test::Unit::TestCase
-  setup do
-    @klass = Vagrant::Util::PlainLogger
-    @instance = @klass.new(nil)
-  end
-
-  should "inherit from the standard logger" do
-    assert @instance.is_a?(::Logger)
-  end
-
-  should "just add a newline to the message" do
-    msg = "foo bar baz"
-    assert_equal "#{msg}\n", @instance.format_message("1", "2", "3", msg)
-  end
-end