vagrantup 0.8.10 → 0.9.0

data/lib/vagrant/systems/linux.rb

@@ -1,82 +0,0 @@
-require 'vagrant/systems/linux/error'
-require 'vagrant/systems/linux/config'
-
-module Vagrant
-  module Systems
-    class Linux < Base
-      def distro_dispatch
-        vm.ssh.execute do |ssh|
-          if ssh.test?("cat /etc/debian_version")
-            return :debian if ssh.test?("cat /proc/version | grep 'Debian'")
-            return :ubuntu if ssh.test?("cat /proc/version | grep 'Ubuntu'")
-          end
-
-          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
-        nil
-      end
-
-      def halt
-        vm.env.ui.info I18n.t("vagrant.systems.linux.attempting_halt")
-        vm.ssh.execute do |ssh|
-          ssh.exec!("sudo halt")
-        end
-
-        # Wait until the VM's state is actually powered off. If this doesn't
-        # occur within a reasonable amount of time (15 seconds by default),
-        # then simply return and allow Vagrant to kill the machine.
-        count = 0
-        while vm.vm.state != :powered_off
-          count += 1
-
-          return if count >= vm.env.config.linux.halt_timeout
-          sleep vm.env.config.linux.halt_check_interval
-        end
-      end
-
-      def mount_shared_folder(ssh, name, guestpath, owner, group)
-        ssh.exec!("sudo mkdir -p #{guestpath}")
-        mount_folder(ssh, name, guestpath, owner, group)
-        ssh.exec!("sudo chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")
-      end
-
-      def mount_nfs(ip, folders)
-        # TODO: Maybe check for nfs support on the guest, since its often
-        # not installed by default
-        folders.each do |name, opts|
-          vm.ssh.execute do |ssh|
-            ssh.exec!("sudo mkdir -p #{opts[:guestpath]}")
-            ssh.exec!("sudo mount #{ip}:'#{opts[:hostpath]}' #{opts[:guestpath]}", :_error_class => LinuxError, :_key => :mount_nfs_fail)
-          end
-        end
-      end
-
-      #-------------------------------------------------------------------
-      # "Private" methods which assist above methods
-      #-------------------------------------------------------------------
-      def mount_folder(ssh, name, guestpath, owner, group, sleeptime=5)
-        # Determine the permission string to attach to the mount command
-        options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
-
-        attempts = 0
-        while true
-          result = ssh.exec!("sudo mount -t vboxsf #{options} #{name} #{guestpath}") do |ch, type, data|
-            # net/ssh returns the value in ch[:result] (based on looking at source)
-            ch[:result] = !!(type == :stderr && data =~ /No such device/i)
-          end
-
-          break unless result
-
-          attempts += 1
-          raise LinuxError, :mount_fail if attempts >= 10
-          sleep sleeptime
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/systems/redhat.rb

@@ -1,48 +0,0 @@
-module Vagrant
-  module Systems
-    class Redhat < Linux
-      def prepare_host_only_network(net_options)
-        # Remove any previous host only network additions to the
-        # interface file.
-        vm.ssh.execute do |ssh|
-          # Clear out any previous entries
-          ssh.exec!("sudo touch #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]}")
-          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]} > /tmp/vagrant-ifcfg-eth#{net_options[:adapter]}")
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-ifcfg-eth#{net_options[:adapter]} > #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]}'")
-        end
-      end
-
-      def enable_host_only_network(net_options)
-        entry = TemplateRenderer.render('network_entry_redhat', :net_options => net_options)
-
-        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
-
-        vm.ssh.execute do |ssh|
-          interface_up = ssh.test?("/sbin/ifconfig eth#{net_options[:adapter]} | grep 'inet addr:'")
-          ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null") if interface_up
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]}'")
-          ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
-        end
-      end
-
-      # The path to the directory with the network configuration scripts.
-      # This is pulled out into its own directory since there are other
-      # operationg systems (SuSE) which behave similarly but with a different
-      # path to the network scripts.
-      def network_scripts_dir
-        '/etc/sysconfig/network-scripts/'
-      end
-
-      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/sysconfig/network")
-            ssh.exec!("sudo hostname #{name}")
-            ssh.exec!("sudo sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/systems/solaris.rb

@@ -1,113 +0,0 @@
-module Vagrant
-  module Systems
-    # A general Vagrant system implementation for "solaris".
-    #
-    # Contributed by Blake Irvin <b.irvin@modcloth.com>
-    class Solaris < Base
-      # A custom config class which will be made accessible via `config.solaris`
-      # This is not necessary for all system implementers, of course. However,
-      # generally, Vagrant tries to make almost every aspect of its execution
-      # configurable, and this assists that goal.
-      class SolarisConfig < Vagrant::Config::Base
-        configures :solaris
-
-        attr_accessor :halt_timeout
-        attr_accessor :halt_check_interval
-        # This sets the command to use to execute items as a superuser. sudo is default
-        attr_accessor :suexec_cmd
-        attr_accessor :device
-
-        def initialize
-          @halt_timeout = 30
-          @halt_check_interval = 1
-          @suexec_cmd = 'sudo'
-          @device = "e1000g"
-        end
-      end
-
-      # Here for whenever it may be used.
-      class SolarisError < Errors::VagrantError
-        error_namespace("vagrant.systems.solaris")
-      end
-
-      def prepare_host_only_network(net_options=nil)
-      end
-
-      def enable_host_only_network(net_options)
-        device = "#{vm.env.config.solaris.device}#{net_options[:adapter]}"
-        su_cmd = vm.env.config.solaris.suexec_cmd
-        ifconfig_cmd = "#{su_cmd} /sbin/ifconfig #{device}"
-        vm.ssh.execute do |ssh|
-          ssh.exec!("#{ifconfig_cmd} plumb")
-          ssh.exec!("#{ifconfig_cmd} inet #{net_options[:ip]} netmask #{net_options[:netmask]}")
-          ssh.exec!("#{ifconfig_cmd} up")
-          ssh.exec!("#{su_cmd} sh -c \"echo '#{net_options[:ip]}' > /etc/hostname.#{device}\"")
-        end
-      end
-
-      def change_host_name(name)
-        su_cmd = vm.env.config.solaris.suexec_cmd
-        vm.ssh.execute do |ssh|
-          # Only do this if the hostname is not already set
-          if !ssh.test?("#{su_cmd} hostname | grep '#{name}'")
-            ssh.exec!("#{su_cmd} sh -c \"echo '#{name}' > /etc/nodename\"")
-            ssh.exec!("#{su_cmd} uname -S #{name}")
-          end
-        end
-      end
-
-
-      # There should be an exception raised if the line
-      #
-      #     vagrant::::profiles=Primary Administrator
-      #
-      # does not exist in /etc/user_attr. TODO
-      def halt
-        vm.env.ui.info I18n.t("vagrant.systems.solaris.attempting_halt")
-        vm.ssh.execute do |ssh|
-          # Wait until the VM's state is actually powered off. If this doesn't
-          # occur within a reasonable amount of time (15 seconds by default),
-          # then simply return and allow Vagrant to kill the machine.
-          count = 0
-          last_error = nil
-          while vm.vm.state != :powered_off
-            begin
-              ssh.exec!("#{vm.env.config.solaris.suexec_cmd} /usr/sbin/poweroff")
-            rescue IOError => e
-              # Save the last error; if it's not shutdown in a reasonable amount
-              # of attempts we will re-raise the error so it's not hidden for
-              # all time
-              last_error = e
-            end
-
-            count += 1
-            if count >= vm.env.config.solaris.halt_timeout
-              # Check for last error and re-raise it
-              if last_error != nil
-                raise last_error
-              else
-                # Otherwise, just return
-                return
-              end
-            end
-
-            # Still opportunities remaining; sleep and loop
-            sleep vm.env.config.solaris.halt_check_interval
-          end # while
-        end # do
-      end
-
-      def mount_shared_folder(ssh, name, guestpath, owner, group)
-        # Create the shared folder
-        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
-
-        # Mount the folder with the proper owner/group
-        options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
-        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{options} #{name} #{guestpath}")
-
-        # chown the folder to the proper owner/group
-        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")
-      end
-    end
-  end
-end

data/lib/vagrant/systems/ubuntu.rb

@@ -1,17 +0,0 @@
-require 'vagrant/systems/debian'
-
-module Vagrant
-  module Systems
-    class Ubuntu < Debian
-      def change_host_name(name)
-        vm.ssh.execute do |ssh|
-          if !ssh.test?("sudo hostname | grep '#{name}'")
-            ssh.exec!("sudo sed -i 's/.*$/#{name}/' /etc/hostname")
-            ssh.exec!("sudo sed -i 's@^\\(127[.]0[.]1[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
-            ssh.exec!("sudo service hostname start")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/systems.rb

@@ -1,13 +0,0 @@
-# These can't be autoloaded because they have to register functionality
-# with Vagrant core.
-require 'vagrant/systems/base'
-require 'vagrant/systems/freebsd'
-require 'vagrant/systems/linux'
-require 'vagrant/systems/solaris'
-
-require 'vagrant/systems/debian'
-require 'vagrant/systems/gentoo'
-require 'vagrant/systems/redhat'
-require 'vagrant/systems/suse'
-require 'vagrant/systems/ubuntu'
-require 'vagrant/systems/arch'

data/templates/network_entry_arch.erb

@@ -1,9 +0,0 @@
-
-#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/templates/network_entry_debian.erb

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

data/templates/network_entry_gentoo.erb

@@ -1,5 +0,0 @@
-#VAGRANT-BEGIN
-# The contents below are automatically generated by Vagrant.
-# Please do not modify any of these contents.
-config_eth<%= net_options[:adapter] %>=("<%= net_options[:ip] %> netmask <%= net_options[:netmask] %>")
-#VAGRANT-END

data/templates/network_entry_redhat.erb

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

data/test/unit/vagrant/ui_test.rb

@@ -1,29 +0,0 @@
-require "test_helper"
-
-class ShellUITest < Test::Unit::TestCase
-  setup do
-    @klass = Vagrant::UI::Shell
-    @shell = mock("shell")
-    @instance = @klass.new(vagrant_env, @shell)
-  end
-
-  context "prefixing with resource" do
-    should "prefix message with environment resource" do
-      @shell.expects(:say).with() do |message, color|
-        assert message =~ /\[#{@instance.env.resource}\]/
-        true
-      end
-
-      @instance.info("vagrant.errors.test_key")
-    end
-
-    should "not prefix the message if given false" do
-      @shell.expects(:say).with() do |message, color|
-        assert message !~ /\[#{@instance.env.resource}\]/
-        true
-      end
-
-      @instance.info("vagrant.errors.test_key", :prefix => false)
-    end
-  end
-end