Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98131
Change subject: Renamed all <command>-roles to roles-<command>
......................................................................
Renamed all <command>-roles to roles-<command>
Having all role-related commands begin with the same word
make it easier to spot them in the list of available commands,
and, in case autocomplete works, would probably allow for easier
listing of just the needed role-related commands.
I am still not sure how exactly to do aliasing in the non-labs case.
Change-Id: I40da784971d20400ebba05ad4fa51038e9f73582
---
M lib/labs-vagrant.rb
M lib/mediawiki-vagrant.rb
M lib/mediawiki-vagrant/roles.rb
M puppet/manifests/roles.pp
4 files changed, 21 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/31/98131/1
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index 1c6237c..93a16d4 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -7,7 +7,7 @@
require "#{SCRIPT_ROOT}/mediawiki-vagrant/helpers.rb"
case ARGV.shift
-when 'list-roles'
+when 'roles-list', 'list-roles'
puts "Available roles:\n\n"
enabled = roles_enabled
roles_available.each { |role|
@@ -15,19 +15,19 @@
puts "#{prefix} #{role}"
}
puts "\nRoles marked with '*' are enabled."
- puts 'Use "labsvagrant enable-role" & "labsvagrant disable-role" to
customize.'
+ puts 'Use "labsvagrant roles-enable" & "labsvagrant roles-disable" to
customize.'
-when 'reset-roles'
+when 'roles-reset', 'reset-roles'
if not ARGV.empty? or ['-h', '--help'].include? ARGV.first
puts 'Disable all optional roles.'
- puts 'USAGE: labsvagrant reset-roles'
+ puts 'USAGE: labsvagrant roles-reset'
end
update_roles []
puts 'All roles were disabled.'
-when 'enable-role'
+when 'roles-enable', 'enable-role'
if ARGV.empty? or ['-h', '--help'].include? ARGV.first
- puts 'Enable an optional role (run "labsvagrant list-roles" for a
list).'
- puts 'USAGE: labsvagrant enable-role ROLE'
+ puts 'Enable an optional role (run "labsvagrant roles-list" for a
list).'
+ puts 'USAGE: labsvagrant roles-enable ROLE'
return 0
end
avail = roles_available
@@ -38,10 +38,10 @@
end
end
update_roles(roles_enabled + ARGV)
-when 'disable-role'
+when 'roles-disable', 'disable-role'
if ARGV.empty? or ['-h', '--help'].include? ARGV.first
puts 'Disable one or more optional roles.'
- puts 'USAGE: labsvagrant disable-role ROLE'
+ puts 'USAGE: labsvagrant roles-disable ROLE'
return 0
end
enabled = roles_enabled
diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb
index c205cde..33694d3 100644
--- a/lib/mediawiki-vagrant.rb
+++ b/lib/mediawiki-vagrant.rb
@@ -14,27 +14,28 @@
RunTests
end
- command 'list-roles' do
+ command 'roles-list' do
require 'mediawiki-vagrant/roles'
ListRoles
end
- command 'reset-roles' do
+ command 'roles-reset' do
require 'mediawiki-vagrant/roles'
ResetRoles
end
- command 'enable-role' do
+ command 'roles-enable' do
require 'mediawiki-vagrant/roles'
EnableRole
end
- command 'disable-role' do
+ command 'roles-disable' do
require 'mediawiki-vagrant/roles'
DisableRole
end
action_hook(self::ALL_ACTIONS) do |hook|
+ puts 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
require 'mediawiki-vagrant/middleware'
hook.before(Vagrant::Action::Builtin::Provision, Middleware)
end
diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb
index 7a610da..59d37eb 100644
--- a/lib/mediawiki-vagrant/roles.rb
+++ b/lib/mediawiki-vagrant/roles.rb
@@ -10,7 +10,7 @@
@env.ui.info "#{prefix} #{role}"
}
@env.ui.info "\nRoles marked with '*' are enabled."
- @env.ui.info 'Use "vagrant enable-role" & "vagrant disable-role"
to customize.'
+ @env.ui.info 'Use "vagrant roles-enable" & "vagrant roles-disable"
to customize.'
return 0
end
end
@@ -18,8 +18,8 @@
class EnableRole < Vagrant.plugin(2, :command)
def execute
if @argv.empty? or ['-h', '--help'].include? @argv.first
- @env.ui.info 'Enable an optional role (run "vagrant
list-roles" for a list).'
- @env.ui.info 'USAGE: vagrant enable-role ROLE'
+ @env.ui.info 'Enable an optional role (run "vagrant
roles-list" for a list).'
+ @env.ui.info 'USAGE: vagrant roles-enable ROLE'
return 0
end
avail = roles_available
@@ -40,7 +40,7 @@
def execute
if @argv.empty? or ['-h', '--help'].include? @argv.first
@env.ui.info 'Disable one or more optional roles.'
- @env.ui.info 'USAGE: vagrant disable-role ROLE'
+ @env.ui.info 'USAGE: vagrant roles-disable ROLE'
return 0
end
enabled = roles_enabled
@@ -61,7 +61,7 @@
def execute
if not @argv.empty? or ['-h', '--help'].include? @argv.first
@env.ui.info 'Disable all optional roles.'
- @env.ui.info 'USAGE: vagrant reset-roles'
+ @env.ui.info 'USAGE: vagrant roles-reset'
return 0
end
update_roles []
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 27e33eb..762a131 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -4,7 +4,7 @@
# giving this machine some special function. Vagrant has several
# commands to manage enabled roles:
#
-# vagrant disable-role | enable-role | list-roles | reset-roles
+# vagrant roles-disable | roles-enable | roles-list | roles-reset
#
# If you'd like to use the Vagrant-Mediawiki codebase to describe
# a development environment that you could then share with other
@@ -382,7 +382,7 @@
# The IDE is installed on your machine, not the Vagrant VM.
#
# -- To use, enable this role from shell:
-# vagrant enable-role remote_debug
+# vagrant roles-enable remote_debug
# -- In your IDE, enable "Start Listening for PHP Debug Connections"
# -- For Firefox, install
# https://addons.mozilla.org/en-US/firefox/addon/the-easiest-xdebug
--
To view, visit https://gerrit.wikimedia.org/r/98131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40da784971d20400ebba05ad4fa51038e9f73582
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
