mirror of
https://github.com/hashicorp/vagrant.git
synced 2025-12-18 15:46:05 -05:00
Merge pull request #13731 from survivant/main
Fix typos and linguistic errors in documentation / hacktoberfest
This commit is contained in:
parent
342afc21cb
commit
81e6dfa595
10 changed files with 16 additions and 16 deletions
|
|
@ -10,7 +10,7 @@ if Thread.respond_to?(:report_on_exception=)
|
|||
Thread.report_on_exception = false
|
||||
end
|
||||
|
||||
# Split arguments by "--" if its there, we'll recombine them later
|
||||
# Split arguments by "--" if it's there, we'll recombine them later
|
||||
argv = ARGV.dup
|
||||
argv_extra = []
|
||||
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ and they are executed via subprocess just like a real plugin would be.
|
|||
|
||||
The difference is that these plugins are linked directly into the single
|
||||
command binary. We do this currently for ease of development of the project.
|
||||
In future we will split these out into standalone repositories and
|
||||
In the future we will split these out into standalone repositories and
|
||||
binaries.
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ module Vagrant
|
|||
insert(index + 1, middleware, *args, &block)
|
||||
end
|
||||
|
||||
# Replaces the given middlware object or index with the new
|
||||
# Replaces the given middleware object or index with the new
|
||||
# middleware.
|
||||
def replace(index, middleware, *args, **keywords, &block)
|
||||
if index.is_a?(Integer)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ module Vagrant
|
|||
module Action
|
||||
module Builtin
|
||||
# This middleware class allows a sort of "conditional" run within
|
||||
# a single middlware sequence. It takes another middleware runnable,
|
||||
# a single middleware sequence. It takes another middleware runnable,
|
||||
# runs it with the same environment, then yields the resulting env to a block,
|
||||
# allowing that block to determine the next course of action in the
|
||||
# middleware sequence.
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@ module Vagrant
|
|||
|
||||
# Loads another environment for the given Vagrantfile, sharing as much
|
||||
# useful state from this Environment as possible (such as UI and paths).
|
||||
# Any initialization options can be overidden using the opts hash.
|
||||
# Any initialization options can be overridden using the opts hash.
|
||||
#
|
||||
# @param [String] vagrantfile Path to a Vagrantfile
|
||||
# @return [Environment]
|
||||
|
|
@ -567,7 +567,7 @@ module Vagrant
|
|||
|
||||
# Determine the host class to use. ":detect" is an old Vagrant config
|
||||
# that shouldn't be valid anymore, but we respect it here by assuming
|
||||
# its old behavior. No need to deprecate this because I thin it is
|
||||
# its old behavior. No need to deprecate this because I think it is
|
||||
# fairly harmless.
|
||||
host_klass = vagrantfile.config.vagrant.host
|
||||
host_klass = nil if host_klass == :detect
|
||||
|
|
@ -883,7 +883,7 @@ module Vagrant
|
|||
|
||||
# Create the version file that we use to track the structure of
|
||||
# the home directory. If we have an old version, we need to explicitly
|
||||
# upgrade it. Otherwise, we just mark that its the current version.
|
||||
# upgrade it. Otherwise, we just mark that it's the current version.
|
||||
version_file = @home_path.join("setup_version")
|
||||
if version_file.file?
|
||||
version = version_file.read.chomp
|
||||
|
|
@ -1059,7 +1059,7 @@ module Vagrant
|
|||
end
|
||||
ui.info("\n")
|
||||
# Force halt after installation and require command to be run again. This
|
||||
# will proper load any new locally installed plugins which are now available.
|
||||
# will properly load any new locally installed plugins which are now available.
|
||||
ui.warn(I18n.t("vagrant.plugins.local.install_rerun_command"))
|
||||
exit(-1)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ module Vagrant
|
|||
#
|
||||
# @param [Environment] env Vagrant::Environment object of the
|
||||
# environment that this configuration has been loaded into. This
|
||||
# gives you convenient access to things like the the root path
|
||||
# gives you convenient access to things like the root path
|
||||
# and so on.
|
||||
# @param [ErrorRecorder] errors
|
||||
def validate(env, errors)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ module VagrantPlugins
|
|||
"vagrant.version_latest", version: latest))
|
||||
@env.ui.machine("version-latest", latest)
|
||||
|
||||
# Determine if its a new version, and if so, output some more
|
||||
# Determine if it's a new version, and if so, output some more
|
||||
# information.
|
||||
current = Gem::Version.new(Vagrant::VERSION)
|
||||
latest = Gem::Version.new(latest)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ module VagrantPlugins
|
|||
# from standard docker
|
||||
matches = result.scan(/writing image .+:([^\s]+)/i).last
|
||||
if !matches
|
||||
# Check for outout of docker using containerd backend store
|
||||
# Check for output of docker using containerd backend store
|
||||
matches = result.scan(/exporting manifest list .+:([^\s]+)/i).last
|
||||
end
|
||||
if !matches
|
||||
|
|
@ -263,12 +263,12 @@ module VagrantPlugins
|
|||
if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
|
||||
return $1.to_s
|
||||
else
|
||||
# TODO: Raise an user friendly message
|
||||
# TODO: Raise a user-friendly message
|
||||
raise 'Unable to fetch docker bridge IP!'
|
||||
end
|
||||
end
|
||||
|
||||
# @param [String] network - name of network to connect conatiner to
|
||||
# @param [String] network - name of network to connect container to
|
||||
# @param [String] cid - container id
|
||||
# @param [Array] opts - An array of flags used for listing networks
|
||||
def connect_network(network, cid, opts=nil)
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ module VagrantPlugins
|
|||
end
|
||||
|
||||
def parse_environment_metadata
|
||||
# Parse out the environment manifest path since puppet apply doesnt do that for us.
|
||||
# Parse out the environment manifest path since puppet apply doesn't do that for us.
|
||||
environment_conf = File.join(environments_guest_path, @config.environment, "environment.conf")
|
||||
if @machine.communicate.test("test -e #{environment_conf}", sudo: true)
|
||||
@machine.communicate.sudo("cat #{environment_conf}") do | type, data|
|
||||
|
|
|
|||
|
|
@ -68,13 +68,13 @@ variable to point to the proper test directory inside of the Vagrant source.
|
|||
### How to run specific tests
|
||||
|
||||
Sometimes when debugging, it's useful to only run a small subset of tests, instead of
|
||||
waiting for evetything to run. This can be achieved by passing along arugments
|
||||
waiting for everything to run. This can be achieved by passing along arguments
|
||||
using the `VAGRANT_SPEC_ARGS` environment variable:
|
||||
|
||||
For example, here is what you could set to only run cli tests
|
||||
|
||||
```shell
|
||||
VAGRANT__SPEC_ARGS="--component cli"
|
||||
VAGRANT_SPEC_ARGS="--component cli"
|
||||
```
|
||||
|
||||
Or with the full command....
|
||||
|
|
|
|||
Loading…
Reference in a new issue