vagrantup 0.6.9 → 0.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -87,56 +87,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: virtualbox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -212,12 +212,16 @@ files:
 - Rakefile
 - bin/vagrant
 - config/default.rb
+- contrib/README.md
+- contrib/emacs/vagrant.el
+- contrib/vim/vagrantfile.vim
 - keys/README.md
 - keys/vagrant
 - keys/vagrant.ppk
 - keys/vagrant.pub
 - lib/vagrant.rb
 - lib/vagrant/action.rb
+- lib/vagrant/action/box.rb
 - lib/vagrant/action/box/destroy.rb
 - lib/vagrant/action/box/download.rb
 - lib/vagrant/action/box/package.rb
@@ -225,10 +229,13 @@ files:
 - lib/vagrant/action/box/verify.rb
 - lib/vagrant/action/builder.rb
 - lib/vagrant/action/builtin.rb
+- lib/vagrant/action/env.rb
 - lib/vagrant/action/env/set.rb
 - lib/vagrant/action/environment.rb
+- lib/vagrant/action/general.rb
 - lib/vagrant/action/general/package.rb
 - lib/vagrant/action/general/validate.rb
+- lib/vagrant/action/vm.rb
 - lib/vagrant/action/vm/boot.rb
 - lib/vagrant/action/vm/check_box.rb
 - lib/vagrant/action/vm/check_guest_additions.rb
@@ -239,7 +246,6 @@ files:
 - lib/vagrant/action/vm/customize.rb
 - lib/vagrant/action/vm/destroy.rb
 - lib/vagrant/action/vm/destroy_unused_network_interfaces.rb
-- lib/vagrant/action/vm/disable_networks.rb
 - lib/vagrant/action/vm/discard_state.rb
 - lib/vagrant/action/vm/export.rb
 - lib/vagrant/action/vm/forward_ports.rb
@@ -260,6 +266,7 @@ files:
 - lib/vagrant/box.rb
 - lib/vagrant/box_collection.rb
 - lib/vagrant/cli.rb
+- lib/vagrant/command.rb
 - lib/vagrant/command/base.rb
 - lib/vagrant/command/box.rb
 - lib/vagrant/command/destroy.rb
@@ -285,32 +292,45 @@ files:
 - lib/vagrant/config/nfs.rb
 - lib/vagrant/config/package.rb
 - lib/vagrant/config/ssh.rb
+- lib/vagrant/config/top.rb
 - lib/vagrant/config/vagrant.rb
 - lib/vagrant/config/vm.rb
+- lib/vagrant/config/vm/provisioner.rb
+- lib/vagrant/config/vm/sub_vm.rb
 - lib/vagrant/data_store.rb
+- lib/vagrant/downloaders.rb
 - lib/vagrant/downloaders/base.rb
 - lib/vagrant/downloaders/file.rb
 - lib/vagrant/downloaders/http.rb
 - lib/vagrant/environment.rb
 - lib/vagrant/errors.rb
+- lib/vagrant/hosts.rb
 - lib/vagrant/hosts/base.rb
 - lib/vagrant/hosts/bsd.rb
 - lib/vagrant/hosts/linux.rb
 - lib/vagrant/plugin.rb
+- lib/vagrant/provisioners.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/provisioners/puppet.rb
+- lib/vagrant/provisioners/puppet_server.rb
 - lib/vagrant/ssh.rb
+- lib/vagrant/ssh/session.rb
+- lib/vagrant/systems.rb
 - lib/vagrant/systems/base.rb
+- lib/vagrant/systems/debian.rb
+- lib/vagrant/systems/gentoo.rb
 - lib/vagrant/systems/linux.rb
+- lib/vagrant/systems/linux/config.rb
+- lib/vagrant/systems/linux/error.rb
+- lib/vagrant/systems/redhat.rb
 - lib/vagrant/systems/solaris.rb
 - lib/vagrant/test_helpers.rb
 - lib/vagrant/ui.rb
 - lib/vagrant/util.rb
 - lib/vagrant/util/busy.rb
-- lib/vagrant/util/glob_loader.rb
 - lib/vagrant/util/hash_with_indifferent_access.rb
 - lib/vagrant/util/plain_logger.rb
 - lib/vagrant/util/platform.rb
@@ -325,7 +345,9 @@ files:
 - templates/commands/init/Vagrantfile.erb
 - templates/config/validation_failed.erb
 - templates/locales/en.yml
-- templates/network_entry.erb
+- templates/network_entry_debian.erb
+- templates/network_entry_gentoo.erb
+- templates/network_entry_redhat.erb
 - templates/nfs/exports.erb
 - templates/nfs/exports_linux.erb
 - templates/package_Vagrantfile.erb
@@ -352,7 +374,6 @@ files:
 - 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
@@ -382,6 +403,7 @@ files:
 - test/vagrant/config/error_recorder_test.rb
 - test/vagrant/config/ssh_test.rb
 - test/vagrant/config/vagrant_test.rb
+- test/vagrant/config/vm/provisioner_test.rb
 - test/vagrant/config/vm_test.rb
 - test/vagrant/config_test.rb
 - test/vagrant/data_store_test.rb
@@ -398,9 +420,11 @@ files:
 - test/vagrant/provisioners/chef_server_test.rb
 - test/vagrant/provisioners/chef_solo_test.rb
 - test/vagrant/provisioners/chef_test.rb
+- test/vagrant/provisioners/puppet_server_test.rb
 - test/vagrant/provisioners/puppet_test.rb
-- test/vagrant/ssh_session_test.rb
+- test/vagrant/ssh/session_test.rb
 - test/vagrant/ssh_test.rb
+- test/vagrant/systems/base_test.rb
 - test/vagrant/systems/linux_test.rb
 - test/vagrant/ui_test.rb
 - test/vagrant/util/busy_test.rb

data/lib/vagrant/action/vm/disable_networks.rb

@@ -1,34 +0,0 @@
-module Vagrant
-  class Action
-    module VM
-      # Middleware to disable all host only networks on the
-      # VM
-      class DisableNetworks
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          if env["vm"].created?
-            logged = false
-
-            env["vm"].vm.network_adapters.each do |adapter|
-              next if adapter.attachment_type != :host_only
-
-              if !logged
-                env.ui.info I18n.t("vagrant.actions.vm.disable_networks.disabling")
-                logged = true
-              end
-
-              adapter.enabled = false
-              adapter.save
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/util/glob_loader.rb

@@ -1,24 +0,0 @@
-module Vagrant
-  module Util
-    # Eases the processes of loading specific files then globbing
-    # the rest from a specified directory.
-    module GlobLoader
-      # Glob requires all ruby files in a directory, optionally loading select
-      # files initially (since others may depend on them).
-      #
-      # @param [String] dir The directory to glob
-      # @param [Array<String>] initial_files Initial files (relative to `dir`)
-      #   to load
-      def self.glob_require(dir, initial_files=[])
-        initial_files.each do |file|
-          require File.expand_path(file, dir)
-        end
-
-        # Glob require the rest
-        Dir[File.join(dir, "**", "*.rb")].each do |f|
-          require File.expand_path(f)
-        end
-      end
-    end
-  end
-end

data/test/vagrant/action/vm/disable_networks_test.rb

@@ -1,48 +0,0 @@
-require "test_helper"
-
-class DisableNetworksVMActionTest < Test::Unit::TestCase
-  setup do
-    @klass = Vagrant::Action::VM::DisableNetworks
-    @app, @env = action_env
-
-    @vm = mock("vm")
-    @env.env.stubs(:vm).returns(@vm)
-
-    @internal_vm = mock("internal")
-    @vm.stubs(:created?).returns(true)
-    @vm.stubs(:vm).returns(@internal_vm)
-    @internal_vm.stubs(:network_adapters).returns([])
-
-    @instance = @klass.new(@app, @env)
-  end
-
-  def mock_adapter(type)
-    adapter = mock("adapter")
-    adapter.stubs(:attachment_type).returns(type)
-
-    if type == :host_only
-      adapter.expects(:enabled=).with(false)
-      adapter.expects(:save)
-    end
-
-    @internal_vm.network_adapters << adapter
-  end
-
-  should "do nothing if VM is not created" do
-    @vm.stubs(:created?).returns(false)
-    @vm.expects(:vm).never
-
-    @app.expects(:call).with(@env).once
-    @instance.call(@env)
-  end
-
-  should "remove all network adapters and continue chain" do
-    mock_adapter(:bridged)
-    mock_adapter(:host_only)
-    mock_adapter(:host_only)
-
-    @app.expects(:call).with(@env).once
-
-    @instance.call(@env)
-  end
-end