vagrantup 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc92e2e619dbac827b760b77574e4b440d535014
-  data.tar.gz: cbcffd6e0ecccb39d295d3c5fc8a232999b1a698
+  metadata.gz: dd26596b445951778d89c3df2a9717fef063cdb4
+  data.tar.gz: 69c01579f88b14201c8b394527e3ab39697dc6c5
 SHA512:
-  metadata.gz: 8ad6163d3599889c34dd022c1aa2f7d05d0a8de12966ceec4a955d04ea9d40b4727b3023f9eb18fed4f892ac1a611045f58171b18aec72f9e34ca0ea3e893083
-  data.tar.gz: ec5aa91f91d013efcdaed4b4d7efcbf53ff3644717066f21c24d01a7f0abeb289dbd37c6fdd2522d9155bfcb7742b54d491b67325a0560ad2e9ecac0a25d45e8
+  metadata.gz: 1bea481a61138290f846ac8bbbe49dc2606db3ae0f98b7664da5ab98fda01bf4c8e43026e9762f616f9eed09883ef3bd5a7c5b0beaf8cec141b88030f7417353
+  data.tar.gz: 04418842db9cc9fcd62f96fc53271862515ef035b59ad78caf6fb2476aef7340f6b6629427d7b92c7cd0e5c894415299fb5bb2ab06cddea3d82599947d41b29d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.6.6 (October 14, 2010)
+
+  - `vagrant status NAME` works once again. [GH-191]
+  - Conditional validation of Vagrantfile so that some commands don't validate. [GH-188]
+  - Fix "junk" output for ssh-config. [GH-189]
+  - Fix port collision handling with greater than two VMs. [GH-185]
+  - Fix potential infinite loop with root path if bad CWD is given to environment.
+
 ## 0.6.5 (October 8, 2010)
 
   - Validations on base MAC address to avoid situation described in GH-166, GH-181

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant (0.6.5)
+    vagrant (0.6.6)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)

data/lib/vagrant/action.rb

@@ -90,14 +90,18 @@ module Vagrant
     # Any options given are injected into the environment hash.
     #
     # @param [Object] callable An object which responds to `call`.
-    def run(callable, options=nil)
-      callable = Builder.new.use(callable) if callable.kind_of?(Class)
-      callable = self.class.actions[callable] if callable.kind_of?(Symbol)
-      raise ArgumentError.new("Argument to run must be a callable object or registered action.") if !callable
+    def run(callable_id, options=nil)
+      callable = callable_id
+      callable = Builder.new.use(callable_id) if callable_id.kind_of?(Class)
+      callable = self.class.actions[callable_id] if callable_id.kind_of?(Symbol)
+      raise ArgumentError.new("Argument to run must be a callable object or registered action.") if !callable || !callable.respond_to?(:call)
 
       action_environment = Action::Environment.new(env)
       action_environment.merge!(options || {})
 
+      # Run the before action run callback, if we're not doing that already
+      run(:before_action_run, action_environment) if callable_id != :before_action_run
+
       # Run the action chain in a busy block, marking the environment as
       # interrupted if a SIGINT occurs, and exiting cleanly once the
       # chain has been run.

data/lib/vagrant/action/builtin.rb

@@ -6,15 +6,13 @@ module Vagrant
     # in the future this will no longer be necessary with autoloading.
     def self.builtin!
       # provision - Provisions a running VM
-      provision = Builder.new do
+      register(:provision, Builder.new do
         use VM::Provision
-      end
-
-      register :provision, provision
+      end)
 
       # start - Starts a VM, assuming it already exists on the
       # environment.
-      start = Builder.new do
+      register(:start, Builder.new do
         use VM::CleanMachineFolder
         use VM::Customize
         use VM::ClearForwardedPorts
@@ -25,104 +23,82 @@ module Vagrant
         use VM::ShareFolders
         use VM::Network
         use VM::Boot
-      end
-
-      register :start, start
+      end)
 
       # halt - Halts the VM, attempting gracefully but then forcing
       # a restart if fails.
-      halt = Builder.new do
+      register(:halt, Builder.new do
         use VM::DiscardState
         use VM::Halt
         use VM::DisableNetworks
-      end
-
-      register :halt, halt
+      end)
 
       # suspend - Suspends the VM
-      suspend = Builder.new do
+      register(:suspend, Builder.new do
         use VM::Suspend
-      end
-
-      register :suspend, suspend
+      end)
 
       # resume - Resume a VM
-      resume = Builder.new do
+      register(:resume, Builder.new do
         use VM::Resume
-      end
-
-      register :resume, resume
+      end)
 
       # reload - Halts then restarts the VM
-      reload = Builder.new do
+      register(:reload, Builder.new do
         use Action[:halt]
         use Action[:start]
-      end
-
-      register :reload, reload
+      end)
 
       # up - Imports, prepares, then starts a fresh VM.
-      up = Builder.new do
+      register(:up, Builder.new do
         use VM::CheckBox
         use VM::Import
         use VM::MatchMACAddress
         use VM::CheckGuestAdditions
         use Action[:start]
-      end
-
-      register :up, up
+      end)
 
       # destroy - Halts, cleans up, and destroys an existing VM
-      destroy = Builder.new do
+      register(:destroy, Builder.new do
         use Action[:halt], :force => true
         use VM::ClearNFSExports
         use VM::DestroyUnusedNetworkInterfaces
         use VM::Destroy
         use VM::CleanMachineFolder
-      end
-
-      register :destroy, destroy
+      end)
 
       # package - Export and package the VM
-      package = Builder.new do
+      register(:package, Builder.new do
         use Action[:halt]
         use VM::ClearForwardedPorts
         use VM::ClearSharedFolders
         use VM::Export
         use VM::PackageVagrantfile
         use VM::Package
-      end
-
-      register :package, package
+      end)
 
       # box_add - Download and add a box.
-      box_add = Builder.new do
+      register(:box_add, Builder.new do
         use Box::Download
         use Box::Unpackage
         use Box::Verify
-      end
-
-      register :box_add, box_add
+      end)
 
       # box_remove - Removes/deletes a box.
-      box_remove = Builder.new do
+      register(:box_remove, Builder.new do
         use Box::Destroy
-      end
-
-      register :box_remove, box_remove
+      end)
 
       # box_repackage - Repackages a box.
-      box_repackage = Builder.new do
+      register(:box_repackage, Builder.new do
         use Box::Package
-      end
-
-      register :box_repackage, box_repackage
-
-      # post_load - Called after environment is loaded
-      environment_load = Builder.new do
-      end
+      end)
 
-      register :environment_load, environment_load
+      # Other callbacks. There will be more of these in the future. For
+      # now, these are limited to what are needed internally.
+      register(:before_action_run, Builder.new do
+        use General::Validate
+      end)
     end
   end
 end

data/lib/vagrant/action/general/validate.rb

@@ -0,0 +1,19 @@
+module Vagrant
+  class Action
+    module General
+      # Simply validates the configuration of the current Vagrant
+      # environment.
+      class Validate
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env["config"].validate! if !@env.has_key?("validate") || @env["validate"]
+          @app.call(@env)
+        end
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Vagrant
         def external_collision_check
           existing = used_ports
           @env.env.config.vm.forwarded_ports.each do |name, options|
-            if existing.include?(options[:hostport].to_s)
+            if existing.include?(options[:hostport].to_i)
               handle_collision(name, options, existing)
             end
           end

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

@@ -14,7 +14,7 @@ module Vagrant
             if vm.running? && vm.uuid != @env["vm"].uuid
               vm.network_adapters.collect do |na|
                 na.nat_driver.forwarded_ports.collect do |fp|
-                  fp.hostport.to_s
+                  fp.hostport.to_i
                 end
               end
             end

data/lib/vagrant/box.rb

@@ -58,17 +58,17 @@ module Vagrant
     # is kicked out to the `box_add` registered middleware.
     def add
       raise Errors::BoxAlreadyExists.new(:name => name) if File.directory?(directory)
-      env.actions.run(:box_add, { "box" => self })
+      env.actions.run(:box_add, { "box" => self, "validate" => false })
     end
 
     # Begins the process of destroying this box. This cannot be undone!
     def destroy
-      env.actions.run(:box_remove, { "box" => self })
+      env.actions.run(:box_remove, { "box" => self, "validate" => false })
     end
 
     # Begins sequence to repackage this box.
     def repackage(options=nil)
-      env.actions.run(:box_repackage, { "box" => self }.merge(options || {}))
+      env.actions.run(:box_repackage, { "box" => self, "validate" => false }.merge(options || {}))
     end
 
     # Returns the directory to the location of this boxes content in the local

data/lib/vagrant/command/ssh_config.rb

@@ -9,12 +9,12 @@ module Vagrant
         vm = target_vms.first
         raise Errors::VMNotCreatedError.new if !vm.created?
 
-        env.ui.info(Util::TemplateRenderer.render("ssh_config", {
+        $stdout.puts(Util::TemplateRenderer.render("ssh_config", {
           :host_key => options[:host] || "vagrant",
           :ssh_user => vm.env.config.ssh.username,
           :ssh_port => vm.ssh.port,
           :private_key_path => vm.env.config.ssh.private_key_path
-        }), :prefix => false)
+        }))
       end
     end
   end

data/lib/vagrant/command/status.rb

@@ -1,17 +1,16 @@
 module Vagrant
   module Command
-    class StatusCommand < Base
-      argument :name, :type => :string, :optional => true
+    class StatusCommand < NamedBase
       register "status", "Shows the status of the current Vagrant environment."
 
       def route
         state = nil
-        results = env.vms.collect do |name, vm|
+        results = target_vms.collect do |vm|
           state ||= vm.created? ? vm.vm.state.to_s : "not_created"
-          "#{name.to_s.ljust(25)}#{state.gsub("_", " ")}"
+          "#{vm.name.to_s.ljust(25)}#{state.gsub("_", " ")}"
         end
 
-        state = env.vms.length == 1 ? state : "listing"
+        state = target_vms.length == 1 ? state : "listing"
 
         env.ui.info(I18n.t("vagrant.commands.status.output",
                     :states => results.join("\n"),

data/lib/vagrant/config.rb

@@ -68,13 +68,9 @@ module Vagrant
       # and returns the final configured object. This also validates the
       # configuration by calling {Top#validate!} on every configuration
       # class.
-      def execute!(validate=true)
+      def execute!
         config_object ||= config
         run_procs!(config_object)
-
-        # Validate if we're looking at a config object which represents a
-        # real VM.
-        config_object.validate! if validate && config_object.env.vm
         config_object
       end
     end
@@ -90,7 +86,7 @@ module Vagrant
 
     # Loads the queue of files/procs, executes them in the proper
     # sequence, and returns the resulting configuration object.
-    def load!(validate=true)
+    def load!
       self.class.reset!(@env)
 
       queue.flatten.each do |item|
@@ -106,7 +102,7 @@ module Vagrant
         end
       end
 
-      return self.class.execute!(validate)
+      return self.class.execute!
     end
   end
 

data/lib/vagrant/environment.rb

@@ -243,7 +243,7 @@ module Vagrant
 
       root_finder = lambda do |path|
         return path if File.exist?(File.join(path.to_s, ROOTFILE_NAME))
-        return nil if path.root?
+        return nil if path.root? || !File.exist?(path)
         root_finder.call(path.parent)
       end
 
@@ -284,7 +284,6 @@ module Vagrant
         @loaded = true
         self.class.check_virtualbox!
         load_config!
-        actions.run(:environment_load)
       end
 
       self
@@ -313,7 +312,7 @@ module Vagrant
 
       # Execute the configuration stack and store the result as the final
       # value in the config ivar.
-      @config = loader.load!(!first_run)
+      @config = loader.load!
 
       # (re)load the logger
       @logger = nil

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/vagrant/vm.rb

@@ -108,7 +108,7 @@ module Vagrant
     end
 
     def package(options=nil)
-      env.actions.run(:package, options)
+      env.actions.run(:package, { "validate" => false }.merge(options || {}))
     end
 
     def up(options=nil)

data/test/vagrant/action/general/validate_test.rb

@@ -0,0 +1,31 @@
+require "test_helper"
+
+class ValidateGeneralActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::General::Validate
+    @app, @env = action_env
+  end
+
+  should "initialize fine" do
+    @klass.new(@app, @env)
+  end
+
+  should "validate and call up" do
+    @instance = @klass.new(@app, @env)
+
+    seq = sequence("seq")
+    @env["config"].expects(:validate!).once.in_sequence(seq)
+    @app.expects(:call).with(@env).once.in_sequence(seq)
+    @instance.call(@env)
+  end
+
+  should "not validate if env says not to" do
+    @env["validate"] = false
+    @instance = @klass.new(@app, @env)
+
+    seq = sequence("seq")
+    @env["config"].expects(:validate!).never
+    @app.expects(:call).with(@env).once.in_sequence(seq)
+    @instance.call(@env)
+  end
+end

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

@@ -64,7 +64,7 @@ class ForwardPortsHelpersVMActionTest < Test::Unit::TestCase
       na.stubs(:nat_driver).returns(ne)
       ne.stubs(:forwarded_ports).returns(fps)
       @vms << mock_vm(:network_adapters => [na])
-      assert_equal %W[2222 80], @instance.used_ports
+      assert_equal [2222, 80], @instance.used_ports
     end
   end
 end

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

@@ -53,12 +53,12 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
     end
 
     should "not raise any errors if no forwarded ports collide" do
-      @used_ports << "80"
+      @used_ports << 80
       assert_nothing_raised { @klass.new(@app, @env) }
     end
 
     should "handle collision if it happens" do
-      @used_ports << "2222"
+      @used_ports << 2222
       @klass.any_instance.expects(:handle_collision).with("ssh", anything, anything).once
       assert_nothing_raised { @klass.new(@app, @env) }
     end

data/test/vagrant/box_test.rb

@@ -36,7 +36,7 @@ class BoxTest < Test::Unit::TestCase
     end
 
     should "execute the Add action when add is called" do
-      @box.env.actions.expects(:run).with(:box_add, { "box" => @box })
+      @box.env.actions.expects(:run).with(:box_add, { "box" => @box, "validate" => false })
       @box.add
     end
 
@@ -48,19 +48,19 @@ class BoxTest < Test::Unit::TestCase
 
     context "destroying" do
       should "execute the destroy action" do
-        @box.env.actions.expects(:run).with(:box_remove, { "box" => @box })
+        @box.env.actions.expects(:run).with(:box_remove, { "box" => @box, "validate" => false })
         @box.destroy
       end
     end
 
     context "repackaging" do
       should "execute the repackage action" do
-        @box.env.actions.expects(:run).with(:box_repackage, { "box" => @box })
+        @box.env.actions.expects(:run).with(:box_repackage, { "box" => @box, "validate" => false })
         @box.repackage
       end
 
       should "forward given options into the action" do
-        @box.env.actions.expects(:run).with(:box_repackage, { "box" => @box, "foo" => "bar" })
+        @box.env.actions.expects(:run).with(:box_repackage, { "box" => @box, "foo" => "bar", "validate" => false })
         @box.repackage("foo" => "bar")
       end
     end

data/test/vagrant/config_test.rb

@@ -9,8 +9,6 @@ class ConfigTest < Test::Unit::TestCase
     setup do
       @env = vagrant_env
       @instance = @klass.new(@env)
-
-      @klass::Top.any_instance.stubs(:validate!)
     end
 
     should "initially have an empty queue" do
@@ -20,17 +18,10 @@ class ConfigTest < Test::Unit::TestCase
     should "reset the config class on load, then execute" do
       seq = sequence("sequence")
       @klass.expects(:reset!).with(@env).in_sequence(seq)
-      @klass.expects(:execute!).with(true).in_sequence(seq)
+      @klass.expects(:execute!).in_sequence(seq)
       @instance.load!
     end
 
-    should "not validate if told not to" do
-      seq = sequence("sequence")
-      @klass.expects(:reset!).with(@env).in_sequence(seq)
-      @klass.expects(:execute!).with(false).in_sequence(seq)
-      @instance.load!(false)
-    end
-
     should "run the queue in the order given" do
       @instance.queue << Proc.new { |config| config.vm.box = "foo" }
       @instance.queue << Proc.new { |config| config.vm.box = "bar" }
@@ -113,7 +104,6 @@ class ConfigTest < Test::Unit::TestCase
   context "initializing" do
     setup do
       @klass.reset!(vagrant_env)
-      @klass::Top.any_instance.stubs(:validate!)
     end
 
     should "add the given block to the proc stack" do
@@ -122,29 +112,6 @@ class ConfigTest < Test::Unit::TestCase
       assert_equal [proc], @klass.proc_stack
     end
 
-    should "run the validation on an environment which represents a VM" do
-      @klass.reset!(vagrant_env.vms[:default].env)
-      seq = sequence('seq')
-      @klass.expects(:run_procs!).with(@klass.config).once.in_sequence(seq)
-      @klass.config.expects(:validate!).once.in_sequence(seq)
-      @klass.execute!
-    end
-
-    should "not run the validation on an environment that doesn't directly represent a VM" do
-      seq = sequence('seq')
-      @klass.expects(:run_procs!).with(@klass.config).once.in_sequence(seq)
-      @klass.expects(:validate!).never
-      @klass.execute!
-    end
-
-    should "not run the validation if explicitly told not to" do
-      @klass.reset!(vagrant_env.vms[:default].env)
-      seq = sequence('seq')
-      @klass.expects(:run_procs!).with(@klass.config).once.in_sequence(seq)
-      @klass.config.expects(:validate!).never
-      @klass.execute!(false)
-    end
-
     should "return the configuration on execute!" do
       @klass.run {}
       result = @klass.execute!

data/test/vagrant/environment_test.rb

@@ -242,6 +242,7 @@ class EnvironmentTest < Test::Unit::TestCase
       search_seq = sequence("search_seq")
       paths.each do |path|
         File.expects(:exist?).with(path.join(@klass::ROOTFILE_NAME).to_s).returns(false).in_sequence(search_seq)
+        File.expects(:exist?).with(path).returns(true).in_sequence(search_seq) if !path.root?
       end
 
       assert !@klass.new(:cwd => paths.first).root_path
@@ -254,6 +255,10 @@ class EnvironmentTest < Test::Unit::TestCase
       assert_equal path, @klass.new(:cwd => path).root_path
     end
 
+    should "not infinite loop on relative paths" do
+      assert @klass.new(:cwd => "../test").root_path.nil?
+    end
+
     should "only load the root path once" do
       env = @klass.new
       File.expects(:exist?).with(env.cwd.join(@klass::ROOTFILE_NAME).to_s).returns(true).once
@@ -353,7 +358,6 @@ class EnvironmentTest < Test::Unit::TestCase
         call_seq = sequence("call_sequence")
         @klass.expects(:check_virtualbox!).once.in_sequence(call_seq)
         env.expects(:load_config!).once.in_sequence(call_seq)
-        env.actions.expects(:run).with(:environment_load).once.in_sequence(call_seq)
         assert_equal env, env.load!
       end
     end

data/test/vagrant/vm_test.rb

@@ -165,7 +165,12 @@ class VMTest < Test::Unit::TestCase
 
     context "packaging" do
       should "execute the package action" do
-        @vm.env.actions.expects(:run).with(:package, :foo => :bar).once
+        @vm.env.actions.expects(:run).once.with() do |action, options|
+          assert_equal :package, action
+          assert_equal :bar, options[:foo]
+          true
+        end
+
         @vm.package(:foo => :bar)
       end
     end

data/vagrant.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
   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.6"
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -193,20 +193,6 @@ 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.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc.6
 description: Vagrant is a tool for building and distributing virtualized development
   environments.
 email:
@@ -243,6 +229,7 @@ files:
 - lib/vagrant/action/env/set.rb
 - lib/vagrant/action/environment.rb
 - lib/vagrant/action/general/package.rb
+- lib/vagrant/action/general/validate.rb
 - lib/vagrant/action/vm/boot.rb
 - lib/vagrant/action/vm/check_box.rb
 - lib/vagrant/action/vm/check_guest_additions.rb
@@ -354,6 +341,7 @@ files:
 - test/vagrant/action/env/set_test.rb
 - test/vagrant/action/environment_test.rb
 - test/vagrant/action/general/package_test.rb
+- test/vagrant/action/general/validate_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