Skip to content

Commit 2495e84

Browse files
committed
Mention experimental providers in README
Removed outdated information on roles (deferring to `vagrant roles -h`). Added YARD options in preparation for generation and publishing of docs via CI. Change-Id: I47b5f35372c539fdede57e4f4005b5cbcce4eab6
1 parent 5377fbd commit 2495e84

5 files changed

+16
-7
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.gem
44
/.rbenv-version
55
/.settings.yaml
6+
/.yardoc/
67
/*.gem
78
/*.sublime-workspace
89
/no-update
@@ -32,3 +33,4 @@
3233
/phab
3334
/node_modules
3435
/tmp
36+
/doc/

.yardopts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
--readme README.md
2+
--charset utf-8
3+
--title "MediaWiki Vagrant"
4+
--markup markdown
5+
'lib/**/*.rb' - '*.md' 'support/**/*.md'

Gemfile.lock

+2
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ GEM
158158
rubyntlm (~> 0.1.1)
159159
savon (= 0.9.5)
160160
uuidtools (~> 2.1.2)
161+
yard (0.8.7.6)
161162

162163
PLATFORMS
163164
ruby
@@ -170,3 +171,4 @@ DEPENDENCIES
170171
rspec (~> 3.1, >= 3.1.0)
171172
rubocop
172173
vagrant!
174+
yard (~> 0.8, >= 0.8.7.6)

README.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ inspecting and interacting with MediaWiki code, including a powerful debugger
1313
and an interactive interpreter. Best of all, because the configuration is
1414
automated and contained in a virtual environment, mistakes are easy to undo.
1515

16-
1716
## Install
1817

1918
You'll need to install recent versions of Vagrant and VirtualBox.
2019

20+
(Note that *experimental* support for Parallels, LXC, VMWare Fusion, and
21+
Microsoft Hyper-V providers exists. See `support/README-lxc.md` or
22+
`support/README-parallels.md` for details on the former two.)
23+
2124
* VirtualBox: https://www.virtualbox.org/wiki/Downloads
2225
* Vagrant: http://www.vagrantup.com/downloads-archive.html (the version must be
2326
1.4.0 or higher). For NFS, use 1.5.4 or higher.
@@ -95,12 +98,8 @@ The latter will restart the VM.
9598

9699
You can add roles to MediaWiki-Vagrant! A 'role' represents a set of software
97100
configurations required for giving this machine some special function. Vagrant
98-
has several commands to manage enabled roles:
99-
100-
* disable-role
101-
* enable-role
102-
* list-roles
103-
* reset-roles
101+
has several commands to manage enabled roles. See `vagrant roles -h` for more
102+
help on usage.
104103

105104
If you'd like to use the Vagrant-Mediawiki codebase to describe a development
106105
environment that you could then share with other developers, you should do so

mediawiki-vagrant.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
2424

2525
s.add_development_dependency 'cucumber', '~> 2.0.0.rc4'
2626
s.add_development_dependency 'rspec', '~> 3.1', '>= 3.1.0'
27+
s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7.6'
2728
end

0 commit comments

Comments
 (0)