mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-01 02:55:56 +01:00
Add cli commands for users and groups (#1993)
Adds cli commands to manage users and groups. Co-authored-by: Matthias Thieroff <matthias.thieroff@cloudogu.com>
This commit is contained in:
@@ -111,7 +111,15 @@ public class TemplateRenderer {
|
||||
* @return table for templating content
|
||||
*/
|
||||
public Table createTable() {
|
||||
return new Table(getSpecOrDie().resourceBundle());
|
||||
return new Table(getBundle());
|
||||
}
|
||||
|
||||
protected CliContext getContext() {
|
||||
return context;
|
||||
}
|
||||
|
||||
protected ResourceBundle getBundle() {
|
||||
return getSpecOrDie().resourceBundle();
|
||||
}
|
||||
|
||||
private CommandLine.Model.CommandSpec getSpecOrDie() {
|
||||
@@ -137,7 +145,7 @@ public class TemplateRenderer {
|
||||
UnaryOperator<String> upper = value -> value.toUpperCase(context.getLocale());
|
||||
finalModel.put("upper", upper);
|
||||
|
||||
ResourceBundle resourceBundle = getSpecOrDie().resourceBundle();
|
||||
ResourceBundle resourceBundle = getBundle();
|
||||
if (resourceBundle != null) {
|
||||
finalModel.put("i18n", new I18n(resourceBundle));
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package sonia.scm.repository.cli;
|
||||
|
||||
import picocli.CommandLine;
|
||||
|
||||
@CommandLine.Command(name = "group")
|
||||
public class GroupCommand {}
|
||||
30
scm-core/src/main/java/sonia/scm/user/cli/UserCommand.java
Normal file
30
scm-core/src/main/java/sonia/scm/user/cli/UserCommand.java
Normal file
@@ -0,0 +1,30 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package sonia.scm.user.cli;
|
||||
|
||||
import picocli.CommandLine;
|
||||
|
||||
@CommandLine.Command(name = "user")
|
||||
public class UserCommand {}
|
||||
@@ -49,7 +49,12 @@ class CommandValidatorTest {
|
||||
|
||||
@Test
|
||||
void shouldValidateCommand() {
|
||||
ResourceBundle resourceBundle = ResourceBundle.getBundle("sonia.scm.cli.i18n", Locale.ENGLISH);
|
||||
ResourceBundle resourceBundle = ResourceBundle.getBundle("sonia.scm.cli.i18n", Locale.ENGLISH, new ResourceBundle.Control() {
|
||||
@Override
|
||||
public Locale getFallbackLocale(String baseName, Locale locale) {
|
||||
return Locale.ROOT;
|
||||
}
|
||||
});
|
||||
when(context.getLocale()).thenReturn(Locale.ENGLISH);
|
||||
CommandLine commandLine = new CommandLine(Command.class, new TestingCommandFactory());
|
||||
commandLine.setResourceBundle(resourceBundle);
|
||||
@@ -63,7 +68,12 @@ class CommandValidatorTest {
|
||||
|
||||
@Test
|
||||
void shouldValidateCommandWithGermanLocale() {
|
||||
ResourceBundle resourceBundle = ResourceBundle.getBundle("sonia.scm.cli.i18n", Locale.GERMAN);
|
||||
ResourceBundle resourceBundle = ResourceBundle.getBundle("sonia.scm.cli.i18n", Locale.GERMAN, new ResourceBundle.Control() {
|
||||
@Override
|
||||
public Locale getFallbackLocale(String baseName, Locale locale) {
|
||||
return Locale.ROOT;
|
||||
}
|
||||
});
|
||||
when(context.getLocale()).thenReturn(Locale.GERMAN);
|
||||
CommandLine commandLine = new CommandLine(Command.class, new TestingCommandFactory());
|
||||
commandLine.setResourceBundle(resourceBundle);
|
||||
@@ -79,7 +89,7 @@ class CommandValidatorTest {
|
||||
public static class Command implements Runnable {
|
||||
|
||||
@CommandLine.Mixin
|
||||
private CommandValidator commandValidator;
|
||||
private final CommandValidator commandValidator;
|
||||
|
||||
@Email
|
||||
@CommandLine.Option(names = "--mail")
|
||||
|
||||
Reference in New Issue
Block a user