vagrantup 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5792b5a7710c5518a4358d532a1746f69e612bd6
-  data.tar.gz: cb084ce778ebfd587cb8d034d1dccde6e2fc71b6
+  metadata.gz: e5706bfea6f6e245dad4f0d14273def52e00968e
+  data.tar.gz: dc4d88b8301f749d5ca14848ff4b5614648552c2
 SHA512:
-  metadata.gz: a53f20097b36bbb85ac603e5ed8eb3a33ab03ff1f8ce1e505ffe096d7316d36f46eedd22e0e7a08c1cab6c3a24155ef20efcc84bb5da12be7ce7b77711ed8c3b
-  data.tar.gz: 82d177f84a3c71102b174f7a88d890e7e2a57ae93a0aa01163fda1923be2a7a1a439e398bf9c87b5d17adf5491009e35e6972238f5028c85e6ed7a837ea7f18b
+  metadata.gz: b53c3f4a8bf846a9e975f86b0026f0819b78fda92e8a3edee4c36f5089c3efa66db3df8728652aa643589cae89bafbfb20f6006c84f33bae95f7e45c8b8798c6
+  data.tar.gz: 1aa2d1992525b8a01deeb7ba6ce94e9b378ba0ab5d01c3c282cfe6c367286886d8cab61830e6621dcec0d34e2ceea9c757be55b163d67a36ce5a37a975663d8a

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## 1.1.1 (March 18, 2013)
+
+IMPROVEMENTS:
+
+  - Don't load plugins on any `vagrant plugin` command, so that errors
+    are avoided. [GH-1418]
+  - An error will be shown if you forward a port to the same host port
+    multiple times.
+  - Automatically convert network, provider, and provisioner names to
+    symbols internally in case people define them as strings.
+  - Using newer versions of net-ssh and net-scp. [GH-1436]
+
+BUG FIXES:
+
+  - Quote keys to StringBlockEditor so keys with spaces, parens, and
+    so on work properly.
+  - When there is no route to host for SSH, re-establish a new connection.
+  - `vagrant package` once again works, no more nil error. [GH-1423]
+  - Human friendly error when "metadata.json" is missing in a box.
+  - Don't use the full path to the manifest file with the Puppet provisioner
+    because it exposes a bug with Puppet path lookup on VMware.
+  - Fix bug in VirtualBox provider where port forwarding just didn't work if
+    you attempted to forward to a port under 1024. [GH-1421]
+  - Fix cross-device box adds for Windows. [GH-1424]
+  - Fix minor issues with defaults of configuration of the shell
+    provisioner.
+  - Fix Puppet server using "host_name" instead of "hostname" [GH-1444]
+  - Raise a proper error if no hostonly network is found for NFS with
+    VirtualBox. [GH-1437]
+
 ## 1.1.0 (March 14, 2013)
 
 BACKWARDS INCOMPATIBILITIES:

data/lib/vagrant.rb

@@ -168,6 +168,12 @@ module Vagrant
   #
   # @param [String] name Name of the plugin to load.
   def self.require_plugin(name)
+    if ENV["VAGRANT_NO_PLUGINS"]
+      logger = Log4r::Logger.new("vagrant::root")
+      logger.warn("VAGRANT_NO_PLUGINS is set, not loading 3rd party plugin: #{name}")
+      return
+    end
+
     # Redirect stdout/stderr so that we can output it in our own way.
     previous_stderr = $stderr
     previous_stdout = $stdout
@@ -212,8 +218,8 @@ module Vagrant
         :plugin => name
     end
   ensure
-    $stderr = previous_stderr
-    $stdout = previous_stdout
+    $stderr = previous_stderr if previous_stderr
+    $stdout = previous_stdout if previous_stdout
   end
 end
 

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

@@ -22,7 +22,7 @@ module Vagrant
           @app = app
 
           env["package.files"]  ||= {}
-          env["package.output"] ||= env["global_config"].package.name
+          env["package.output"] ||= env[:global_config].package.name
         end
 
         def call(env)

data/lib/vagrant/box.rb

@@ -43,7 +43,10 @@ module Vagrant
       @name      = name
       @provider  = provider
       @directory = directory
-      @metadata  = JSON.parse(directory.join("metadata.json").read)
+
+      metadata_file = directory.join("metadata.json")
+      raise Errors::BoxMetadataFileNotFound, :name => @name if !metadata_file.file?
+      @metadata = JSON.parse(directory.join("metadata.json").read)
 
       @logger = Log4r::Logger.new("vagrant::box")
     end

data/lib/vagrant/box_collection.rb

@@ -147,12 +147,16 @@ module Vagrant
         end
 
         # Move to final destination
-        FileUtils.mv(temp_dir.to_s, final_dir.to_s)
-
-        # Recreate the directory. This avoids a bug in Ruby where `mktmpdir`
-        # cleanup doesn't check if the directory is already gone. Ruby bug
-        # #6715: http://bugs.ruby-lang.org/issues/6715
-        Dir.mkdir(temp_dir, 0700)
+        final_dir.mkpath
+
+        # Go through each child and copy them one-by-one. This avoids
+        # an issue where on Windows cross-device directory copies are
+        # failing for some reason. [GH-1424]
+        temp_dir.children(true).each do |f|
+          destination = final_dir.join(f.basename)
+          @logger.debug("Moving: #{f} => #{destination}")
+          FileUtils.mv(f, destination)
+        end
       end
 
       # Return the box

data/lib/vagrant/environment.rb

@@ -631,13 +631,6 @@ module Vagrant
     # Loads the Vagrant plugins by properly setting up RubyGems so that
     # our private gem repository is on the path.
     def load_plugins
-      if ENV["VAGRANT_NO_PLUGINS"]
-        # If this key exists, then we don't load any plugins. It is a "safe
-        # mode" of sorts.
-        @logger.warn("VAGRANT_NO_PLUGINS is set. Not loading 3rd party plugins.")
-        return
-      end
-
       # Add our private gem path to the gem path and reset the paths
       # that Rubygems knows about.
       ENV["GEM_PATH"] = "#{@gems_path}#{::File::PATH_SEPARATOR}#{ENV["GEM_PATH"]}"

data/lib/vagrant/errors.rb

@@ -99,6 +99,10 @@ module Vagrant
       error_key(:unknown_type, "vagrant.actions.box.download")
     end
 
+    class BoxMetadataFileNotFound < VagrantError
+      error_key(:box_metadata_file_not_found)
+    end
+
     class BoxNotFound < VagrantError
       error_key(:box_not_found)
     end
@@ -263,6 +267,10 @@ module Vagrant
       error_key(:nfs_no_host_ip)
     end
 
+    class NFSNoHostonlyNetwork < VagrantError
+      error_key(:nfs_no_hostonly_network)
+    end
+
     class NoEnvironmentError < VagrantError
       error_key(:no_env)
     end

data/lib/vagrant/util/string_block_editor.rb

@@ -44,12 +44,14 @@ module Vagrant
 
       # This deletes the block with the given key if it exists.
       def delete(key)
+        key    = Regexp.quote(key)
         regexp = /^#\s*VAGRANT-BEGIN:\s*#{key}$.*^#\s*VAGRANT-END:\s*#{key}$\r?\n?/m
         @value.gsub!(regexp, "")
       end
 
       # This gets the value of the block with the given key.
       def get(key)
+        key    = Regexp.quote(key)
         regexp = /^#\s*VAGRANT-BEGIN:\s*#{key}$\r?\n?(.*?)\r?\n?^#\s*VAGRANT-END:\s*#{key}$\r?\n?/m
         match  = regexp.match(@value)
         return nil if !match

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 = "1.1.0"
+  VERSION = "1.1.1"
 end

data/plugins/communicators/ssh/communicator.rb

@@ -126,6 +126,9 @@ module VagrantPlugins
           # socket.
           begin
             @connection.exec!("")
+          rescue Errno::EHOSTUNREACH
+            @logger.info("No route to host for connection. Not re-using.")
+            @connection = nil
           rescue IOError
             @logger.info("Connection has been closed. Not re-using.")
             @connection = nil

data/plugins/kernel_v2/config/vm.rb

@@ -1,5 +1,6 @@
 require "pathname"
 require "securerandom"
+require "set"
 
 require "vagrant"
 require "vagrant/config/v2/util"
@@ -137,19 +138,20 @@ module VagrantPlugins
         end
 
         # Merge in the latest settings and set the internal state
-        @__networks[id] = [type, options]
+        @__networks[id] = [type.to_sym, options]
       end
 
       # Configures a provider for this VM.
       #
       # @param [Symbol] name The name of the provider.
       def provider(name, &block)
+        name = name.to_sym
         @__providers[name] ||= []
         @__providers[name] << block if block_given?
       end
 
       def provision(name, options=nil, &block)
-        @provisioners << VagrantConfigProvisioner.new(name, options, &block)
+        @provisioners << VagrantConfigProvisioner.new(name.to_sym, options, &block)
       end
 
       def defined_vms
@@ -277,12 +279,23 @@ module VagrantPlugins
 
         # Validate networks
         has_fp_port_error = false
+        fp_host_ports     = Set.new
+
         networks.each do |type, options|
           if type == :forwarded_port
             if !has_fp_port_error && (!options[:guest] || !options[:host])
               errors << I18n.t("vagrant.config.vm.network_fp_requires_ports")
               has_fp_port_error = true
             end
+
+            if options[:host]
+              if fp_host_ports.include?(options[:host])
+                errors << I18n.t("vagrant.config.vm.network_fp_host_not_unique",
+                                :host => options[:host].to_s)
+              end
+
+              fp_host_ports.add(options[:host])
+            end
           end
         end
 

data/plugins/providers/virtualbox/action/forward_ports.rb

@@ -21,7 +21,7 @@ module VagrantPlugins
           env[:forwarded_ports].each do |fp|
             if fp.host_port <= 1024
               env[:ui].warn I18n.t("vagrant.actions.vm.forward_ports.privileged_ports")
-              return
+              break
             end
           end
 

data/plugins/providers/virtualbox/action/prepare_nfs_settings.rb

@@ -12,6 +12,8 @@ module VagrantPlugins
 
           env[:nfs_host_ip]    = read_host_ip(env[:machine])
           env[:nfs_machine_ip] = read_machine_ip(env[:machine])
+
+          raise Errors::NFSNoHostonlyNetwork if !env[:nfs_machine_ip]
         end
 
         # Returns the IP address of the first host only network adapter

data/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
           root_path = @machine.env.root_path
           @expanded_manifests_path = @config.expanded_manifests_path(root_path)
           @expanded_module_paths   = @config.expanded_module_paths(root_path)
-          @manifest_file           = File.join(manifests_guest_path, @config.manifest_file)
+          @manifest_file           = @config.manifest_file
 
           # Setup the module paths
           @module_paths = []

data/plugins/provisioners/puppet/provisioner/puppet_server.rb

@@ -29,7 +29,7 @@ module VagrantPlugins
           if config.puppet_node
             # If a node name is given, we use that directly for the certname
             cn = config.puppet_node
-          elsif @machine.config.vm.host_name
+          elsif @machine.config.vm.hostname
             # If a host name is given, we explicitly set the certname to
             # nil so that the hostname becomes the cert name.
             cn = nil

data/plugins/provisioners/shell/config.rb

@@ -7,7 +7,16 @@ module VagrantPlugins
       attr_accessor :args
 
       def initialize
-        @upload_path = "/tmp/vagrant-shell"
+        @args        = []
+        @inline      = UNSET_VALUE
+        @path        = UNSET_VALUE
+        @upload_path = UNSET_VALUE
+      end
+
+      def finalize!
+        @inline      = nil if @inline == UNSET_VALUE
+        @path        = nil if @path == UNSET_VALUE
+        @upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
       end
 
       def validate(machine)

data/templates/locales/en.yml

@@ -52,6 +52,15 @@ en:
         Active provider: %{active_provider}
         Requested provider: %{requested_provider}
       base_vm_not_found: The base VM with the name '%{name}' was not found.
+      box_metadata_file_not_found: |-
+        The "metadata.json" file for the box '%{name}' was not found.
+        Boxes require this file in order for Vagrant to determine the
+        provider it was made for. If you made the box, please add a
+        "metadata.json" file to it. If someone else made the box, please
+        notify the box creator that the box is corrupt. Documentation for
+        box file format can be found at the URL below:
+
+        http://docs.vagrantup.com/v2/boxes/format.html
       box_not_found: Box '%{name}' could not be found.
       box_provider_doesnt_match: |-
         The box you attempted to add doesn't match the provider you specified.
@@ -176,6 +185,10 @@ en:
       nfs_no_host_ip: |-
         No host IP was given to the Vagrant core NFS helper. This is
         an internal error that should be reported as a bug.
+      nfs_no_hostonly_network: |-
+        NFS requires a host-only network with a static IP to be created.
+        Please add a host-only network with a static IP to the machine
+        for NFS to work.
       no_env: |-
         A Vagrant environment is required to run this command. Run `vagrant init`
         to set one up in this directory, or change to a directory with a
@@ -447,6 +460,8 @@ en:
         nfs_requires_host: |-
           Using NFS shared folders requires a host to be specified
           using `config.vagrant.host`.
+        network_fp_host_not_unique: |-
+          Forwarded port '%{host}' (host port) is declared multiple times
         network_fp_requires_ports: |-
           Forwarded port definitions require a "host" and "guest" value
         shared_folder_hostpath_missing: |-

data/test/unit/vagrant/box_test.rb

@@ -14,6 +14,8 @@ describe Vagrant::Box do
   let(:directory)     { environment.box2("foo", :virtualbox) }
   let(:instance)      { described_class.new(name, provider, directory) }
 
+  subject { described_class.new(name, provider, directory) }
+
   it "provides the name" do
     instance.name.should == name
   end
@@ -38,6 +40,17 @@ describe Vagrant::Box do
     instance.metadata.should == data
   end
 
+  context "without a metadata file" do
+    before :each do
+      directory.join("metadata.json").delete
+    end
+
+    it "should raise an exception" do
+      expect { subject }.
+        to raise_error(Vagrant::Errors::BoxMetadataFileNotFound)
+    end
+  end
+
   describe "destroying" do
     it "should destroy an existing box" do
       # Verify that our "box" exists

data/test/unit/vagrant/util/string_block_editor_test.rb

@@ -61,17 +61,25 @@ DATA
 # VAGRANT-BEGIN: bar
 content
 # VAGRANT-END: bar
+# VAGRANT-BEGIN: /Users/studio/Projects (studio)/tubes/.vagrant/machines/web/vmware_fusion/vm.vmwarevm
+complex
+# VAGRANT-END: /Users/studio/Projects (studio)/tubes/.vagrant/machines/web/vmware_fusion/vm.vmwarevm
 DATA
     end
 
+    subject { described_class.new(data) }
+
     it "should get the value" do
-      instance = described_class.new(data)
-      instance.get("bar").should == "content"
+      subject.get("bar").should == "content"
     end
 
     it "should get nil for nonexistent values" do
-      instance = described_class.new(data)
-      instance.get("baz").should be_nil
+      subject.get("baz").should be_nil
+    end
+
+    it "should get complicated keys" do
+      result = subject.get("/Users/studio/Projects (studio)/tubes/.vagrant/machines/web/vmware_fusion/vm.vmwarevm")
+      result.should == "complex"
     end
   end
 

data/vagrant.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "json", ">= 1.5.1", "< 1.8.0"
   s.add_dependency "log4r", "~> 1.1.9"
-  s.add_dependency "net-ssh", "~> 2.2.2"
-  s.add_dependency "net-scp", "~> 1.0.4"
+  s.add_dependency "net-ssh", "~> 2.6.6"
+  s.add_dependency "net-scp", "~> 1.1.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

data/vagrant.gemspecbak

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "json", ">= 1.5.1", "< 1.8.0"
   s.add_dependency "log4r", "~> 1.1.9"
-  s.add_dependency "net-ssh", "~> 2.2.2"
-  s.add_dependency "net-scp", "~> 1.0.4"
+  s.add_dependency "net-ssh", "~> 2.6.6"
+  s.add_dependency "net-scp", "~> 1.1.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: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -93,28 +93,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.6.6
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement