vagrantup 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085393375dc634a77d9c329deebcdf36d0a3e282
-  data.tar.gz: b28a86d3c35ec8231ac5056519e13f1636d2fda7
+  metadata.gz: 9d99515c869416f571664def118983a7b21ae49c
+  data.tar.gz: 43e8ece0b474a752f3107b04a38d0003ebf828cf
 SHA512:
-  metadata.gz: a03a96a69c7617d099f7e1adf23d5a0521b481aa9486a6d0e36b4f3b7f2fe37f96dc29b8781fbe4ce3463a1b0a863242f54b138ad64030e29f64cb3690244c03
-  data.tar.gz: 32cec7851590cb931bd8e8f60ec47626701f3a0ea5e640c40546a25065be1ddf7a11d27a30755064349194771c9cc68a18df8ac504b75038b5b1b5cccbdec8e7
+  metadata.gz: 67c5b0a958f82b6b4cd2ef3c401b99245ef89b36fcb742bfe47e64d349279cb60c0e871cceaa6d9f5b4b43b77283ae539b0977513ef9d4192c08a2a17ec387a9
+  data.tar.gz: 0b27041e1dbc68154cc5fd11d37b7d99cf76d94a6f352ac3668a4c71021c3179a70a90de8dd94bc4c3ba9138c09ef4dadd87574d711ae10337bfc7001b027043

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.8.3 (August 15, 2011)
+
+ - Fix SSH `exec!` to inherit proper `$PATH`. [GH-426]
+ - Chef client now accepts an empty (`nil`) run list again. [GH-429]
+ - Fix incorrect error message when running `provision` on halted VM. [GH-447]
+ - Checking guest addition versions now ignores OSE. [GH-438]
+ - Chef solo from a remote URL fixed. [GH-431]
+ - Arch linux support: host only networks and changing the host name. [GH-439] [GH-448]
+ - Chef solo `roles_path` and `data_bags_path` can only be be single paths. [GH-446]
+ - Fix `virtualbox_not_detected` error message to require 4.1.x. [GH-458]
+ - Add shortname (`hostname -s`) for hostname setting on RHEL systems. [GH-456]
+ - `vagrant ssh -c` output no longer has a prefix and respects newlines
+   from the output. [GH-462]
+
 ## 0.8.2 (July 22, 2011)
 
   - Fix issue with SSH disconnects not reconnecting.

data/Gemfile

@@ -6,8 +6,6 @@ gem "vagrant", :path => '.'
 # typically coincides with it
 gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
 
-# Gems required for testing only. To install run
-# gem bundle test
 group :test do
   gem "rake"
   gem "contest", ">= 0.1.2"

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

@@ -15,10 +15,15 @@ module Vagrant
           version = env["vm"].vm.interface.get_guest_property_value("/VirtualBox/GuestAdd/Version")
           if version.empty?
             env.ui.warn I18n.t("vagrant.actions.vm.check_guest_additions.not_detected")
-          elsif version != VirtualBox.version
-            env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch",
-                        :guest_version => version,
-                        :virtualbox_version => VirtualBox.version))
+          else
+            # Strip the -OSE/_OSE off from the guest additions
+            version = version.gsub(/[-_]ose/i, '')
+
+            if version != VirtualBox.version
+              env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch",
+                                 :guest_version => version,
+                                 :virtualbox_version => VirtualBox.version))
+            end
           end
 
           # Continue

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

@@ -11,9 +11,14 @@ module Vagrant
 
           # Import the virtual machine
           env.env.vm.vm = VirtualBox::VM.import(env.env.box.ovf_file.to_s) do |progress|
+            env.ui.clear_line
             env.ui.report_progress(progress.percent, 100, false)
           end
 
+          # Clear the line one last time since the progress meter doesn't disappear
+          # immediately.
+          env.ui.clear_line
+
           # Flag as erroneous and return if import failed
           raise Errors::VMImportFailure if !env["vm"].vm
 

data/lib/vagrant/command/provision.rb

@@ -5,8 +5,12 @@ module Vagrant
 
       def execute
         target_vms.each do |vm|
-          if vm.created? && vm.vm.running?
-            vm.provision
+          if vm.created?
+            if vm.vm.running?
+              vm.provision
+            else
+              vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_running")
+            end
           else
             vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end

data/lib/vagrant/command/ssh.rb

@@ -16,9 +16,12 @@ module Vagrant
 
       def ssh_execute
         ssh_vm.ssh.execute do |ssh|
-          ssh_vm.env.ui.info I18n.t("vagrant.commands.ssh.command", :command => options[:command])
           ssh.exec!(options[:command]) do |channel, type, data|
-            ssh_vm.env.ui.info "#{data}"
+            if type != :exit_status
+              # Print the SSH output as it comes in, but don't prefix it and don't
+              # force a new line so that the output is properly preserved
+              ssh_vm.env.ui.info(data.to_s, :prefix => false, :new_line => false)
+            end
           end
         end
       end

data/lib/vagrant/config/ssh.rb

@@ -12,11 +12,11 @@ module Vagrant
       attr_writer :private_key_path
       attr_accessor :forward_agent
       attr_accessor :forward_x11
-      attr_accessor :sudo_shell
+      attr_accessor :shell
       attr_accessor :port
 
       def initialize
-        @sudo_shell = "bash"
+        @shell = "bash"
         @port = nil
         @forward_agent = false
         @forward_x11 = false

data/lib/vagrant/provisioners/chef.rb

@@ -4,6 +4,14 @@ module Vagrant
     # chef-solo and chef-client provisioning are stored. This is **not an actual
     # provisioner**. Instead, {ChefSolo} or {ChefServer} should be used.
     class Chef < Base
+      include Util::Counter
+
+      def initialize(env, config)
+        super
+
+        config.provisioning_path ||= "/tmp/vagrant-chef-#{get_and_update_counter(:provisioning_path)}"
+      end
+
       def prepare
         raise ChefError, :invalid_provisioner
       end
@@ -76,8 +84,6 @@ module Vagrant
     class Chef < Base
       # This is the configuration which is available through `config.chef`
       class Config < Vagrant::Config::Base
-        extend Util::Counter
-
         # Shared config
         attr_accessor :node_name
         attr_accessor :provisioning_path
@@ -92,10 +98,10 @@ module Vagrant
         attr_accessor :no_proxy
         attr_accessor :binary_path
         attr_accessor :binary_env
-        attr_accessor :run_list
+        attr_writer :run_list
 
         def initialize
-          @provisioning_path = "/tmp/vagrant-chef-#{self.class.get_and_update_counter}"
+          @provisioning_path = nil
           @log_level = :info
           @json = {}
           @http_proxy = nil
@@ -107,15 +113,21 @@ module Vagrant
           @no_proxy = nil
           @binary_path = nil
           @binary_env = nil
-          @run_list = []
+          @run_list = nil
         end
 
         # This returns the json that is merged with the defaults and the
         # user set data.
         def merged_json
-          { :instance_role => "vagrant",
-            :run_list      => run_list
-          }.merge(json || {})
+          original = { :instance_role => "vagrant" }
+          original[:run_list] = @run_list if @run_list
+          original.merge(json || {})
+        end
+
+        # Returns the run list, but also sets it up to be empty if it
+        # hasn't been defined already.
+        def run_list
+          @run_list ||= []
         end
 
         # Adds a recipe to the run list

data/lib/vagrant/provisioners/chef_client.rb

@@ -34,7 +34,7 @@ module Vagrant
 
           errors.add(I18n.t("vagrant.config.chef.server_url_empty")) if !chef_server_url || chef_server_url.strip == ""
           errors.add(I18n.t("vagrant.config.chef.validation_key_path")) if !validation_key_path
-          errors.add(I18n.t("vagrant.config.chef.run_list_empty")) if run_list && run_list.empty?
+          errors.add(I18n.t("vagrant.config.chef.run_list_empty")) if @run_list && @run_list.empty?
         end
       end
 

data/lib/vagrant/provisioners/chef_solo.rb

@@ -5,6 +5,7 @@ module Vagrant
       register :chef_solo
 
       extend Util::Counter
+      include Util::Counter
 
       class Config < Chef::Config
         attr_accessor :cookbooks_path
@@ -17,8 +18,8 @@ module Vagrant
           super
 
           @cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
-          @roles_path = []
-          @data_bags_path = []
+          @roles_path = nil
+          @data_bags_path = nil
           @nfs = false
         end
 
@@ -54,6 +55,8 @@ module Vagrant
 
       # Converts paths to a list of properly expanded paths with types.
       def expanded_folders(paths)
+        return [] if paths.nil?
+
         # Convert the path to an array if it is a string or just a single
         # path element which contains the folder location (:host or :vm)
         paths = [paths] if paths.is_a?(String) || paths.first.is_a?(Symbol)
@@ -66,7 +69,15 @@ module Vagrant
           # or VM path.
           local_path = nil
           local_path = File.expand_path(path, env.root_path) if type == :host
-          remote_path = type == :host ? "#{config.provisioning_path}/chef-solo-#{self.class.get_and_update_counter}" : path
+          remote_path = nil
+          if type == :host
+            # Path exists on the host, setup the remote path
+            remote_path = "#{config.provisioning_path}/chef-solo-#{get_and_update_counter(:cookbooks_path)}"
+          else
+            # Path already exists on the virtual machine. Expand it
+            # relative to where we're provisioning.
+            remote_path = File.expand_path(path, config.provisioning_path)
+          end
 
           # Return the result
           [type, local_path, remote_path]
@@ -78,7 +89,7 @@ module Vagrant
       def share_folders(prefix, folders)
         folders.each do |type, local_path, remote_path|
           if type == :host
-            env.config.vm.share_folder("v-#{prefix}-#{self.class.get_and_update_counter}",
+            env.config.vm.share_folder("v-#{prefix}-#{self.class.get_and_update_counter(:shared_folder)}",
                                        remote_path, local_path, :nfs => config.nfs)
           end
         end
@@ -86,8 +97,8 @@ module Vagrant
 
       def setup_solo_config
         cookbooks_path = guest_paths(@cookbook_folders)
-        roles_path = guest_paths(@role_folders)
-        data_bags_path = guest_paths(@data_bags_folders)
+        roles_path = guest_paths(@role_folders).first
+        data_bags_path = guest_paths(@data_bags_folders).first
 
         setup_config("chef_solo_solo", "solo.rb", {
           :node_name => config.node_name,

data/lib/vagrant/ssh/session.rb

@@ -34,7 +34,7 @@ module Vagrant
       # of `sudo`.
       def sudo!(commands, options=nil, &block)
         channel = session.open_channel do |ch|
-          ch.exec("sudo -H #{env.config.ssh.sudo_shell} -l") do |ch2, success|
+          ch.exec("sudo -H #{env.config.ssh.shell} -l") do |ch2, success|
             # Set the terminal
             ch2.send_data "export TERM=vt100\n"
 
@@ -60,12 +60,23 @@ module Vagrant
       # the command completes. This is an almost line for line copy of
       # the actual `exec!` implementation, except that this
       # implementation also reports `:exit_status` to the block if given.
-      def exec!(command, options=nil, &block)
+      def exec!(commands, options=nil, &block)
         retryable(:tries => 5, :on => [IOError, Net::SSH::Disconnect], :sleep => 1.0) do
-          metach = session.open_channel do |channel|
-            channel.exec(command) do |ch, success|
-              raise "could not execute command: #{command.inspect}" unless success
-              setup_channel_callbacks(ch, command, options, block)
+          metach = session.open_channel do |ch|
+            ch.exec("#{env.config.ssh.shell} -l") do |ch2, success|
+              # Set the terminal
+              ch2.send_data "export TERM=vt100\n"
+
+              # Output the commands as if they were entered on the command line
+              [commands].flatten.each do |command|
+                ch2.send_data "#{command}\n"
+              end
+
+              # Remember to exit
+              ch2.send_data "exit\n"
+
+              # Setup the callbacks
+              setup_channel_callbacks(ch2, commands, options, block)
             end
           end
 

data/lib/vagrant/systems.rb

@@ -10,3 +10,4 @@ require 'vagrant/systems/gentoo'
 require 'vagrant/systems/redhat'
 require 'vagrant/systems/suse'
 require 'vagrant/systems/ubuntu'
+require 'vagrant/systems/arch'

data/lib/vagrant/systems/arch.rb

@@ -0,0 +1,34 @@
+module Vagrant
+  module Systems
+    class Arch < Linux
+      def change_host_name(name)
+        vm.ssh.execute do |ssh|
+          # Only do this if the hostname is not already set
+          if !ssh.test?("sudo hostname | grep '#{name}'")
+            ssh.exec!("sudo sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/rc.conf")
+            ssh.exec!("sudo hostname #{name}")
+            ssh.exec!("sudo sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
+          end
+        end
+      end
+
+      def prepare_host_only_network(net_options=nil)
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.conf > /tmp/vagrant-network-interfaces")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-interfaces > /etc/rc.conf'")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = TemplateRenderer.render('network_entry_arch', :net_options => net_options)
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/rc.conf'")
+          ssh.exec!("sudo /etc/rc.d/network restart")
+          ssh.exec!("sudo su -c 'dhcpcd -k eth0 && dhcpcd eth0 & sleep 3'")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems/linux.rb

@@ -14,6 +14,7 @@ module Vagrant
           return :gentoo if ssh.test?("cat /etc/gentoo-release")
           return :redhat if ssh.test?("cat /etc/redhat-release")
           return :suse if ssh.test?("cat /etc/SuSE-release")
+          return :arch if ssh.test?("cat /etc/arch-release")
         end
 
         # Can't detect the distro, assume vanilla linux

data/lib/vagrant/systems/redhat.rb

@@ -39,7 +39,7 @@ module Vagrant
           if !ssh.test?("sudo hostname | grep '#{name}'")
             ssh.exec!("sudo sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
             ssh.exec!("sudo hostname #{name}")
-            ssh.exec!("sudo sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
+            ssh.exec!("sudo sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
           end
         end
       end

data/lib/vagrant/ui.rb

@@ -16,7 +16,7 @@ module Vagrant
       end
     end
 
-    [:report_progress, :ask, :no?, :yes?].each do |method|
+    [:clear_line, :report_progress, :ask, :no?, :yes?].each do |method|
       # By default do nothing, these aren't logged
       define_method(method) { |*args| }
     end
@@ -34,7 +34,9 @@ module Vagrant
         class_eval <<-CODE
           def #{method}(message, opts=nil)
             super(message)
-            @shell.say("\#{line_reset}\#{format_message(message, opts)}", #{color.inspect})
+            opts ||= {}
+            opts[:new_line] = true if !opts.has_key?(:new_line)
+            @shell.say("\#{format_message(message, opts)}", #{color.inspect}, opts[:new_line])
           end
         CODE
       end
@@ -53,11 +55,14 @@ module Vagrant
         percent = (progress.to_f / total.to_f) * 100
         line = "Progress: #{percent.to_i}%"
         line << " (#{progress} / #{total})" if show_parts
-        line = "#{line_reset}#{line}"
 
         @shell.say(line, nil, false)
       end
 
+      def clear_line
+        @shell.say(line_reset, nil, false)
+      end
+
       protected
 
       def format_message(message, opts=nil)

data/lib/vagrant/util/counter.rb

@@ -5,11 +5,13 @@ module Vagrant
     # Atomic counter implementation. This is useful for incrementing
     # a counter which is guaranteed to only be used once in its class.
     module Counter
-      def get_and_update_counter
+      def get_and_update_counter(name=nil)
+        name ||= :global
+
         mutex.synchronize do
-          @__counter ||= 1
-          result = @__counter
-          @__counter += 1
+          @__counter ||= Hash.new(1)
+          result = @__counter[name]
+          @__counter[name] += 1
           result
         end
       end

data/lib/vagrant/util/safe_exec.rb

@@ -8,13 +8,20 @@ module Vagrant
     # forking.
     module SafeExec
       def safe_exec(command)
+        # Create a list of things to rescue from. Since this is OS
+        # specific, we need to do some defined? checks here to make
+        # sure they exist.
+        rescue_from = []
+        rescue_from << Errno::EOPNOTSUPP if defined?(Errno::EOPNOTSUPP)
+        rescue_from << Errno::E045 if defined?(Errno::E045)
+
         fork_instead = false
         begin
           pid = nil
           pid = fork if fork_instead
           Kernel.exec(command) if pid.nil?
           Process.wait(pid) if pid
-        rescue Errno::E045
+        rescue *rescue_from
           # We retried already, raise the issue and be done
           raise if fork_instead
 

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.8.2"
+  VERSION = "0.8.3"
 end

data/lib/vagrant/vm.rb

@@ -66,7 +66,8 @@ module Vagrant
           :redhat  => Systems::Redhat,
           :suse    => Systems::Suse,
           :linux   => Systems::Linux,
-          :solaris => Systems::Solaris
+          :solaris => Systems::Solaris,
+          :arch    => Systems::Arch
         }
 
         raise Errors::VMSystemError, :_key => :unknown_type, :system => system.to_s if !mapping.has_key?(system)

data/templates/commands/init/Vagrantfile.erb

@@ -58,7 +58,7 @@ Vagrant::Config.run do |config|
   #   chef.add_role "web"
   #
   #   # You may also specify custom JSON attributes:
-  #   chef.json.merge!({ :mysql_password => "foo" })
+  #   chef.json = { :mysql_password => "foo" }
   # end
 
   # Enable provisioning with chef server, specifying the chef server URL,
@@ -71,7 +71,7 @@ Vagrant::Config.run do |config|
   # HTTP instead of HTTPS depending on your configuration. Also change the
   # validation key to validation.pem.
   #
-  # config.vm.provision :chef_server do |chef|
+  # config.vm.provision :chef_client do |chef|
   #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
   #   chef.validation_key_path = "ORGNAME-validator.pem"
   # end

data/templates/locales/en.yml

@@ -127,7 +127,7 @@ en:
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         If VirtualBox is installed, it may be an incorrect version. Vagrant currently
-        requires VirtualBox 4.0.x. Please install the proper version to continue.
+        requires VirtualBox 4.1.x. Please install the proper version to continue.
 
         If you have an older or newer version of VirtualBox, please make sure you're
         using the proper version of Vagrant. Ask the mailing list if you have questions.
@@ -182,10 +182,9 @@ en:
     commands:
       common:
         vm_not_created: "VM not created. Moving on..."
+        vm_not_running: "VM is not currently running. Please bring it up to run this command."
       box:
         no_installed_boxes: "There are no installed boxes! Use `vagrant box add` to add some."
-      ssh:
-        command: "Command: %{command}"
       status:
         aborted: |-
           The VM is in an aborted state. This means that it was abruptly

data/templates/network_entry_arch.erb

@@ -0,0 +1,9 @@
+
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+interface=eth<%= net_options[:adapter] %>
+address=<%= net_options[:ip]%>
+netmask=<%= net_options[:netmask] %>
+gateway=
+#VAGRANT-END

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -86,8 +86,8 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
         :provisioning_path => @config.provisioning_path,
         :cookbooks_path => @action.guest_paths(@action.cookbook_folders),
         :recipe_url => @config.recipe_url,
-        :roles_path => @action.guest_paths(@action.role_folders),
-        :data_bags_path => @action.guest_paths(@action.data_bags_folders)
+        :roles_path => @action.guest_paths(@action.role_folders).first,
+        :data_bags_path => @action.guest_paths(@action.data_bags_folders).first
       })
 
       @action.setup_solo_config

data/test/vagrant/provisioners/chef_test.rb

@@ -25,6 +25,17 @@ class ChefProvisionerTest < Test::Unit::TestCase
       assert result !~ /"json":/
     end
 
+    should "not include the 'run_list' key in json if not accessed" do
+      result = @config.merged_json
+      assert !result.has_key?(:run_list)
+    end
+
+    should "include the 'run_list' key in json if it is set" do
+      @config.run_list << "foo"
+      result = @config.merged_json
+      assert result.has_key?(:run_list)
+    end
+
     should "provide accessors to the run list" do
       @config.run_list << "foo"
       assert !@config.run_list.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -310,6 +310,7 @@ files:
 - lib/vagrant/ssh.rb
 - lib/vagrant/ssh/session.rb
 - lib/vagrant/systems.rb
+- lib/vagrant/systems/arch.rb
 - lib/vagrant/systems/base.rb
 - lib/vagrant/systems/debian.rb
 - lib/vagrant/systems/freebsd.rb
@@ -339,6 +340,7 @@ files:
 - templates/commands/init/Vagrantfile.erb
 - templates/config/validation_failed.erb
 - templates/locales/en.yml
+- templates/network_entry_arch.erb
 - templates/network_entry_debian.erb
 - templates/network_entry_gentoo.erb
 - templates/network_entry_redhat.erb