12000556144

Committed 24 Nov 2024 11:34PM UTC coverage: 82.022% (-0.8%) from 82.783%

Build # 12000556144

Build Type

push

github

Committed by

JaCraig

Commit Message

feat: Update configs, workflows, and target frameworks

Updated .editorconfig with new C# style preferences. Modified dependabot.yml to change directory paths and dependencies. Updated codeql-analysis.yml, dependabot-reviewer.yml, docsfx.yml, dotnet-publish.yml, and dotnet-test.yml to use centralized workflows. Changed ExampleApp.csproj, Monarch.Tests.csproj, Monarch.csproj, and docfx.json to target .NET 8.0 and .NET 9.0. Simplified service registration in MonarchModule.cs. Updated various files to use BigBook and Valkyrie libraries. Updated README.md with new instructions.

BREAKING CHANGE: Removing .Net 6/7 support as .Net 9 dependencies say they work with it in the package but then throw warnings. I don't know why this approach was taken but it breaks a bunch of automation.

Run Details

204 of 282 branches covered (72.34%)

Branch coverage included in aggregate %.

11 of 12 new or added lines in 3 files covered. (91.67%)

1 existing line in 1 file now uncovered.

380 of 430 relevant lines covered (88.37%)

1072.37 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

81.48

/Monarch/Commands/Parser/ArgParser.cs

﻿/*
Copyright 2018 James Craig

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

using BigBook.ExtensionMethods;
using Monarch.Commands.Default;
using Monarch.Commands.Interfaces;
using Monarch.Exceptions;
using Monarch.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;

namespace Monarch.Commands.Parser
{
    /// <summary>
    /// Arg parser
    /// </summary>
    /// <seealso cref="IArgParser"/>
    public class ArgParser : IArgParser
    {
        /// <summary>
        /// Initializes a new instance of the <see cref="ArgParser"/> class.
        /// </summary>
        /// <param name="options">The options.</param>
        /// <param name="commands">The commands.</param>
        public ArgParser(IOptions options, IEnumerable<ICommand> commands)
        {
            Commands = commands;
            Options = options;
        }

        /// <summary>
        /// Gets the commands.
        /// </summary>
        /// <value>The commands.</value>
        public IEnumerable<ICommand> Commands { get; }

        /// <summary>
        /// Gets the options.
        /// </summary>
        /// <value>The options.</value>
        public IOptions Options { get; }

        /// <summary>
        /// Gets the tokens.
        /// </summary>
        /// <param name="args">The arguments.</param>
        /// <returns>Converts the args into tokens.</returns>
        /// <exception cref="ParsingException">Unable to find command.</exception>
        public TokenBaseClass[] GetTokens(string?[]? args)
        {
            if (args is null || args.Length == 0)
                return Array.Empty<TokenBaseClass>();
            var Results = new List<TokenBaseClass>();
            var Found = false;
            if (args[0]?.StartsWith(Options.CommandPrefix, StringComparison.Ordinal) == true)
            {
                Found |= Commands.Any(x => x.CanRun(args[0].StripLeft(Options.CommandPrefix) ?? ""));
            }
            if (Found)
            {
                Results.Add(new CommandToken(args[0].StripLeft(Options.CommandPrefix) ?? ""));
            }
            else if (Commands.Count(x => x is not HelpCommand and not VersionCommand) == 1)
            {
                Results.Add(new CommandToken(Commands.First(x => x is not HelpCommand and not VersionCommand).Aliases[0]));
            }
            else
            {
                Results.Add(new CommandToken(Commands.First(x => x is HelpCommand).Aliases[0]));
            }

            for (var X = Found ? 1 : 0; X < args.Length; ++X)
            {
                if (args[X]?.StartsWith(Options.FlagPrefix, StringComparison.Ordinal) == true)
                    Results.Add(new OptionNameToken(args[X]?.Replace(Options.FlagPrefix, "") ?? ""));
                else
                    Results.Add(new OptionValueToken(args[X] ?? ""));
            }
            return Results.ToArray();
        }
    }
}

1	/*
2	Copyright 2018 James Craig
3
4	Licensed under the Apache License, Version 2.0 (the "License");
5	you may not use this file except in compliance with the License.
6	You may obtain a copy of the License at
7
8	http://www.apache.org/licenses/LICENSE-2.0
9
10	Unless required by applicable law or agreed to in writing, software
11	distributed under the License is distributed on an "AS IS" BASIS,
12	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	See the License for the specific language governing permissions and
14	limitations under the License.
15	*/
16
17	using BigBook.ExtensionMethods;
18	using Monarch.Commands.Default;
19	using Monarch.Commands.Interfaces;
20	using Monarch.Exceptions;
21	using Monarch.Interfaces;
22	using System;
23	using System.Collections.Generic;
24	using System.Linq;
25
26	namespace Monarch.Commands.Parser
27	{
28	/// <summary>
29	/// Arg parser
30	/// </summary>
31	/// <seealso cref="IArgParser"/>
32	public class ArgParser : IArgParser
33	{
34	/// <summary>
35	/// Initializes a new instance of the <see cref="ArgParser"/> class.
36	/// </summary>
37	/// <param name="options">The options.</param>
38	/// <param name="commands">The commands.</param>
39	public ArgParser(IOptions options, IEnumerable<ICommand> commands)	25✔
40	{
41	Commands = commands;	25✔
42	Options = options;	25✔
43	}	25✔
44
45	/// <summary>
46	/// Gets the commands.
47	/// </summary>
48	/// <value>The commands.</value>
49	public IEnumerable<ICommand> Commands { get; }	48✔
50
51	/// <summary>
52	/// Gets the options.
53	/// </summary>
54	/// <value>The options.</value>
55	public IOptions Options { get; }	102✔
56
57	/// <summary>
58	/// Gets the tokens.
59	/// </summary>
60	/// <param name="args">The arguments.</param>
61	/// <returns>Converts the args into tokens.</returns>
62	/// <exception cref="ParsingException">Unable to find command.</exception>
63	public TokenBaseClass[] GetTokens(string?[]? args)
64	{
65	if (args is null \|\| args.Length == 0)	23✔
66	return Array.Empty<TokenBaseClass>();	1✔
67	var Results = new List<TokenBaseClass>();	22✔
68	var Found = false;	22✔
69	if (args[0]?.StartsWith(Options.CommandPrefix, StringComparison.Ordinal) == true)	22✔
70	{
71	Found \|= Commands.Any(x => x.CanRun(args[0].StripLeft(Options.CommandPrefix) ?? ""));	48!
72	}
73	if (Found)	22✔
74	{
75	Results.Add(new CommandToken(args[0].StripLeft(Options.CommandPrefix) ?? ""));	5!
76	}
77	else if (Commands.Count(x => x is not HelpCommand and not VersionCommand) == 1)	59!
78	{
79	Results.Add(new CommandToken(Commands.First(x => x is not HelpCommand and not VersionCommand).Aliases[0]));	43✔
80	}
81	else
82	{
83	Results.Add(new CommandToken(Commands.First(x => x is HelpCommand).Aliases[0]));	×
84	}
85
86	for (var X = Found ? 1 : 0; X < args.Length; ++X)	1,052✔
87	{
88	if (args[X]?.StartsWith(Options.FlagPrefix, StringComparison.Ordinal) == true)	504!
UNCOV 89	Results.Add(new OptionNameToken(args[X]?.Replace(Options.FlagPrefix, "") ?? ""));	×
90	else
91	Results.Add(new OptionValueToken(args[X] ?? ""));	504✔
92	}
93	return Results.ToArray();	22✔
94	}
95	}
96	}

JaCraig / Monarch / 12000556144

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous