Move search_command to a separate file

4 files changed, 51 insertions, 39 deletions

diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp
index b70ab0249..ba24f74e8 100644
--- a/toolsrc/src/commands_installation.cpp
+++ b/toolsrc/src/commands_installation.cpp
@@ -1,8 +1,6 @@
 #include "vcpkg_Commands.h"
 #include "vcpkg.h"
-#include <iostream>
 #include <fstream>
-#include <iomanip>
 #include "vcpkg_Environment.h"
 #include "metrics.h"
 #include "vcpkg_Files.h"
@@ -111,43 +109,6 @@ namespace vcpkg
         exit(EXIT_SUCCESS);
     }
 
-    void search_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
-    {
-        args.check_max_args(1);
-
-        if (args.command_arguments.size() == 1)
-        {
-            System::println(System::color::warning, "Search strings are not yet implemented; showing full list of packages.");
-        }
-
-        auto begin_it = fs::directory_iterator(paths.ports);
-        auto end_it = fs::directory_iterator();
-        for (; begin_it != end_it; ++begin_it)
-        {
-            const auto& path = begin_it->path();
-
-            try
-            {
-                auto pghs = get_paragraphs(path / "CONTROL");
-                if (pghs.empty())
-                    continue;
-                auto srcpgh = SourceParagraph(pghs[0]);
-                std::cout << std::left
-                    << std::setw(20) << srcpgh.name << ' '
-                    << std::setw(16) << srcpgh.version << ' '
-                    << shorten_description(srcpgh.description) << '\n';
-            }
-            catch (std::runtime_error const&)
-            {
-            }
-        }
-
-        System::println("\nIf your library is not listed, please open an issue at:\n"
-            "    https://github.com/Microsoft/vcpkg/issues");
-
-        exit(EXIT_SUCCESS);
-    }
-
     void cache_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
     {
         args.check_max_args(0);
diff --git a/toolsrc/src/commands_search.cpp b/toolsrc/src/commands_search.cpp
new file mode 100644
index 000000000..718da1045
--- /dev/null
+++ b/toolsrc/src/commands_search.cpp
@@ -0,0 +1,47 @@
+#include "vcpkg_Commands.h"
+#include "vcpkg_System.h"
+#include "vcpkg.h"
+#include <iostream>
+#include <iomanip>
+
+namespace fs = std::tr2::sys;
+
+namespace vcpkg
+{
+    void search_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
+    {
+        args.check_max_args(1);
+
+        if (args.command_arguments.size() == 1)
+        {
+            System::println(System::color::warning, "Search strings are not yet implemented; showing full list of packages.");
+        }
+
+        auto begin_it = fs::directory_iterator(paths.ports);
+        auto end_it = fs::directory_iterator();
+        for (; begin_it != end_it; ++begin_it)
+        {
+            const auto& path = begin_it->path();
+
+            try
+            {
+                auto pghs = get_paragraphs(path / "CONTROL");
+                if (pghs.empty())
+                    continue;
+                auto srcpgh = SourceParagraph(pghs[0]);
+                std::cout << std::left
+                    << std::setw(20) << srcpgh.name << ' '
+                    << std::setw(16) << srcpgh.version << ' '
+                    << shorten_description(srcpgh.description) << '\n';
+            }
+            catch (std::runtime_error const&)
+            {
+            }
+        }
+
+        System::println("\nIf your library is not listed, please open an issue at:\n"
+            "    https://github.com/Microsoft/vcpkg/issues");
+
+        exit(EXIT_SUCCESS);
+    }
+}
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj
index 15f5064d4..7b518f30f 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj
+++ b/toolsrc/vcpkg/vcpkg.vcxproj
@@ -129,6 +129,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\commands_remove.cpp" />
+    <ClCompile Include="..\src\commands_search.cpp" />
     <ClCompile Include="..\src\vcpkg_cmd_arguments.cpp" />
     <ClCompile Include="..\src\commands_other.cpp" />
     <ClCompile Include="..\src\vcpkg_Environment.cpp" />
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj.filters b/toolsrc/vcpkg/vcpkg.vcxproj.filters
index 3ae3bf3a9..e22728d23 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj.filters
+++ b/toolsrc/vcpkg/vcpkg.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClCompile Include="..\src\commands_remove.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\commands_search.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\post_build_lint.h">