vagrant 0.9.2 → 0.9.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.3 (January 24, 2012)
+
+  - Proper error handling for not enough arguments to `box` commands.
+  - Fix issue causing crashes with bridged networking. [GH-673]
+  - Ignore host only network interfaces that are "down." [GH-675]
+  - Use "printf" instead of "echo" to determine shell expanded files paths
+    which is more generally POSIX compliant. [GH-676]
+
 ## 0.9.2 (January 20, 2012)
 
   - Support shell expansions in shared folder guest paths again. [GH-656]

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

@@ -298,7 +298,7 @@ module Vagrant
 
           @env[:vm].driver.read_bridged_interfaces.each do |interface|
             that_netaddr = network_address(interface[:ip], interface[:netmask])
-            raise Errors::NetworkCollision if this_netaddr == that_netaddr
+            raise Errors::NetworkCollision if this_netaddr == that_netaddr && interface[:status] != "Down"
           end
         end
 
@@ -341,7 +341,7 @@ module Vagrant
             chosen_bridge = bridgedifs[choice - 1][:name]
           end
 
-          @logger.info("Bridging adapter #{config[:adapter]} to #{bridge}")
+          @logger.info("Bridging adapter #{config[:adapter]} to #{chosen_bridge}")
 
           # Given the choice we can now define the adapter we're using
           return {

data/lib/vagrant/command/box_add.rb

@@ -18,6 +18,7 @@ module Vagrant
         # Parse the options
         argv = parse_options(opts)
         return if !argv
+        raise Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 2
 
         # If we're force adding, then be sure to destroy any existing box if it
         # exists.

data/lib/vagrant/command/box_remove.rb

@@ -13,6 +13,7 @@ module Vagrant
         # Parse the options
         argv = parse_options(opts)
         return if !argv
+        raise Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
 
         b = @env.boxes.find(argv[0])
         raise Errors::BoxNotFound, :name => argv[0] if !b

data/lib/vagrant/command/box_repackage.rb

@@ -13,6 +13,7 @@ module Vagrant
         # Parse the options
         argv = parse_options(opts)
         return if !argv
+        raise Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
 
         b = @env.boxes.find(argv[0])
         raise Errors::BoxNotFound, :name => argv[0] if !b

data/lib/vagrant/communication/ssh.rb

@@ -4,6 +4,7 @@ require 'log4r'
 require 'net/ssh'
 require 'net/scp'
 
+require 'vagrant/util/ansi_escape_code_remover'
 require 'vagrant/util/file_mode'
 require 'vagrant/util/platform'
 require 'vagrant/util/retryable'
@@ -12,6 +13,7 @@ module Vagrant
   module Communication
     # Provides communication with the VM via SSH.
     class SSH < Base
+      include Util::ANSIEscapeCodeRemover
       include Util::Retryable
 
       def initialize(vm)
@@ -169,7 +171,7 @@ module Vagrant
             ch2.on_data do |ch3, data|
               if block_given?
                 # Filter out the clear screen command
-                data.gsub!("\e[H", "")
+                data = remove_ansi_escape_codes(data)
                 @logger.debug("stdout: #{data}")
                 yield :stdout, data
               end
@@ -178,7 +180,7 @@ module Vagrant
             ch2.on_extended_data do |ch3, type, data|
               if block_given?
                 # Filter out the clear screen command
-                data.gsub!("\e[H", "")
+                data = remove_ansi_escape_codes(data)
                 @logger.debug("stderr: #{data}")
                 yield :stderr, data
               end

data/lib/vagrant/driver/virtualbox_4_0.rb

@@ -273,6 +273,8 @@ module Vagrant
               info[:ip] = $1.to_s
             elsif line =~ /^NetworkMask:\s+(.+?)$/
               info[:netmask] = $1.to_s
+            elsif line =~ /^Status:\s+(.+?)$/
+                info[:status] = $1.to_s
             end
           end
 

data/lib/vagrant/driver/virtualbox_4_1.rb

@@ -273,6 +273,8 @@ module Vagrant
               info[:ip] = $1.to_s
             elsif line =~ /^NetworkMask:\s+(.+?)$/
               info[:netmask] = $1.to_s
+            elsif line =~ /^Status:\s+(.+?)$/
+              info[:status] = $1.to_s
             end
           end
 

data/lib/vagrant/errors.rb

@@ -128,6 +128,11 @@ module Vagrant
       error_key(:failed, "vagrant.actions.box.verify")
     end
 
+    class CLIInvalidUsage < VagrantError
+      status_code(69)
+      error_key(:cli_invalid_usage)
+    end
+
     class CLIInvalidOptions < VagrantError
       status_code(1)
       error_key(:cli_invalid_options)

data/lib/vagrant/guest/linux.rb

@@ -47,7 +47,7 @@ module Vagrant
         # else, things like '~' don't expand properly in shared folders. We have
         # to `echo` here to get that path.
         real_guestpath = nil
-        @vm.channel.execute("echo #{guestpath}") do |type, data|
+        @vm.channel.execute("printf #{guestpath}") do |type, data|
           if type == :stdout
             real_guestpath ||= ""
             real_guestpath += data

data/lib/vagrant/util/ansi_escape_code_remover.rb

@@ -0,0 +1,35 @@
+module Vagrant
+  module Util
+    module ANSIEscapeCodeRemover
+      # Removes ANSI escape code sequences from the text and returns
+      # it.
+      #
+      # This removes all the ANSI escape codes listed here along with
+      # the escape codes for VT100 terminals:
+      #
+      # http://ascii-table.com/ansi-escape-sequences.php
+      def remove_ansi_escape_codes(text)
+        # An array of regular expressions which match various kinds
+        # of escape sequences. I can't think of a better single regular
+        # expression or any faster way to do this.
+        matchers = [/\e\[\d*[ABCD]/,       # Matches things like \e[4D
+                    /\e\[(\d*;)?\d*[HF]/,  # Matches \e[1;2H or \e[H
+                    /\e\[(s|u|2J|K)/,      # Matches \e[s, \e[2J, etc.
+                    /\e\[(\d*;){0,2}\d*m/, # Matches color escapes: \e[32m
+                    /\e\[=\d*[hl]/,        # Matches \e[=24h
+                    /\e\[\?[1-9][hl]/,     # Matches \e[?2h
+                    /\e\[20[hl]/,          # Matches \e[20l]
+                    /\e[DME78H]/,          # Matches \eD, \eH, etc.
+                    /\e\[[0-2]?[JK]/,      # Matches \e[0J, \e[K, etc.
+                    ]
+
+        # Take each matcher and replace it with emptiness.
+        matchers.each do |matcher|
+          text.gsub!(matcher, "")
+        end
+
+        text
+      end
+    end
+  end
+end

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.9.2"
+  VERSION = "0.9.3"
 end

data/templates/locales/en.yml

@@ -30,6 +30,11 @@ en:
         An invalid option was specified. The help for this command
         is available below.
 
+        %{help}
+      cli_invalid_usage: |-
+        This command was not invoked properly. The help for this command is
+        available below.
+
         %{help}
       config_validation: |-
         There was a problem with the configuration of Vagrant. The error message(s)

data/test/unit/vagrant/config/base_test.rb

@@ -25,10 +25,11 @@ describe Vagrant::Config::Base do
 
   it "doesn't merge values that start with a double underscore" do
     bar_class = Class.new(foo_class) do
-      @@counter = 0
+      class_variable_set(:@@counter, 0)
+
       def initialize
-        @__test = @@counter
-        @@counter += 1
+        @__test = self.class.send(:class_variable_get, :@@counter)
+        self.class.send(:class_variable_set, :@@counter, @__test + 1)
       end
     end
 

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

@@ -0,0 +1,17 @@
+require File.expand_path("../../../base", __FILE__)
+
+require "vagrant/util/ansi_escape_code_remover"
+
+describe Vagrant::Util::ANSIEscapeCodeRemover do
+  let(:klass) do
+    Class.new do
+      extend Vagrant::Util::ANSIEscapeCodeRemover
+    end
+  end
+
+  it "should remove ANSI escape codes" do
+    klass.remove_ansi_escape_codes("\e[Hyo").should == "yo"
+    klass.remove_ansi_escape_codes("\e[38myo").should == "yo"
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -410,6 +410,7 @@ files:
 - lib/vagrant/test_helpers.rb
 - lib/vagrant/ui.rb
 - lib/vagrant/util.rb
+- lib/vagrant/util/ansi_escape_code_remover.rb
 - lib/vagrant/util/busy.rb
 - lib/vagrant/util/counter.rb
 - lib/vagrant/util/file_checksum.rb
@@ -569,6 +570,7 @@ files:
 - test/unit/vagrant/environment_test.rb
 - test/unit/vagrant/hosts_test.rb
 - test/unit/vagrant/registry_test.rb
+- test/unit/vagrant/util/ansi_escape_code_remover_test.rb
 - test/unit/vagrant/util/file_checksum_test.rb
 - test/unit/vagrant/util/hash_with_indifferent_access_test.rb
 - test/unit/vagrant/util/network_ip_test.rb