From 37a73a8dbc45d471120ba34e543411fabb9efa01 Mon Sep 17 00:00:00 2001 From: Chris Cheetham Date: Wed, 12 Sep 2018 13:54:10 -0400 Subject: [PATCH] Reorgs solution --- Tooling.sln | 8 ++++---- scripts/install | 4 ++-- scripts/install.ps1 | 2 +- src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/AddCommand.cs | 4 +--- src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/Command.cs | 3 ++- .../CommandShell.cs | 3 ++- .../DeployCommand.cs | 5 +---- .../DisableCommand.cs | 4 +--- .../EnableCommand.cs | 4 +--- src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/ListCommand.cs | 5 +---- src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/Program.cs | 2 +- .../RemoveCommand.cs | 4 +--- .../StatusCommand.cs | 5 +---- .../Steeltoe.Cli.csproj} | 2 +- .../TargetCommand.cs | 5 +---- .../UndeployCommand.cs | 5 +---- .../Configuration.cs | 0 .../Environment/CloudFoundry/CloudFoundryCli.cs | 0 .../Environment/CloudFoundry/CloudFoundryEnvironment.cs | 0 .../CloudFoundry/CloudFoundryServiceManager.cs | 0 .../Environment/Docker/DockerCli.cs | 0 .../Environment/Docker/DockerEnvironment.cs | 0 .../Environment/Docker/DockerServiceManager.cs | 0 .../Environment/EnvironmentRegistry.cs | 0 .../Environment/IEnvironment.cs | 0 .../Executor/IExecutor.cs | 0 .../Executor/Service/AddServiceExecutor.cs | 0 .../Executor/Service/CheckServiceExecutor.cs | 0 .../Executor/Service/ListServiceTypesExecutor.cs | 0 .../Executor/Service/ListServicesExectutor.cs | 0 .../Executor/Service/RemoveServiceExecutor.cs | 0 .../Executor/Service/ServiceExecutor.cs | 0 .../Executor/Service/StartServiceExecutor.cs | 0 .../Executor/Service/StopServiceExecutor.cs | 0 .../Executor/Target/ListTargetsExecutor.cs | 0 .../Executor/Target/SetTargetExecutor.cs | 0 .../Logging.cs | 0 .../Service/IServiceManager.cs | 0 .../Service/ServiceTypeRegistry.cs | 0 .../Steeltoe.Tooling.csproj} | 0 .../System/Shell.cs | 0 .../System/ShellException.cs | 0 .../ToolingException.cs | 0 .../AddFeature.cs | 2 +- .../CliFeatureSpecs.cs | 5 +++-- .../DeployFeature.cs | 2 +- .../DisableFeature.cs | 2 +- .../EnableFeature.cs | 2 +- .../LightBdd.cs | 0 .../ListFeature.cs | 2 +- .../ProgramFeature.cs | 2 +- .../RemoveFeature.cs | 2 +- .../StatusFeature.cs | 2 +- .../Steeltoe.Cli.Feature.csproj} | 4 ++-- .../SystemShellFeature.Steps.cs | 2 +- .../SystemShellFeature.cs | 2 +- .../TargetFeature.cs | 2 +- .../UndeployFeature.cs | 2 +- .../ConfigurationTest.cs | 0 .../CloudFoundry/CloudFoundryEnvironmentTest.cs | 0 .../CloudFoundry/CloudFoundryServiceManagerTest.cs | 0 .../Environment/Docker/DockerEnvironmentTest.cs | 0 .../Environment/Docker/DockerServiceManagerTest.cs | 0 .../Environment/EnvironmentRegistryTest.cs | 0 .../Executor/ExecutorTest.cs | 0 .../Executor/Service/AddServiceExecutorTest.cs | 0 .../Executor/Service/CheckServiceExecutorTest.cs | 0 .../Executor/Service/ListServicesExecutorTest.cs | 0 .../Executor/Service/RemoveServiceExecutorTest.cs | 0 .../Executor/Service/StartServiceExecutorTest.cs | 0 .../Executor/Service/StopServiceExecutorTest.cs | 0 .../Executor/Target/ListTargetsExecutorTest.cs | 0 .../Executor/Target/SetTargetExecutorTest.cs | 0 .../Service/ServiceTypeRegistryTest.cs | 0 .../Steeltoe.Tooling.Test.csproj} | 2 +- .../System/MockShell.cs | 0 76 files changed, 40 insertions(+), 60 deletions(-) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/AddCommand.cs (94%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/Command.cs (97%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/CommandShell.cs (98%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/DeployCommand.cs (88%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/DisableCommand.cs (93%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/EnableCommand.cs (93%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/ListCommand.cs (90%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/Program.cs (98%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/RemoveCommand.cs (93%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/StatusCommand.cs (90%) rename src/{Steeltoe.Tooling.Cli/Steeltoe.Tooling.Cli.csproj => Steeltoe.Cli/Steeltoe.Cli.csproj} (83%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/TargetCommand.cs (91%) rename src/{Steeltoe.Tooling.Cli => Steeltoe.Cli}/UndeployCommand.cs (88%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Configuration.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/CloudFoundry/CloudFoundryCli.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/CloudFoundry/CloudFoundryEnvironment.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/CloudFoundry/CloudFoundryServiceManager.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/Docker/DockerCli.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/Docker/DockerEnvironment.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/Docker/DockerServiceManager.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/EnvironmentRegistry.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Environment/IEnvironment.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/IExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/AddServiceExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/CheckServiceExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/ListServiceTypesExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/ListServicesExectutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/RemoveServiceExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/ServiceExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/StartServiceExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Service/StopServiceExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Target/ListTargetsExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Executor/Target/SetTargetExecutor.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Logging.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Service/IServiceManager.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/Service/ServiceTypeRegistry.cs (100%) rename src/{Steeltoe.Tooling.Library/Steeltoe.Tooling.Library.csproj => Steeltoe.Tooling/Steeltoe.Tooling.csproj} (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/System/Shell.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/System/ShellException.cs (100%) rename src/{Steeltoe.Tooling.Library => Steeltoe.Tooling}/ToolingException.cs (100%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/AddFeature.cs (99%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/CliFeatureSpecs.cs (97%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/DeployFeature.cs (97%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/DisableFeature.cs (98%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/EnableFeature.cs (98%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/LightBdd.cs (100%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/ListFeature.cs (98%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/ProgramFeature.cs (98%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/RemoveFeature.cs (99%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/StatusFeature.cs (97%) rename test/{Steeltoe.Tooling.Cli.Feature/Steeltoe.Tooling.Cli.Feature.csproj => Steeltoe.Cli.Feature/Steeltoe.Cli.Feature.csproj} (85%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/SystemShellFeature.Steps.cs (98%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/SystemShellFeature.cs (98%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/TargetFeature.cs (98%) rename test/{Steeltoe.Tooling.Cli.Feature => Steeltoe.Cli.Feature}/UndeployFeature.cs (97%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/ConfigurationTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Environment/CloudFoundry/CloudFoundryEnvironmentTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Environment/CloudFoundry/CloudFoundryServiceManagerTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Environment/Docker/DockerEnvironmentTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Environment/Docker/DockerServiceManagerTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Environment/EnvironmentRegistryTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/ExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Service/AddServiceExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Service/CheckServiceExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Service/ListServicesExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Service/RemoveServiceExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Service/StartServiceExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Service/StopServiceExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Target/ListTargetsExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Executor/Target/SetTargetExecutorTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/Service/ServiceTypeRegistryTest.cs (100%) rename test/{Steeltoe.Tooling.Library.Test/Steeltoe.Tooling.Library.Test.csproj => Steeltoe.Tooling.Test/Steeltoe.Tooling.Test.csproj} (90%) rename test/{Steeltoe.Tooling.Library.Test => Steeltoe.Tooling.Test}/System/MockShell.cs (100%) diff --git a/Tooling.sln b/Tooling.sln index f4db4ba..d350a30 100644 --- a/Tooling.sln +++ b/Tooling.sln @@ -8,13 +8,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution config\versions.props = config\versions.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Library", "src\Steeltoe.Tooling.Library\Steeltoe.Tooling.Library.csproj", "{0C883901-4BDB-48D5-BCA8-46611D26B2A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling", "src\Steeltoe.Tooling\Steeltoe.Tooling.csproj", "{0C883901-4BDB-48D5-BCA8-46611D26B2A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Library.Test", "test\Steeltoe.Tooling.Library.Test\Steeltoe.Tooling.Library.Test.csproj", "{07D7EAA0-AE7F-4493-BAEE-B3FFF2ED74CE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Test", "test\Steeltoe.Tooling.Test\Steeltoe.Tooling.Test.csproj", "{07D7EAA0-AE7F-4493-BAEE-B3FFF2ED74CE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Cli", "src\Steeltoe.Tooling.Cli\Steeltoe.Tooling.Cli.csproj", "{51D148CB-D7E1-453F-9EC7-2381294C29A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Cli", "src\Steeltoe.Cli\Steeltoe.Cli.csproj", "{51D148CB-D7E1-453F-9EC7-2381294C29A2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Tooling.Cli.Feature", "test\Steeltoe.Tooling.Cli.Feature\Steeltoe.Tooling.Cli.Feature.csproj", "{BD4A2CBD-33AF-48C3-914D-8A7F58A15348}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Cli.Feature", "test\Steeltoe.Cli.Feature\Steeltoe.Cli.Feature.csproj", "{BD4A2CBD-33AF-48C3-914D-8A7F58A15348}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/scripts/install b/scripts/install index cf9f1c2..b26b99a 100755 --- a/scripts/install +++ b/scripts/install @@ -1,9 +1,9 @@ #!/usr/bin/env bash -toolProject=Steeltoe.Tooling.Cli +toolProject=Steeltoe.Cli cd $(dirname $0)/.. -dotnet tool uninstall --global $toolProject +dotnet tool uninstall --global $toolProject 2>/dev/null dotnet pack dotnet tool install --global --add-source src/$toolProject/bin/Debug $toolProject diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 3780b39..0b21fa8 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -1,4 +1,4 @@ -$globalToolProject = "Steeltoe.Tooling.Cli" +$globalToolProject = "Steeltoe.Cli" Set-Location $PSScriptRoot\.. diff --git a/src/Steeltoe.Tooling.Cli/AddCommand.cs b/src/Steeltoe.Cli/AddCommand.cs similarity index 94% rename from src/Steeltoe.Tooling.Cli/AddCommand.cs rename to src/Steeltoe.Cli/AddCommand.cs index 8510335..6f21d78 100644 --- a/src/Steeltoe.Tooling.Cli/AddCommand.cs +++ b/src/Steeltoe.Cli/AddCommand.cs @@ -12,16 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Add a service.")] public class AddCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/Command.cs b/src/Steeltoe.Cli/Command.cs similarity index 97% rename from src/Steeltoe.Tooling.Cli/Command.cs rename to src/Steeltoe.Cli/Command.cs index 02f882e..689c4dd 100644 --- a/src/Steeltoe.Tooling.Cli/Command.cs +++ b/src/Steeltoe.Cli/Command.cs @@ -15,9 +15,10 @@ using System; using System.IO; using McMaster.Extensions.CommandLineUtils; +using Steeltoe.Tooling; using Steeltoe.Tooling.Executor; -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { public abstract class Command { diff --git a/src/Steeltoe.Tooling.Cli/CommandShell.cs b/src/Steeltoe.Cli/CommandShell.cs similarity index 98% rename from src/Steeltoe.Tooling.Cli/CommandShell.cs rename to src/Steeltoe.Cli/CommandShell.cs index 420d244..ca5433d 100644 --- a/src/Steeltoe.Tooling.Cli/CommandShell.cs +++ b/src/Steeltoe.Cli/CommandShell.cs @@ -15,9 +15,10 @@ using System.ComponentModel; using System.Diagnostics; using Microsoft.Extensions.Logging; +using Steeltoe.Tooling; using Steeltoe.Tooling.System; -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { public class CommandShell : Shell { diff --git a/src/Steeltoe.Tooling.Cli/DeployCommand.cs b/src/Steeltoe.Cli/DeployCommand.cs similarity index 88% rename from src/Steeltoe.Tooling.Cli/DeployCommand.cs rename to src/Steeltoe.Cli/DeployCommand.cs index 64ed506..65b9da3 100644 --- a/src/Steeltoe.Tooling.Cli/DeployCommand.cs +++ b/src/Steeltoe.Cli/DeployCommand.cs @@ -12,16 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; -using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Start enabled services in the targeted deployment environment.")] public class DeployCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/DisableCommand.cs b/src/Steeltoe.Cli/DisableCommand.cs similarity index 93% rename from src/Steeltoe.Tooling.Cli/DisableCommand.cs rename to src/Steeltoe.Cli/DisableCommand.cs index 610c9b3..14fd21a 100644 --- a/src/Steeltoe.Tooling.Cli/DisableCommand.cs +++ b/src/Steeltoe.Cli/DisableCommand.cs @@ -12,16 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Disable a service.")] public class DisableCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/EnableCommand.cs b/src/Steeltoe.Cli/EnableCommand.cs similarity index 93% rename from src/Steeltoe.Tooling.Cli/EnableCommand.cs rename to src/Steeltoe.Cli/EnableCommand.cs index 8bcbb71..fc3723d 100644 --- a/src/Steeltoe.Tooling.Cli/EnableCommand.cs +++ b/src/Steeltoe.Cli/EnableCommand.cs @@ -12,16 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Enable a service.")] public class EnableCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/ListCommand.cs b/src/Steeltoe.Cli/ListCommand.cs similarity index 90% rename from src/Steeltoe.Tooling.Cli/ListCommand.cs rename to src/Steeltoe.Cli/ListCommand.cs index cce2fef..97ff4cb 100644 --- a/src/Steeltoe.Tooling.Cli/ListCommand.cs +++ b/src/Steeltoe.Cli/ListCommand.cs @@ -12,16 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; -using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "List services, service types, or deployment environments. If run with no args, list everything.")] public class ListCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/Program.cs b/src/Steeltoe.Cli/Program.cs similarity index 98% rename from src/Steeltoe.Tooling.Cli/Program.cs rename to src/Steeltoe.Cli/Program.cs index b2fa8ec..547c3d9 100644 --- a/src/Steeltoe.Tooling.Cli/Program.cs +++ b/src/Steeltoe.Cli/Program.cs @@ -15,7 +15,7 @@ using System.Reflection; using McMaster.Extensions.CommandLineUtils; -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Name = "steeltoe", Description = "Steeltoe Developer Tools")] [VersionOptionFromMember("-V|--version", MemberName = nameof(GetVersion))] diff --git a/src/Steeltoe.Tooling.Cli/RemoveCommand.cs b/src/Steeltoe.Cli/RemoveCommand.cs similarity index 93% rename from src/Steeltoe.Tooling.Cli/RemoveCommand.cs rename to src/Steeltoe.Cli/RemoveCommand.cs index 7f7a81e..bf3c2bf 100644 --- a/src/Steeltoe.Tooling.Cli/RemoveCommand.cs +++ b/src/Steeltoe.Cli/RemoveCommand.cs @@ -12,16 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Remove a service.")] public class RemoveCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/StatusCommand.cs b/src/Steeltoe.Cli/StatusCommand.cs similarity index 90% rename from src/Steeltoe.Tooling.Cli/StatusCommand.cs rename to src/Steeltoe.Cli/StatusCommand.cs index 540aae0..d430150 100644 --- a/src/Steeltoe.Tooling.Cli/StatusCommand.cs +++ b/src/Steeltoe.Cli/StatusCommand.cs @@ -12,16 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; -using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Show the status of a service in the targeted deployment environment. If run with no args, show the status of all services.")] public class StatusCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/Steeltoe.Tooling.Cli.csproj b/src/Steeltoe.Cli/Steeltoe.Cli.csproj similarity index 83% rename from src/Steeltoe.Tooling.Cli/Steeltoe.Tooling.Cli.csproj rename to src/Steeltoe.Cli/Steeltoe.Cli.csproj index cbf423c..0e5bd58 100644 --- a/src/Steeltoe.Tooling.Cli/Steeltoe.Tooling.Cli.csproj +++ b/src/Steeltoe.Cli/Steeltoe.Cli.csproj @@ -10,6 +10,6 @@ - + diff --git a/src/Steeltoe.Tooling.Cli/TargetCommand.cs b/src/Steeltoe.Cli/TargetCommand.cs similarity index 91% rename from src/Steeltoe.Tooling.Cli/TargetCommand.cs rename to src/Steeltoe.Cli/TargetCommand.cs index 9bf3bc6..38ae0f7 100644 --- a/src/Steeltoe.Tooling.Cli/TargetCommand.cs +++ b/src/Steeltoe.Cli/TargetCommand.cs @@ -12,16 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; -using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Target the deployment environment. If run with no args, show the targeted deployment environment.")] public class TargetCommand : Command diff --git a/src/Steeltoe.Tooling.Cli/UndeployCommand.cs b/src/Steeltoe.Cli/UndeployCommand.cs similarity index 88% rename from src/Steeltoe.Tooling.Cli/UndeployCommand.cs rename to src/Steeltoe.Cli/UndeployCommand.cs index 9b5cc5f..8136618 100644 --- a/src/Steeltoe.Tooling.Cli/UndeployCommand.cs +++ b/src/Steeltoe.Cli/UndeployCommand.cs @@ -12,16 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; -using System.ComponentModel.DataAnnotations; using McMaster.Extensions.CommandLineUtils; using Steeltoe.Tooling.Executor; -using Steeltoe.Tooling.Executor.Service; // ReSharper disable UnassignedGetOnlyAutoProperty // ReSharper disable InconsistentNaming -namespace Steeltoe.Tooling.Cli +namespace Steeltoe.Cli { [Command(Description = "Stop running services in the targeted deployment environment.")] public class UndeployCommand : Command diff --git a/src/Steeltoe.Tooling.Library/Configuration.cs b/src/Steeltoe.Tooling/Configuration.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Configuration.cs rename to src/Steeltoe.Tooling/Configuration.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/CloudFoundry/CloudFoundryCli.cs b/src/Steeltoe.Tooling/Environment/CloudFoundry/CloudFoundryCli.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/CloudFoundry/CloudFoundryCli.cs rename to src/Steeltoe.Tooling/Environment/CloudFoundry/CloudFoundryCli.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/CloudFoundry/CloudFoundryEnvironment.cs b/src/Steeltoe.Tooling/Environment/CloudFoundry/CloudFoundryEnvironment.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/CloudFoundry/CloudFoundryEnvironment.cs rename to src/Steeltoe.Tooling/Environment/CloudFoundry/CloudFoundryEnvironment.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/CloudFoundry/CloudFoundryServiceManager.cs b/src/Steeltoe.Tooling/Environment/CloudFoundry/CloudFoundryServiceManager.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/CloudFoundry/CloudFoundryServiceManager.cs rename to src/Steeltoe.Tooling/Environment/CloudFoundry/CloudFoundryServiceManager.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/Docker/DockerCli.cs b/src/Steeltoe.Tooling/Environment/Docker/DockerCli.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/Docker/DockerCli.cs rename to src/Steeltoe.Tooling/Environment/Docker/DockerCli.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/Docker/DockerEnvironment.cs b/src/Steeltoe.Tooling/Environment/Docker/DockerEnvironment.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/Docker/DockerEnvironment.cs rename to src/Steeltoe.Tooling/Environment/Docker/DockerEnvironment.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/Docker/DockerServiceManager.cs b/src/Steeltoe.Tooling/Environment/Docker/DockerServiceManager.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/Docker/DockerServiceManager.cs rename to src/Steeltoe.Tooling/Environment/Docker/DockerServiceManager.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/EnvironmentRegistry.cs b/src/Steeltoe.Tooling/Environment/EnvironmentRegistry.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/EnvironmentRegistry.cs rename to src/Steeltoe.Tooling/Environment/EnvironmentRegistry.cs diff --git a/src/Steeltoe.Tooling.Library/Environment/IEnvironment.cs b/src/Steeltoe.Tooling/Environment/IEnvironment.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Environment/IEnvironment.cs rename to src/Steeltoe.Tooling/Environment/IEnvironment.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/IExecutor.cs b/src/Steeltoe.Tooling/Executor/IExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/IExecutor.cs rename to src/Steeltoe.Tooling/Executor/IExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/AddServiceExecutor.cs b/src/Steeltoe.Tooling/Executor/Service/AddServiceExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/AddServiceExecutor.cs rename to src/Steeltoe.Tooling/Executor/Service/AddServiceExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/CheckServiceExecutor.cs b/src/Steeltoe.Tooling/Executor/Service/CheckServiceExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/CheckServiceExecutor.cs rename to src/Steeltoe.Tooling/Executor/Service/CheckServiceExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/ListServiceTypesExecutor.cs b/src/Steeltoe.Tooling/Executor/Service/ListServiceTypesExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/ListServiceTypesExecutor.cs rename to src/Steeltoe.Tooling/Executor/Service/ListServiceTypesExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/ListServicesExectutor.cs b/src/Steeltoe.Tooling/Executor/Service/ListServicesExectutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/ListServicesExectutor.cs rename to src/Steeltoe.Tooling/Executor/Service/ListServicesExectutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/RemoveServiceExecutor.cs b/src/Steeltoe.Tooling/Executor/Service/RemoveServiceExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/RemoveServiceExecutor.cs rename to src/Steeltoe.Tooling/Executor/Service/RemoveServiceExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/ServiceExecutor.cs b/src/Steeltoe.Tooling/Executor/Service/ServiceExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/ServiceExecutor.cs rename to src/Steeltoe.Tooling/Executor/Service/ServiceExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/StartServiceExecutor.cs b/src/Steeltoe.Tooling/Executor/Service/StartServiceExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/StartServiceExecutor.cs rename to src/Steeltoe.Tooling/Executor/Service/StartServiceExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Service/StopServiceExecutor.cs b/src/Steeltoe.Tooling/Executor/Service/StopServiceExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Service/StopServiceExecutor.cs rename to src/Steeltoe.Tooling/Executor/Service/StopServiceExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Target/ListTargetsExecutor.cs b/src/Steeltoe.Tooling/Executor/Target/ListTargetsExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Target/ListTargetsExecutor.cs rename to src/Steeltoe.Tooling/Executor/Target/ListTargetsExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Executor/Target/SetTargetExecutor.cs b/src/Steeltoe.Tooling/Executor/Target/SetTargetExecutor.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Executor/Target/SetTargetExecutor.cs rename to src/Steeltoe.Tooling/Executor/Target/SetTargetExecutor.cs diff --git a/src/Steeltoe.Tooling.Library/Logging.cs b/src/Steeltoe.Tooling/Logging.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Logging.cs rename to src/Steeltoe.Tooling/Logging.cs diff --git a/src/Steeltoe.Tooling.Library/Service/IServiceManager.cs b/src/Steeltoe.Tooling/Service/IServiceManager.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Service/IServiceManager.cs rename to src/Steeltoe.Tooling/Service/IServiceManager.cs diff --git a/src/Steeltoe.Tooling.Library/Service/ServiceTypeRegistry.cs b/src/Steeltoe.Tooling/Service/ServiceTypeRegistry.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/Service/ServiceTypeRegistry.cs rename to src/Steeltoe.Tooling/Service/ServiceTypeRegistry.cs diff --git a/src/Steeltoe.Tooling.Library/Steeltoe.Tooling.Library.csproj b/src/Steeltoe.Tooling/Steeltoe.Tooling.csproj similarity index 100% rename from src/Steeltoe.Tooling.Library/Steeltoe.Tooling.Library.csproj rename to src/Steeltoe.Tooling/Steeltoe.Tooling.csproj diff --git a/src/Steeltoe.Tooling.Library/System/Shell.cs b/src/Steeltoe.Tooling/System/Shell.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/System/Shell.cs rename to src/Steeltoe.Tooling/System/Shell.cs diff --git a/src/Steeltoe.Tooling.Library/System/ShellException.cs b/src/Steeltoe.Tooling/System/ShellException.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/System/ShellException.cs rename to src/Steeltoe.Tooling/System/ShellException.cs diff --git a/src/Steeltoe.Tooling.Library/ToolingException.cs b/src/Steeltoe.Tooling/ToolingException.cs similarity index 100% rename from src/Steeltoe.Tooling.Library/ToolingException.cs rename to src/Steeltoe.Tooling/ToolingException.cs diff --git a/test/Steeltoe.Tooling.Cli.Feature/AddFeature.cs b/test/Steeltoe.Cli.Feature/AddFeature.cs similarity index 99% rename from test/Steeltoe.Tooling.Cli.Feature/AddFeature.cs rename to test/Steeltoe.Cli.Feature/AddFeature.cs index 73b55b9..cf09134 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/AddFeature.cs +++ b/test/Steeltoe.Cli.Feature/AddFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("add")] public class AddFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/CliFeatureSpecs.cs b/test/Steeltoe.Cli.Feature/CliFeatureSpecs.cs similarity index 97% rename from test/Steeltoe.Tooling.Cli.Feature/CliFeatureSpecs.cs rename to test/Steeltoe.Cli.Feature/CliFeatureSpecs.cs index ccdef03..88640a4 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/CliFeatureSpecs.cs +++ b/test/Steeltoe.Cli.Feature/CliFeatureSpecs.cs @@ -16,9 +16,10 @@ using System.IO; using LightBDD.XUnit2; using Microsoft.Extensions.Logging; using Shouldly; +using Steeltoe.Tooling; using Steeltoe.Tooling.System; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { public class CliFeatureSpecs : FeatureFixture { @@ -26,7 +27,7 @@ namespace Steeltoe.Tooling.Cli.Feature private string CliProjectDirectory { get; } = Path.GetFullPath(Path.Combine( Directory.GetCurrentDirectory(), - "../../../../../src/Steeltoe.Tooling.Cli")); + "../../../../../src/Steeltoe.Cli")); private Shell _shell = new CommandShell(); diff --git a/test/Steeltoe.Tooling.Cli.Feature/DeployFeature.cs b/test/Steeltoe.Cli.Feature/DeployFeature.cs similarity index 97% rename from test/Steeltoe.Tooling.Cli.Feature/DeployFeature.cs rename to test/Steeltoe.Cli.Feature/DeployFeature.cs index 3fe747c..a1c69d2 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/DeployFeature.cs +++ b/test/Steeltoe.Cli.Feature/DeployFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("deploy")] public class DeployFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/DisableFeature.cs b/test/Steeltoe.Cli.Feature/DisableFeature.cs similarity index 98% rename from test/Steeltoe.Tooling.Cli.Feature/DisableFeature.cs rename to test/Steeltoe.Cli.Feature/DisableFeature.cs index 1c432ab..14af971 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/DisableFeature.cs +++ b/test/Steeltoe.Cli.Feature/DisableFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("disable")] public class DisableFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/EnableFeature.cs b/test/Steeltoe.Cli.Feature/EnableFeature.cs similarity index 98% rename from test/Steeltoe.Tooling.Cli.Feature/EnableFeature.cs rename to test/Steeltoe.Cli.Feature/EnableFeature.cs index 9617e8d..8f8cecb 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/EnableFeature.cs +++ b/test/Steeltoe.Cli.Feature/EnableFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("enable")] public class EnableFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/LightBdd.cs b/test/Steeltoe.Cli.Feature/LightBdd.cs similarity index 100% rename from test/Steeltoe.Tooling.Cli.Feature/LightBdd.cs rename to test/Steeltoe.Cli.Feature/LightBdd.cs diff --git a/test/Steeltoe.Tooling.Cli.Feature/ListFeature.cs b/test/Steeltoe.Cli.Feature/ListFeature.cs similarity index 98% rename from test/Steeltoe.Tooling.Cli.Feature/ListFeature.cs rename to test/Steeltoe.Cli.Feature/ListFeature.cs index 96b911e..0e9c735 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/ListFeature.cs +++ b/test/Steeltoe.Cli.Feature/ListFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("list")] public class ListFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/ProgramFeature.cs b/test/Steeltoe.Cli.Feature/ProgramFeature.cs similarity index 98% rename from test/Steeltoe.Tooling.Cli.Feature/ProgramFeature.cs rename to test/Steeltoe.Cli.Feature/ProgramFeature.cs index 4800c0e..d73d771 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/ProgramFeature.cs +++ b/test/Steeltoe.Cli.Feature/ProgramFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("program")] public class ProgramFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/RemoveFeature.cs b/test/Steeltoe.Cli.Feature/RemoveFeature.cs similarity index 99% rename from test/Steeltoe.Tooling.Cli.Feature/RemoveFeature.cs rename to test/Steeltoe.Cli.Feature/RemoveFeature.cs index 2250e80..4560347 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/RemoveFeature.cs +++ b/test/Steeltoe.Cli.Feature/RemoveFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("remove")] public class RemoveFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/StatusFeature.cs b/test/Steeltoe.Cli.Feature/StatusFeature.cs similarity index 97% rename from test/Steeltoe.Tooling.Cli.Feature/StatusFeature.cs rename to test/Steeltoe.Cli.Feature/StatusFeature.cs index 8818c36..178ef3a 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/StatusFeature.cs +++ b/test/Steeltoe.Cli.Feature/StatusFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("status")] public class StatusFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/Steeltoe.Tooling.Cli.Feature.csproj b/test/Steeltoe.Cli.Feature/Steeltoe.Cli.Feature.csproj similarity index 85% rename from test/Steeltoe.Tooling.Cli.Feature/Steeltoe.Tooling.Cli.Feature.csproj rename to test/Steeltoe.Cli.Feature/Steeltoe.Cli.Feature.csproj index f3219fe..64af4ab 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/Steeltoe.Tooling.Cli.Feature.csproj +++ b/test/Steeltoe.Cli.Feature/Steeltoe.Cli.Feature.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/test/Steeltoe.Tooling.Cli.Feature/SystemShellFeature.Steps.cs b/test/Steeltoe.Cli.Feature/SystemShellFeature.Steps.cs similarity index 98% rename from test/Steeltoe.Tooling.Cli.Feature/SystemShellFeature.Steps.cs rename to test/Steeltoe.Cli.Feature/SystemShellFeature.Steps.cs index 0698c3f..31de753 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/SystemShellFeature.Steps.cs +++ b/test/Steeltoe.Cli.Feature/SystemShellFeature.Steps.cs @@ -19,7 +19,7 @@ using LightBDD.XUnit2; using Shouldly; using Steeltoe.Tooling.System; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { public partial class SystemShellFeature : FeatureFixture { diff --git a/test/Steeltoe.Tooling.Cli.Feature/SystemShellFeature.cs b/test/Steeltoe.Cli.Feature/SystemShellFeature.cs similarity index 98% rename from test/Steeltoe.Tooling.Cli.Feature/SystemShellFeature.cs rename to test/Steeltoe.Cli.Feature/SystemShellFeature.cs index 5da254f..fa58f68 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/SystemShellFeature.cs +++ b/test/Steeltoe.Cli.Feature/SystemShellFeature.cs @@ -17,7 +17,7 @@ using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; using Steeltoe.Tooling.System; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { public partial class SystemShellFeature { diff --git a/test/Steeltoe.Tooling.Cli.Feature/TargetFeature.cs b/test/Steeltoe.Cli.Feature/TargetFeature.cs similarity index 98% rename from test/Steeltoe.Tooling.Cli.Feature/TargetFeature.cs rename to test/Steeltoe.Cli.Feature/TargetFeature.cs index b59a66b..066c74a 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/TargetFeature.cs +++ b/test/Steeltoe.Cli.Feature/TargetFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("target")] public class TargetFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Cli.Feature/UndeployFeature.cs b/test/Steeltoe.Cli.Feature/UndeployFeature.cs similarity index 97% rename from test/Steeltoe.Tooling.Cli.Feature/UndeployFeature.cs rename to test/Steeltoe.Cli.Feature/UndeployFeature.cs index 7b4795f..e899a64 100644 --- a/test/Steeltoe.Tooling.Cli.Feature/UndeployFeature.cs +++ b/test/Steeltoe.Cli.Feature/UndeployFeature.cs @@ -16,7 +16,7 @@ using LightBDD.Framework; using LightBDD.Framework.Scenarios.Extended; using LightBDD.XUnit2; -namespace Steeltoe.Tooling.Cli.Feature +namespace Steeltoe.Cli.Feature { [Label("undeploy")] public class UndeployFeature : CliFeatureSpecs diff --git a/test/Steeltoe.Tooling.Library.Test/ConfigurationTest.cs b/test/Steeltoe.Tooling.Test/ConfigurationTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/ConfigurationTest.cs rename to test/Steeltoe.Tooling.Test/ConfigurationTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Environment/CloudFoundry/CloudFoundryEnvironmentTest.cs b/test/Steeltoe.Tooling.Test/Environment/CloudFoundry/CloudFoundryEnvironmentTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Environment/CloudFoundry/CloudFoundryEnvironmentTest.cs rename to test/Steeltoe.Tooling.Test/Environment/CloudFoundry/CloudFoundryEnvironmentTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Environment/CloudFoundry/CloudFoundryServiceManagerTest.cs b/test/Steeltoe.Tooling.Test/Environment/CloudFoundry/CloudFoundryServiceManagerTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Environment/CloudFoundry/CloudFoundryServiceManagerTest.cs rename to test/Steeltoe.Tooling.Test/Environment/CloudFoundry/CloudFoundryServiceManagerTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Environment/Docker/DockerEnvironmentTest.cs b/test/Steeltoe.Tooling.Test/Environment/Docker/DockerEnvironmentTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Environment/Docker/DockerEnvironmentTest.cs rename to test/Steeltoe.Tooling.Test/Environment/Docker/DockerEnvironmentTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Environment/Docker/DockerServiceManagerTest.cs b/test/Steeltoe.Tooling.Test/Environment/Docker/DockerServiceManagerTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Environment/Docker/DockerServiceManagerTest.cs rename to test/Steeltoe.Tooling.Test/Environment/Docker/DockerServiceManagerTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Environment/EnvironmentRegistryTest.cs b/test/Steeltoe.Tooling.Test/Environment/EnvironmentRegistryTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Environment/EnvironmentRegistryTest.cs rename to test/Steeltoe.Tooling.Test/Environment/EnvironmentRegistryTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/ExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/ExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/ExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/ExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Service/AddServiceExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Service/AddServiceExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Service/AddServiceExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Service/AddServiceExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Service/CheckServiceExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Service/CheckServiceExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Service/CheckServiceExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Service/CheckServiceExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Service/ListServicesExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Service/ListServicesExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Service/ListServicesExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Service/ListServicesExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Service/RemoveServiceExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Service/RemoveServiceExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Service/RemoveServiceExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Service/RemoveServiceExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Service/StartServiceExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Service/StartServiceExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Service/StartServiceExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Service/StartServiceExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Service/StopServiceExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Service/StopServiceExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Service/StopServiceExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Service/StopServiceExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Target/ListTargetsExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Target/ListTargetsExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Target/ListTargetsExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Target/ListTargetsExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Executor/Target/SetTargetExecutorTest.cs b/test/Steeltoe.Tooling.Test/Executor/Target/SetTargetExecutorTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Executor/Target/SetTargetExecutorTest.cs rename to test/Steeltoe.Tooling.Test/Executor/Target/SetTargetExecutorTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Service/ServiceTypeRegistryTest.cs b/test/Steeltoe.Tooling.Test/Service/ServiceTypeRegistryTest.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/Service/ServiceTypeRegistryTest.cs rename to test/Steeltoe.Tooling.Test/Service/ServiceTypeRegistryTest.cs diff --git a/test/Steeltoe.Tooling.Library.Test/Steeltoe.Tooling.Library.Test.csproj b/test/Steeltoe.Tooling.Test/Steeltoe.Tooling.Test.csproj similarity index 90% rename from test/Steeltoe.Tooling.Library.Test/Steeltoe.Tooling.Library.Test.csproj rename to test/Steeltoe.Tooling.Test/Steeltoe.Tooling.Test.csproj index 4c2abe4..b4d99b8 100644 --- a/test/Steeltoe.Tooling.Library.Test/Steeltoe.Tooling.Library.Test.csproj +++ b/test/Steeltoe.Tooling.Test/Steeltoe.Tooling.Test.csproj @@ -15,6 +15,6 @@ - + diff --git a/test/Steeltoe.Tooling.Library.Test/System/MockShell.cs b/test/Steeltoe.Tooling.Test/System/MockShell.cs similarity index 100% rename from test/Steeltoe.Tooling.Library.Test/System/MockShell.cs rename to test/Steeltoe.Tooling.Test/System/MockShell.cs