vagrantup 1.0.7 → 1.1.0

data/lib/vagrant/command/reload.rb

@@ -1,39 +0,0 @@
-require 'optparse'
-
-require 'vagrant/command/start_mixins'
-
-module Vagrant
-  module Command
-    class Reload < Base
-      include StartMixins
-
-      def execute
-        options = {}
-
-          opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant reload [vm-name]"
-          opts.separator ""
-          build_start_options(opts, options)
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        @logger.debug("'reload' each target VM...")
-        with_target_vms(argv) do |vm|
-          if vm.created?
-            @logger.info("Reloading: #{vm.name}")
-            vm.reload(options)
-          else
-            @logger.info("Not created: #{vm.name}. Not reloading.")
-            vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
-          end
-        end
-
-        # Success, exit status 0
-        0
-       end
-    end
-  end
-end

data/lib/vagrant/command/resume.rb

@@ -1,33 +0,0 @@
-require 'optparse'
-
-module Vagrant
-  module Command
-    class Resume < Base
-      def execute
-        options = {}
-
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant resume [vm-name]"
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        @logger.debug("'resume' each target VM...")
-        with_target_vms(argv) do |vm|
-          if vm.created?
-            @logger.info("Resume: #{vm.name}")
-            vm.resume
-          else
-            @logger.info("Not created: #{vm.name}. Not resuming.")
-            vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
-          end
-        end
-
-        # Success, exit status 0
-        0
-       end
-    end
-  end
-end

data/lib/vagrant/command/status.rb

@@ -1,36 +0,0 @@
-require 'optparse'
-
-module Vagrant
-  module Command
-    class Status < Base
-      def execute
-        options = {}
-
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant status [vm-name]"
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        state = nil
-        results = []
-        with_target_vms(argv) do |vm|
-          state = vm.state.to_s if !state
-          results << "#{vm.name.to_s.ljust(25)}#{vm.state.to_s.gsub("_", " ")}"
-        end
-
-        state = results.length == 1 ? state : "listing"
-
-        @env.ui.info(I18n.t("vagrant.commands.status.output",
-                            :states => results.join("\n"),
-                            :message => I18n.t("vagrant.commands.status.#{state}")),
-                     :prefix => false)
-
-        # Success, exit status 0
-        0
-       end
-    end
-  end
-end

data/lib/vagrant/command/suspend.rb

@@ -1,33 +0,0 @@
-require 'optparse'
-
-module Vagrant
-  module Command
-    class Suspend < Base
-      def execute
-        options = {}
-
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant suspend [vm-name]"
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        @logger.debug("'suspend' each target VM...")
-        with_target_vms(argv) do |vm|
-          if vm.created?
-            @logger.info("Suspending: #{vm.name}")
-            vm.suspend
-          else
-            @logger.info("Not created: #{vm.name}. Not suspending.")
-            vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
-          end
-        end
-
-        # Success, exit status 0
-        0
-       end
-    end
-  end
-end

data/lib/vagrant/command/up.rb

@@ -1,40 +0,0 @@
-require 'optparse'
-
-require 'vagrant/command/start_mixins'
-
-module Vagrant
-  module Command
-    class Up < Base
-      include StartMixins
-
-      def execute
-        options = {}
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant up [vm-name] [--[no-]provision] [-h]"
-          opts.separator ""
-          build_start_options(opts, options)
-        end
-
-        # Parse the options
-        argv = parse_options(opts)
-        return if !argv
-
-        # Go over each VM and bring it up
-        @logger.debug("'Up' each target VM...")
-        with_target_vms(argv) do |vm|
-          if vm.created?
-            @logger.info("Booting: #{vm.name}")
-            vm.ui.info I18n.t("vagrant.commands.up.vm_created")
-            vm.start(options)
-          else
-            @logger.info("Creating: #{vm.name}")
-            vm.up(options)
-          end
-        end
-
-        # Success, exit status 0
-        0
-       end
-    end
-  end
-end

data/lib/vagrant/communication.rb

@@ -1,7 +0,0 @@
-module Vagrant
-  module Communication
-    autoload :Base, 'vagrant/communication/base'
-
-    autoload :SSH,  'vagrant/communication/ssh'
-  end
-end

data/lib/vagrant/communication/base.rb

@@ -1,56 +0,0 @@
-module Vagrant
-  module Communication
-    # The base class for any classes that provide an API for communicating
-    # with the virtual machine.
-    #
-    # There are various stages that require Vagrant to copy files or
-    # run commands on the target system, and communication classes provide
-    # the abstraction necessary to perform these tasks, via SSH or some
-    # other mechanism.
-    #
-    # Any subclasses of this class **must** implement all of the methods
-    # below.
-    class Base
-      # Checks if the target machine is ready for communication.
-      #
-      # @return [Boolean]
-      def ready?
-      end
-
-      # Upload a file to the virtual machine.
-      #
-      # @param [String] from Path to a file to upload.
-      # @param [String] to Path to where to save this file.
-      def upload(from, to)
-      end
-
-      # Execute a command on the remote machine.
-      #
-      # @param [String] command Command to execute.
-      # @yield [type, data] Realtime output of the command being executed.
-      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
-      # @yieldparam [String] data Data for the given output.
-      # @return [Integer] Exit code of the command.
-      def execute(command, opts=nil)
-      end
-
-      # Execute a comand with super user privileges.
-      #
-      # See #execute for parameter information.
-      def sudo(command, opts=nil)
-      end
-
-      # Executes a command and returns a boolean statement if it was successful
-      # or not.
-      #
-      # This is implemented by default as expecting `execute` to return 0.
-      def test(command, opts=nil)
-        # Disable error checking no matter what
-        opts = (opts || {}).merge(:error_check => false)
-
-        # Successful if the exit status is 0
-        execute(command, opts) == 0
-      end
-    end
-  end
-end

data/lib/vagrant/config/base.rb

@@ -1,82 +0,0 @@
-module Vagrant
-  module Config
-    # The base class for all configuration classes. This implements
-    # basic things such as the environment instance variable which all
-    # config classes need as well as a basic `to_json` implementation.
-    class Base
-      # Loads configuration values from JSON back into the proper
-      # configuration classes. By default, this is done by simply
-      # iterating over all values in the JSON hash and assigning them
-      # to instance variables on the class.
-      def self.json_create(data)
-        data.inject(new) do |result, data|
-          key, value = data
-          result.instance_variable_set("@#{key}".to_sym, value) if key != "json_class"
-          result
-        end
-      end
-
-      # Allows setting options from a hash. By default this simply calls
-      # the `#{key}=` method on the config class with the value, which is
-      # the expected behavior most of the time.
-      def set_options(options)
-        options.each do |key, value|
-          send("#{key}=", value)
-        end
-      end
-
-      # Merge another configuration object into this one.
-      #
-      # @param [Object] other The other configuration object to merge from,
-      #   this must be the same type of object as this one.
-      # @return [Object] The merged object.
-      def merge(other)
-        result = self.class.new
-        instance_variables_hash.merge(other.instance_variables_hash).each do |key, value|
-          # Ignore keys that start with a double underscore. This allows
-          # configuration classes to still hold around internal state
-          # that isn't propagated.
-          if !key.start_with?("__")
-            result.instance_variable_set("@#{key}".to_sym, value)
-          end
-        end
-
-        result
-      end
-
-      # Called by {Top} after the configuration is loaded to validate
-      # the configuaration objects. Subclasses should implement this
-      # method and add any errors to the `errors` object given.
-      #
-      # @param [ErrorRecorder] errors
-      def validate(env, errors); end
-
-      # Converts the configuration to a raw hash by calling `#to_hash`
-      # on all instance variables (if it can) and putting them into
-      # a hash.
-      def to_hash
-        instance_variables_hash.inject({}) do |acc, data|
-          k,v = data
-          v = v.to_hash if v.respond_to?(:to_hash)
-          acc[k] = v
-          acc
-        end
-      end
-
-      # Converts to JSON, with the `json_class` field set so that when
-      # the JSON is parsed back, it can be loaded back into the proper class.
-      # See {json_create}.
-      def to_json(*a)
-        instance_variables_hash.to_json(*a)
-      end
-
-      # Returns the instance variables as a hash of key-value pairs.
-      def instance_variables_hash
-        instance_variables.inject({}) do |acc, iv|
-          acc[iv.to_s[1..-1]] = instance_variable_get(iv)
-          acc
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/config/error_recorder.rb

@@ -1,19 +0,0 @@
-module Vagrant
-  module Config
-    # A class which is passed into the various {Base#validate} methods and
-    # can be used as a helper to add error messages about a single config
-    # class.
-    class ErrorRecorder
-      attr_reader :errors
-
-      def initialize
-        @errors = []
-      end
-
-      # Adds an error to the list of errors.
-      def add(message)
-        @errors << message
-      end
-    end
-  end
-end

data/lib/vagrant/config/nfs.rb

@@ -1,8 +0,0 @@
-module Vagrant
-  module Config
-    class NFSConfig < Base
-      attr_accessor :map_uid
-      attr_accessor :map_gid
-    end
-  end
-end

data/lib/vagrant/config/package.rb

@@ -1,7 +0,0 @@
-module Vagrant
-  module Config
-    class PackageConfig < Base
-      attr_accessor :name
-    end
-  end
-end

data/lib/vagrant/config/ssh.rb

@@ -1,27 +0,0 @@
-module Vagrant
-  module Config
-    class SSHConfig < Base
-      attr_accessor :username
-      attr_accessor :password
-      attr_accessor :host
-      attr_accessor :port
-      attr_accessor :guest_port
-      attr_accessor :max_tries
-      attr_accessor :timeout
-      attr_accessor :private_key_path
-      attr_accessor :forward_agent
-      attr_accessor :forward_x11
-      attr_accessor :shell
-
-      def validate(env, errors)
-        [:username, :host, :max_tries, :timeout].each do |field|
-          errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym)
-        end
-
-        if private_key_path && !File.file?(File.expand_path(private_key_path, env.root_path))
-          errors.add(I18n.t("vagrant.config.ssh.private_key_missing", :path => private_key_path))
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/config/top.rb

@@ -1,72 +0,0 @@
-module Vagrant
-  module Config
-    # This class is the "top" configure class, which handles registering
-    # other configuration classes as well as validation of all configured
-    # classes. This is the object which is returned by {Environment#config}
-    # and has accessors to all other configuration classes.
-    #
-    # If you're looking to create your own configuration class, see {Base}.
-    class Top < Base
-      attr_reader :keys
-
-      def initialize(registry=nil)
-        @keys = {}
-        @registry = registry || Vagrant.config_keys
-      end
-
-      # We use method_missing as a way to get the configuration that is used
-      # for Vagrant and load the proper configuration classes for each.
-      def method_missing(name, *args)
-        return @keys[name] if @keys.has_key?(name)
-
-        config_klass = @registry.get(name.to_sym)
-        if config_klass
-          # Instantiate the class and return the instance
-          @keys[name] = config_klass.new
-          return @keys[name]
-        else
-          # Super it up to probably raise a NoMethodError
-          super
-        end
-      end
-
-      # Custom implementation to merge each key separately.
-      def merge(other)
-        result = self.class.new
-        @keys.each do |key, value|
-          result.keys[key] = value.merge(other.send(key))
-        end
-
-        other.keys.each do |key, value|
-          if !@keys.has_key?(key)
-            # This is a key that the other configuration class has
-            # that we don't, so just copy it in.
-            result.keys[key] = value.dup
-          end
-        end
-
-        result
-      end
-
-      # Validates the configuration classes of this instance and raises an
-      # exception if they are invalid. If you are implementing a custom configuration
-      # class, the method you want to implement is {Base#validate}. This is
-      # the method that checks all the validation, not one which defines
-      # validation rules.
-      def validate!(env)
-        # Validate each of the configured classes and store the results into
-        # a hash.
-        errors = @keys.inject({}) do |container, data|
-          key, instance = data
-          recorder = ErrorRecorder.new
-          instance.validate(env, recorder)
-          container[key.to_sym] = recorder if !recorder.errors.empty?
-          container
-        end
-
-        return if errors.empty?
-        raise Errors::ConfigValidationFailed, :messages => Util::TemplateRenderer.render("config/validation_failed", :errors => errors)
-      end
-    end
-  end
-end