rename 'list-sources' to 'feeds list'

aspnet · Jun 29, 2015 · b6124c1 · b6124c1
1 parent 23fd143
commit b6124c1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/src/Microsoft.Framework.PackageManager/ConsoleCommands/ListSourcesConsoleCommand.cs b/src/Microsoft.Framework.PackageManager/ConsoleCommands/ListSourcesConsoleCommand.cs
@@ -5,14 +5,29 @@
 
 namespace Microsoft.Framework.PackageManager
 {
-    internal static class ListSourcesConsoleCommand
+    internal static class FeedsConsoleCommand
     {
         public static void Register(CommandLineApplication cmdApp, ReportsFactory reportsFactory)
         {
-            cmdApp.Command("list-sources", c =>
+            cmdApp.Command("feeds", c =>
             {
-                c.Description = "Displays a list of package sources in effect for a project";
+                c.Description = "Commands related to managing package feeds currently in use";
+                c.HelpOption("-?|-h|--help");
+                c.OnExecute(() =>
+                {
+                    c.ShowHelp();
+                    return 2;
+                });
+
+                RegisterListCommand(c, reportsFactory);
+            });
+        }
 
+        public static void RegisterListCommand(CommandLineApplication cmdApp, ReportsFactory reportsFactory)
+        {
+            cmdApp.Command("list", c =>
+            {
+                c.Description = "Displays a list of package sources in effect for a project";
                 var argRoot = c.Argument("[root]",
                     "The path of the project to calculate effective package sources for (defaults to the current directory)");
 

diff --git a/src/Microsoft.Framework.PackageManager/Program.cs b/src/Microsoft.Framework.PackageManager/Program.cs
@@ -78,7 +78,7 @@ public int Main(string[] args)
             PublishConsoleCommand.Register(app, reportsFactory, _environment, _hostServices);
             RestoreConsoleCommand.Register(app, reportsFactory, _environment);
             WrapConsoleCommand.Register(app, reportsFactory);
-            ListSourcesConsoleCommand.Register(app, reportsFactory);
+            FeedsConsoleCommand.Register(app, reportsFactory);
 
             return app.Execute(args);
         }

diff --git a/src/Microsoft.Framework.PackageManager/Sources/ListSourcesCommand.cs b/src/Microsoft.Framework.PackageManager/Sources/ListSourcesCommand.cs
@@ -33,7 +33,7 @@ public int Execute()
 
                 // Iterate over the sources and report them
                 int index = 1; // This is an index for display so it should be 1-based
-                foreach(var source in sources)
+                foreach (var source in sources)
                 {
                     var enabledString = source.IsEnabled ? "" : " [Disabled]";
                     var line = $"{index.ToString("0\\.").PadRight(3)} {source.Name} {source.Source}{enabledString.Yellow().Bold()}";

diff --git a/...anager.FunctionalTests/DnuSourcesTests.cs → ...eManager.FunctionalTests/DnuFeedsTests.cs b/...anager.FunctionalTests/DnuSourcesTests.cs → ...eManager.FunctionalTests/DnuFeedsTests.cs
@@ -10,11 +10,11 @@
 namespace Microsoft.Framework.PackageManager
 {
     [Collection(nameof(PackageManagerFunctionalTestCollection))]
-    public class DnuSourcesTests
+    public class DnuFeedsTests
     {
         private readonly PackageManagerFunctionalTestFixture _fixture;
 
-        public DnuSourcesTests(PackageManagerFunctionalTestFixture fixture)
+        public DnuFeedsTests(PackageManagerFunctionalTestFixture fixture)
         {
             _fixture = fixture;
         }
@@ -29,7 +29,7 @@ public static IEnumerable<object[]> RuntimeComponents
 
         [Theory]
         [MemberData(nameof(RuntimeComponents))]
-        public void DnuSources_NoSources(string flavor, string os, string architecture)
+        public void DnuFeeds_NoSources(string flavor, string os, string architecture)
         {
             var environment = new Dictionary<string, string>
             {
@@ -66,8 +66,8 @@ public void DnuSources_NoSources(string flavor, string os, string architecture)
                 string error;
                 var exitCode = DnuTestUtils.ExecDnu(
                     runtimeHomePath,
-                    subcommand: "list-sources",
-                    arguments: "root",
+                    subcommand: "feeds",
+                    arguments: "list root",
                     stdOut: out output,
                     stdErr: out error,
                     environment: environment,
@@ -81,7 +81,7 @@ public void DnuSources_NoSources(string flavor, string os, string architecture)
 
         [Theory]
         [MemberData(nameof(RuntimeComponents))]
-        public void DnuSources_ListsAllSources(string flavor, string os, string architecture)
+        public void DnuFeeds_ListsAllSources(string flavor, string os, string architecture)
         {
             var environment = new Dictionary<string, string>
             {
@@ -138,8 +138,8 @@ public void DnuSources_ListsAllSources(string flavor, string os, string architec
                 string error;
                 var exitCode = DnuTestUtils.ExecDnu(
                     runtimeHomePath,
-                    subcommand: "list-sources",
-                    arguments: "root/sub",
+                    subcommand: "feeds",
+                    arguments: "list root/sub",
                     stdOut: out output,
                     stdErr: out error,
                     environment: environment,