(chocolateyGH-132) Change source_list to return a list of sources

Jaykul · Mar 4, 2015 · 8364b0e · 8364b0e
1 parent 8702e01
commit 8364b0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/chocolatey/infrastructure.app/services/ChocolateyConfigSettingsService.cs b/src/chocolatey/infrastructure.app/services/ChocolateyConfigSettingsService.cs
@@ -16,6 +16,7 @@
 namespace chocolatey.infrastructure.app.services
 {
     using System;
+    using System.Collections.Generic;
     using System.Linq;
     using configuration;
     using infrastructure.services;
@@ -43,12 +44,22 @@ public void noop(ChocolateyConfiguration configuration)
             this.Log().Info("Would have made a change to the configuration.");
         }
 
-        public void source_list(ChocolateyConfiguration configuration)
+        public IEnumerable<ChocolateySource> source_list(ChocolateyConfiguration configuration)
         {
+            var list = new List<ChocolateySource>();
             foreach (var source in configFileSettings.Sources)
             {
-                this.Log().Info(() => "{0}{1} - {2}".format_with(source.Id, source.Disabled ? " [Disabled]" : string.Empty, source.Value));
-            }
+                if (configuration.RegularOuptut) { 
+                    this.Log().Info(() => "{0}{1} - {2}".format_with(source.Id, source.Disabled ? " [Disabled]" : string.Empty, source.Value));
+                }
+                list.Add(new ChocolateySource {
+                    Id = source.Id,
+                    Value = source.Value,
+                    Disabled =  source.Disabled,
+                    Authenticated = string.IsNullOrWhiteSpace(source.Password)
+                });
+            }
+            return list;
         }
 
         public void source_add(ChocolateyConfiguration configuration)
@@ -232,4 +243,4 @@ public void set_api_key(ChocolateyConfiguration configuration)
             }
         }
     }
-}
+}
diff --git a/src/chocolatey/infrastructure.app/services/IChocolateyConfigSettingsService.cs b/src/chocolatey/infrastructure.app/services/IChocolateyConfigSettingsService.cs
@@ -16,12 +16,13 @@
 namespace chocolatey.infrastructure.app.services
 {
     using System;
+    using System.Collections.Generic;
     using configuration;
 
     public interface IChocolateyConfigSettingsService
     {
         void noop(ChocolateyConfiguration configuration);
-        void source_list(ChocolateyConfiguration configuration);
+        IEnumerable<ChocolateySource> source_list(ChocolateyConfiguration configuration);
         void source_add(ChocolateyConfiguration configuration);
         void source_remove(ChocolateyConfiguration configuration);
         void source_disable(ChocolateyConfiguration configuration);
@@ -32,4 +33,4 @@ public interface IChocolateyConfigSettingsService
         string get_api_key(ChocolateyConfiguration configuration, Action<ConfigFileApiKeySetting> keyAction);
         void set_api_key(ChocolateyConfiguration configuration);
     }
-}
+}