vagrant 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.6 (unreleased)
+
+  - Shell provisioner outputs proper line endings on Windows [GH-1164]
+  - SSH upload opens file to stream which fixes strange upload issues.
+  - Check for proper exit codes for Puppet, since multiple exit codes
+    can mean success. [GH-1180]
+  - Fix issue where DNS doesn't resolve properly for 12.10. [GH-1176]
+  - Allow hostname to be a substring of the box name for Ubuntu [GH-1163]
+  - Use `puppet agent` instead of `puppetd` to be Puppet 3.x
+    compatible. [GH-1169]
+  - Work around bug in VirtualBox exposed by bug in OS X 10.8 where
+    VirtualBox executables couldn't handle garbage being injected into
+    stdout by OS X.
+
 ## 1.0.5 (September 18, 2012)
 
   - Work around a critical bug in VirtualBox 4.2.0 on Windows that

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

@@ -32,7 +32,7 @@ module Vagrant
           begin
             contents = File.read("/etc/resolv.conf")
 
-            if contents =~ /^nameserver 127\.0\.0\.1$/
+            if contents =~ /^nameserver 127\.0\.(0|1)\.1$/
               # The use of both natdnsproxy and natdnshostresolver break on
               # Ubuntu 12.04 that uses resolvconf with localhost. When used
               # VirtualBox will give the client dns server 10.0.2.3, while

data/lib/vagrant/communication/ssh.rb

@@ -77,15 +77,16 @@ module Vagrant
 
         # Do an SCP-based upload...
         connect do |connection|
+          # Open file read only to fix issue #1036
           scp = Net::SCP.new(connection)
-          scp.upload!(from, to)
+          scp.upload!(File.open(from, "r"), to)
         end
       rescue Net::SCP::Error => e
         # If we get the exit code of 127, then this means SCP is unavailable.
         raise Errors::SCPUnavailable if e.message =~ /\(127\)/
 
-        # Otherwise, just raise the error up
-        raise
+          # Otherwise, just raise the error up
+          raise
       end
 
       protected
@@ -168,7 +169,7 @@ module Vagrant
         # Yield the connection that is ready to be used and
         # return the value of the block
         return yield connection if block_given?
-     end
+      end
 
       # Executes the command on an SSH connection within a login shell.
       def shell_execute(connection, command, sudo=false)

data/lib/vagrant/driver/virtualbox_base.rb

@@ -300,9 +300,26 @@ module Vagrant
           @logger.info("Interrupted.")
         end
 
+        # The following is a workaround for a combined VirtualBox and
+        # Mac OS X 10.8 bug:
+        #
+        # Remove the DYLD_LIBRARY_PATH environmental variable on Mac. This
+        # is to fix a bug in Mac OS X 10.8 where a warning is printed to the
+        # console if this is set when executing certain programs, which
+        # can cause some VBoxManage commands to break because they work
+        # by just reading stdout and don't expect the OS to just inject
+        # garbage into it.
+        old_dyld_lib_path = ENV.delete("DYLD_LIBRARY_PATH")
+        old_ld_lib_path   = ENV.delete("LD_LIBRARY_PATH")
+
         Util::Busy.busy(int_callback) do
           Subprocess.execute(@vboxmanage_path, *command, &block)
         end
+      ensure
+        # Reset the library path if it was set before. See above comments
+        # for more information on why this was unset in the first place.
+        ENV["DYLD_LIBRARY_PATH"] = old_dyld_lib_path if old_dyld_lib_path
+        ENV["LD_LIBRARY_PATH"]   = old_ld_lib_path if old_ld_lib_path
       end
     end
   end

data/lib/vagrant/guest/ubuntu.rb

@@ -12,7 +12,7 @@ module Vagrant
       end
 
       def change_host_name(name)
-        if !vm.channel.test("sudo hostname | grep '#{name}'")
+        if !vm.channel.test("sudo hostname | grep '^#{name}$'")
           vm.channel.sudo("sed -i 's/.*$/#{name}/' /etc/hostname")
           vm.channel.sudo("sed -i 's@^\\(127[.]0[.]1[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
           vm.channel.sudo("service hostname start")

data/lib/vagrant/provisioners/puppet.rb

@@ -151,7 +151,7 @@ module Vagrant
           facter = "#{facts.join(" ")} "
         end
 
-        command = "cd #{manifests_guest_path} && #{facter}puppet apply #{options}"
+        command = "cd #{manifests_guest_path} && #{facter}puppet apply #{options} --detailed-exitcodes || [ $? -eq 2 ]"
 
         env[:ui].info I18n.t("vagrant.provisioners.puppet.running_puppet",
                              :manifest => @manifest_file)

data/lib/vagrant/provisioners/puppet_server.rb

@@ -21,8 +21,8 @@ module Vagrant
       end
 
       def provision!
-        verify_binary("puppetd")
-        run_puppetd_client
+        verify_binary("puppet")
+        run_puppet_agent
       end
 
       def verify_binary(binary)
@@ -32,7 +32,7 @@ module Vagrant
                               :binary => binary)
       end
 
-      def run_puppetd_client
+      def run_puppet_agent
         options = config.options
         options = [options] if !options.is_a?(Array)
 
@@ -66,7 +66,7 @@ module Vagrant
           facter = "#{facts.join(" ")} "
         end
 
-        command = "#{facter}puppetd #{options} --server #{config.puppet_server}"
+        command = "#{facter}puppet agent #{options} --server #{config.puppet_server} --detailed-exitcodes || [ $? -eq 2 ]"
 
         env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
         env[:vm].channel.sudo(command) do |type, data|

data/lib/vagrant/provisioners/shell.rb

@@ -59,6 +59,12 @@ module Vagrant
         # Otherwise we have an inline script, we need to Tempfile it,
         # and handle it specially...
         file = Tempfile.new('vagrant-shell')
+
+        # Unless you set binmode, on a Windows host the shell script will
+        # have CRLF line endings instead of LF line endings, causing havoc
+        # when the guest executes it
+        file.binmode
+
         begin
           file.write(config.inline)
           file.fsync

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.0.5"
+  VERSION = "1.0.6"
 end

data/test/unit/vagrant/environment_test.rb

@@ -97,6 +97,14 @@ describe Vagrant::Environment do
   end
 
   describe "primary VM" do
+    before do
+      # This is really nasty but we do this to remove the dependency on
+      # having VirtualBox installed to run tests.
+      Vagrant::Driver::VirtualBox.stub(:new) do |uuid|
+        double("vm-#{uuid}")
+      end
+    end
+
     it "should be the only VM if not a multi-VM environment" do
       instance.primary_vm.should == instance.vms.values.first
     end

data/vagrant.gemspec

@@ -32,8 +32,39 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-expectations", "~> 2.8.0"
   s.add_development_dependency "rspec-mocks", "~> 2.8.0"
 
-  s.files         = `git ls-files`.split("\n")
-  s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # Note that the entire gitignore(5) syntax is not supported, specifically
+  # the "!" syntax, but it should mostly work correctly.
+  root_path      = File.dirname(__FILE__)
+  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
+  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, ".gitignore")
+  gitignore      = File.readlines(gitignore_path)
+  gitignore.map!    { |line| line.chomp.strip }
+  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+  unignored_files = all_files.reject do |file|
+    # Ignore any directories, the gemspec only cares about files
+    next true if File.directory?(file)
+
+    # Ignore any paths that match anything in the gitignore. We do
+    # two tests here:
+    #
+    #   - First, test to see if the entire path matches the gitignore.
+    #   - Second, match if the basename does, this makes it so that things
+    #     like '.DS_Store' will match sub-directories too (same behavior
+    #     as git).
+    #
+    gitignore.any? do |ignore|
+      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+    end
+  end
+
+  s.files         = unignored_files
+  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
   s.require_path  = 'lib'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,11 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-19 00:00:00 Z
+date: 2013-01-24 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +31,11 @@ dependencies:
         - 5
         - 2
         version: 0.5.2
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: childprocess
+  name: archive-tar-minitar
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +47,11 @@ dependencies:
         - 3
         - 1
         version: 0.3.1
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: erubis
+  name: childprocess
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +63,11 @@ dependencies:
         - 7
         - 0
         version: 2.7.0
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
+  name: erubis
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,11 +79,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
+  name: i18n
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,11 +95,11 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: log4r
+  name: json
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,11 +111,11 @@ dependencies:
         - 1
         - 9
         version: 1.1.9
-  type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: log4r
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +127,11 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  type: :runtime
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: net-scp
+  name: net-ssh
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,11 +143,11 @@ dependencies:
         - 0
         - 4
         version: 1.0.4
-  type: :runtime
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: net-scp
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +157,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: contest
+  name: rake
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,11 +173,11 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :development
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: minitest
+  name: contest
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,11 +189,11 @@ dependencies:
         - 5
         - 1
         version: 2.5.1
-  type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: mocha
+  name: minitest
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -204,11 +203,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
+  name: mocha
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -220,11 +219,11 @@ dependencies:
         - 8
         - 0
         version: 2.8.0
-  type: :development
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
+  name: rspec-core
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -236,11 +235,11 @@ dependencies:
         - 8
         - 0
         version: 2.8.0
-  type: :development
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rspec-mocks
+  name: rspec-expectations
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -252,8 +251,10 @@ dependencies:
         - 8
         - 0
         version: 2.8.0
-  type: :development
   version_requirements: *id015
+  name: rspec-mocks
+  prerelease: false
+  type: :development
 description: Vagrant is a tool for building and distributing virtualized development environments.
 email: 
 - mitchell.hashimoto@gmail.com
@@ -265,23 +266,16 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- .yardopts
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
 - bin/vagrant
+- CHANGELOG.md
 - config/default.rb
-- contrib/README.md
 - contrib/emacs/vagrant.el
+- contrib/README.md
 - contrib/vim/vagrantfile.vim
+- Gemfile
 - keys/README.md
 - keys/vagrant
 - keys/vagrant.pub
-- lib/vagrant.rb
-- lib/vagrant/action.rb
 - lib/vagrant/action/box/destroy.rb
 - lib/vagrant/action/box/download.rb
 - lib/vagrant/action/box/package.rb
@@ -328,10 +322,10 @@ files:
 - lib/vagrant/action/vm/share_folders.rb
 - lib/vagrant/action/vm/suspend.rb
 - lib/vagrant/action/warden.rb
+- lib/vagrant/action.rb
 - 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/box_add.rb
@@ -352,10 +346,10 @@ files:
 - lib/vagrant/command/status.rb
 - lib/vagrant/command/suspend.rb
 - lib/vagrant/command/up.rb
-- lib/vagrant/communication.rb
+- lib/vagrant/command.rb
 - lib/vagrant/communication/base.rb
 - lib/vagrant/communication/ssh.rb
-- lib/vagrant/config.rb
+- lib/vagrant/communication.rb
 - lib/vagrant/config/base.rb
 - lib/vagrant/config/container.rb
 - lib/vagrant/config/error_recorder.rb
@@ -365,38 +359,38 @@ files:
 - 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/config/vm.rb
+- lib/vagrant/config.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/driver.rb
+- lib/vagrant/downloaders.rb
 - lib/vagrant/driver/virtualbox.rb
 - lib/vagrant/driver/virtualbox_4_0.rb
 - lib/vagrant/driver/virtualbox_4_1.rb
 - lib/vagrant/driver/virtualbox_4_2.rb
 - lib/vagrant/driver/virtualbox_base.rb
+- lib/vagrant/driver.rb
 - lib/vagrant/environment.rb
 - lib/vagrant/errors.rb
-- lib/vagrant/guest.rb
 - lib/vagrant/guest/arch.rb
 - lib/vagrant/guest/base.rb
 - lib/vagrant/guest/debian.rb
 - lib/vagrant/guest/fedora.rb
 - lib/vagrant/guest/freebsd.rb
 - lib/vagrant/guest/gentoo.rb
-- lib/vagrant/guest/linux.rb
 - lib/vagrant/guest/linux/config.rb
 - lib/vagrant/guest/linux/error.rb
+- lib/vagrant/guest/linux.rb
 - lib/vagrant/guest/openbsd.rb
 - lib/vagrant/guest/redhat.rb
 - lib/vagrant/guest/solaris.rb
 - lib/vagrant/guest/suse.rb
 - lib/vagrant/guest/ubuntu.rb
-- lib/vagrant/hosts.rb
+- lib/vagrant/guest.rb
 - lib/vagrant/hosts/arch.rb
 - lib/vagrant/hosts/base.rb
 - lib/vagrant/hosts/bsd.rb
@@ -406,8 +400,8 @@ files:
 - lib/vagrant/hosts/linux.rb
 - lib/vagrant/hosts/opensuse.rb
 - lib/vagrant/hosts/windows.rb
+- lib/vagrant/hosts.rb
 - lib/vagrant/plugin.rb
-- lib/vagrant/provisioners.rb
 - lib/vagrant/provisioners/base.rb
 - lib/vagrant/provisioners/chef.rb
 - lib/vagrant/provisioners/chef_client.rb
@@ -415,11 +409,11 @@ files:
 - lib/vagrant/provisioners/puppet.rb
 - lib/vagrant/provisioners/puppet_server.rb
 - lib/vagrant/provisioners/shell.rb
+- lib/vagrant/provisioners.rb
 - lib/vagrant/registry.rb
 - lib/vagrant/ssh.rb
 - 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
@@ -436,8 +430,13 @@ files:
 - lib/vagrant/util/stacked_proc_runner.rb
 - lib/vagrant/util/subprocess.rb
 - lib/vagrant/util/template_renderer.rb
+- lib/vagrant/util.rb
 - lib/vagrant/version.rb
 - lib/vagrant/vm.rb
+- lib/vagrant.rb
+- LICENSE
+- Rakefile
+- README.md
 - tasks/acceptance.rake
 - tasks/bundler.rake
 - tasks/test.rake
@@ -476,12 +475,12 @@ files:
 - test/acceptance/provisioning/shell_test.rb
 - test/acceptance/resume_test.rb
 - test/acceptance/shared_folders_test.rb
-- test/acceptance/skeletons/chef_solo_basic/README.md
 - test/acceptance/skeletons/chef_solo_basic/cookbooks/basic/recipes/default.rb
-- test/acceptance/skeletons/chef_solo_json/README.md
+- test/acceptance/skeletons/chef_solo_basic/README.md
 - test/acceptance/skeletons/chef_solo_json/cookbooks/basic/recipes/default.rb
-- test/acceptance/skeletons/provisioner_multi/README.md
+- test/acceptance/skeletons/chef_solo_json/README.md
 - test/acceptance/skeletons/provisioner_multi/cookbooks/basic/recipes/default.rb
+- test/acceptance/skeletons/provisioner_multi/README.md
 - test/acceptance/ssh_test.rb
 - test/acceptance/support/config.rb
 - test/acceptance/support/isolated_environment.rb
@@ -498,7 +497,6 @@ files:
 - test/acceptance/up_with_box_url.rb
 - test/acceptance/vagrant_test.rb
 - test/acceptance/version_test.rb
-- test/buildbot/README.md
 - test/buildbot/buildbot_config/__init__.py
 - test/buildbot/buildbot_config/config/__init__.py
 - test/buildbot/buildbot_config/config/loader.py
@@ -511,8 +509,8 @@ files:
 - test/buildbot/buildbot_config/master/schedulers.py
 - test/buildbot/buildbot_config/master/slaves.py
 - test/buildbot/buildbot_config/master/status.py
-- test/buildbot/master/Makefile.sample
 - test/buildbot/master/buildbot.tac
+- test/buildbot/master/Makefile.sample
 - test/buildbot/master/master.cfg
 - test/buildbot/master/public_html/bg_gradient.jpg
 - test/buildbot/master/public_html/default.css
@@ -552,6 +550,7 @@ files:
 - test/buildbot/master/templates/macros/forms.html
 - test/buildbot/master/templates/root.html
 - test/buildbot/master/templates/waterfall.html
+- test/buildbot/README.md
 - test/buildbot/requirements.txt
 - test/buildbot/scripts/deploy.sh
 - test/buildbot/scripts/setup.sh
@@ -677,6 +676,9 @@ files:
 - test/unit_legacy/vagrant/util/template_renderer_test.rb
 - test/unit_legacy/vagrant/vm_test.rb
 - vagrant.gemspec
+- .gitignore
+- .yardopts
+has_rdoc: true
 homepage: http://vagrantup.com
 licenses: []
 
@@ -708,7 +710,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vagrant
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Build and distribute virtualized development environments.