Separate stuff out to different files.

ssh-handler/AbstractHandler.cs

@@ -0,0 +1,56 @@
+// Abstract Handler
+//
+// Douglas Thrift
+//
+// AbstractHandler.cs
+
+/*  Copyright 2013 Douglas Thrift
+ *
+ *  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 System;
+using System.IO;
+
+public abstract class AbstractHandler
+{
+    protected string FindInPath(string program)
+    {
+        foreach (string location in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator))
+        {
+            string path = Path.Combine(location, program);
+            if (File.Exists(path))
+                return path;
+        }
+
+        return null;
+    }
+
+    protected void SetYesNoValue(string input, out AutoYesNoOption option, out string value)
+    {
+        value = null;
+
+        switch (input.ToLowerInvariant())
+        {
+        case "yes":
+            option = AutoYesNoOption.Yes;
+            break;
+        case "no":
+            option = AutoYesNoOption.No;
+            break;
+        default:
+            value = input;
+            goto case "yes";
+        }
+    }
+}

ssh-handler/AutoYesNoOption.cs

@@ -0,0 +1,27 @@
+// Auto/Yes/No Option
+//
+// Douglas Thrift
+//
+// AutoYesNoOption.cs
+
+/*  Copyright 2013 Douglas Thrift
+ *
+ *  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.
+ */
+
+public enum AutoYesNoOption
+{
+    Auto,
+    Yes,
+    No,
+}

ssh-handler/Handler.cs

@@ -0,0 +1,35 @@
+// Handler
+//
+// Douglas Thrift
+//
+// Handler.cs
+
+/*  Copyright 2013 Douglas Thrift
+ *
+ *  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 System;
+using System.Collections.Generic;
+
+public interface Handler
+{
+    IList<string> Usages
+    {
+        get;
+    }
+
+    MatchOption DoMatch(string arg);
+    bool Find();
+    void Execute(Uri uri, string user, string password);
+}

ssh-handler/MatchOption.cs

@@ -0,0 +1,27 @@
+// Match Option
+//
+// Douglas Thrift
+//
+// MatchOption.cs
+
+/*  Copyright 2013 Douglas Thrift
+ *
+ *  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.
+ */
+
+public enum MatchOption
+{
+    None,
+    Set,
+    Option,
+}

ssh-handler/ssh-handler.cs → ssh-handler/OpensshHandler.cs

@@ -1,8 +1,8 @@
-// SSH Handler
+// OpenSSH Handler
 //
 // Douglas Thrift
 //
-// ssh-handler.cs
+// OpensshHandler.cs
 
 /*  Copyright 2013 Douglas Thrift
  *
@@ -23,160 +23,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Windows.Forms;
 using Microsoft.Win32;
 
-public enum MatchOption
-{
-    None,
-    Set,
-    Option,
-}
-
-public enum AutoYesNoOption
-{
-    Auto,
-    Yes,
-    No,
-}
-
-public interface Handler
-{
-    IList<string> Usages
-    {
-        get;
-    }
-
-    MatchOption DoMatch(string arg);
-    bool Find();
-    void Execute(Uri uri, string user, string password);
-}
-
-public abstract class AbstractHandler
-{
-    protected string FindInPath(string program)
-    {
-        foreach (string location in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator))
-        {
-            string path = Path.Combine(location, program);
-            if (File.Exists(path))
-                return path;
-        }
-
-        return null;
-    }
-
-    protected void SetYesNoValue(string input, out AutoYesNoOption option, out string value)
-    {
-        value = null;
-
-        switch (input.ToLowerInvariant())
-        {
-        case "yes":
-            option = AutoYesNoOption.Yes;
-            break;
-        case "no":
-            option = AutoYesNoOption.No;
-            break;
-        default:
-            value = input;
-            goto case "yes";
-        }
-    }
-}
-
-public class PuttyHandler : AbstractHandler, Handler
-{
-    private Regex regex = new Regex(@"^(?:/|--?)putty(?:[:=](?<putty_path>.*))?$", RegexOptions.IgnoreCase);
-    private string path = null;
-
-    public IList<string> Usages
-    {
-        get
-        {
-            return new string[] { "/putty[:<putty-path>] -- Use PuTTY to connect" };
-        }
-    }
-
-    public MatchOption DoMatch(string arg)
-    {
-        Match match;
-
-        if ((match = regex.Match(arg)).Success)
-        {
-            Group group = match.Groups["putty_path"];
-            if (group.Success)
-                path = group.Value;
-            return MatchOption.Set;
-        }
-        else
-            return MatchOption.None;
-    }
-
-    public bool Find()
-    {
-        if (path != null)
-            goto Found;
-
-        foreach (var hive in new RegistryHive[] { RegistryHive.CurrentUser, RegistryHive.LocalMachine })
-        {
-            var views = new List<RegistryView>(new RegistryView[] { RegistryView.Registry32 });
-            if (Environment.Is64BitOperatingSystem)
-                views.Insert(0, RegistryView.Registry64);
-
-            foreach (RegistryView view in views)
-                using (RegistryKey baseKey = RegistryKey.OpenBaseKey(hive, view), key = baseKey.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PuTTY_is1"))
-                    if (key != null)
-                    {
-                        string location = (string)key.GetValue("InstallLocation");
-                        if (location == null)
-                            continue;
-                        path = Path.Combine(location, "putty.exe");
-                        if (File.Exists(path))
-                        {
-                            Debug.WriteLine("Found PuTTY in registry: {0}", path, null);
-                            goto Found;
-                        }
-                        else
-                            path = null;
-                    }
-        }
-
-        if ((path = FindInPath("putty.exe")) != null)
-        {
-            Debug.WriteLine("Found PuTTY in path: {0}", path, null);
-            goto Found;
-        }
-
-        return false;
-
-    Found:
-        path = path.Trim();
-        return true;
-    }
-
-    public void Execute(Uri uri, string user, string password)
-    {
-        if (!Find())
-            throw new Exception("Could not find PuTTY executable.");
-
-        StringBuilder args = new StringBuilder();
-        if (password != null)
-            args.AppendFormat("-pw {0} ", password);
-        if (uri.Port != -1)
-            args.AppendFormat("-P {0} ", uri.Port);
-        if (user != null)
-            args.AppendFormat("{0}@", user);
-        args.Append(uri.Host);
-
-        Debug.WriteLine("Running PuTTY command: {0} {1}", path, args);
-        Process.Start(path, args.ToString());
-    }
-}
-
 public class OpensshHandler : AbstractHandler, Handler
 {
     private Regex regex = new Regex(@"^(?:/|--?)openssh(?:[:=](?<openssh_path>.*))?$", RegexOptions.IgnoreCase);
@@ -376,106 +226,3 @@ public class OpensshHandler : AbstractHandler, Handler
         minttyPath = minttyPath.Trim();
     }
 }
-
-public class SshHandler
-{
-    private static IList<Handler> handlers = new Handler[]
-    {
-        new PuttyHandler(),
-        new OpensshHandler(),
-    };
-    private static Handler handler = null;
-
-    public static int Main(string[] args)
-    {
-        Application.EnableVisualStyles();
-
-        try
-        {
-            Regex usage = new Regex(@"^(?:/|--?)(?:h|help|usage|\?)$", RegexOptions.IgnoreCase);
-            IList<string> uriParts = null;
-
-            foreach (string arg in args)
-                if (uriParts == null)
-                {
-                    if (usage.IsMatch(arg))
-                        return Usage(0);
-
-                    if (!MatchHandler(arg))
-                        uriParts = new List<string>(new string[] { arg });
-                }
-                else
-                    uriParts.Add(arg);
-
-            if (uriParts != null)
-            {
-                Uri uri = new Uri(string.Join(" ", uriParts), UriKind.Absolute);
-                string user, password;
-
-                SetUserPassword(uri, out user, out password);
-
-                if (handler == null)
-                    handler = FindHandler();
-
-                handler.Execute(uri, user, password);
-            }
-            else
-                return Usage(1);
-        }
-        catch (Exception exception)
-        {
-            MessageBox.Show(exception.Message, "SSH Handler Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return 2;
-        }
-
-        return 0;
-    }
-
-    private static int Usage(int code)
-    {
-        MessageBox.Show("ssh-handler [/putty[:<putty-path>]] <ssh-url>\n\n" +
-            string.Join("\n\n", handlers.SelectMany(handler => handler.Usages)), "SSH Handler Usage",
-            MessageBoxButtons.OK, MessageBoxIcon.Information);
-        return code;
-    }
-
-    private static bool MatchHandler(string arg)
-    {
-        foreach (Handler handler in handlers)
-            switch (handler.DoMatch(arg))
-            {
-            case MatchOption.Set:
-                Debug.WriteLine("Setting handler: {0}", handler, null);
-                SshHandler.handler = handler;
-                goto case MatchOption.Option;
-            case MatchOption.Option:
-                return true;
-            }
-
-        return false;
-    }
-
-    private static void SetUserPassword(Uri uri, out string user, out string password)
-    {
-        if (uri.UserInfo.Length != 0)
-        {
-            string[] userInfo = uri.UserInfo.Split(new char[] { ':' }, 2);
-            user = userInfo[0];
-            password = userInfo.Length == 2 ? userInfo[1] : null;
-        }
-        else
-        {
-            user = null;
-            password = null;
-        }
-    }
-
-    private static Handler FindHandler()
-    {
-        foreach (Handler handler in handlers)
-            if (handler.Find())
-                return handler;
-
-        throw new Exception("Could not find a suitable SSH application.");
-    }
-}

ssh-handler/PuttyHandler.cs

@@ -0,0 +1,117 @@
+// PuTTY Handler
+//
+// Douglas Thrift
+//
+// PuttyHandler.cs
+
+/*  Copyright 2013 Douglas Thrift
+ *
+ *  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 System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using Microsoft.Win32;
+
+public class PuttyHandler : AbstractHandler, Handler
+{
+    private Regex regex = new Regex(@"^(?:/|--?)putty(?:[:=](?<putty_path>.*))?$", RegexOptions.IgnoreCase);
+    private string path = null;
+
+    public IList<string> Usages
+    {
+        get
+        {
+            return new string[] { "/putty[:<putty-path>] -- Use PuTTY to connect" };
+        }
+    }
+
+    public MatchOption DoMatch(string arg)
+    {
+        Match match;
+
+        if ((match = regex.Match(arg)).Success)
+        {
+            Group group = match.Groups["putty_path"];
+            if (group.Success)
+                path = group.Value;
+            return MatchOption.Set;
+        }
+        else
+            return MatchOption.None;
+    }
+
+    public bool Find()
+    {
+        if (path != null)
+            goto Found;
+
+        foreach (var hive in new RegistryHive[] { RegistryHive.CurrentUser, RegistryHive.LocalMachine })
+        {
+            var views = new List<RegistryView>(new RegistryView[] { RegistryView.Registry32 });
+            if (Environment.Is64BitOperatingSystem)
+                views.Insert(0, RegistryView.Registry64);
+
+            foreach (RegistryView view in views)
+                using (RegistryKey baseKey = RegistryKey.OpenBaseKey(hive, view), key = baseKey.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PuTTY_is1"))
+                    if (key != null)
+                    {
+                        string location = (string)key.GetValue("InstallLocation");
+                        if (location == null)
+                            continue;
+                        path = Path.Combine(location, "putty.exe");
+                        if (File.Exists(path))
+                        {
+                            Debug.WriteLine("Found PuTTY in registry: {0}", path, null);
+                            goto Found;
+                        }
+                        else
+                            path = null;
+                    }
+        }
+
+        if ((path = FindInPath("putty.exe")) != null)
+        {
+            Debug.WriteLine("Found PuTTY in path: {0}", path, null);
+            goto Found;
+        }
+
+        return false;
+
+    Found:
+        path = path.Trim();
+        return true;
+    }
+
+    public void Execute(Uri uri, string user, string password)
+    {
+        if (!Find())
+            throw new Exception("Could not find PuTTY executable.");
+
+        StringBuilder args = new StringBuilder();
+        if (password != null)
+            args.AppendFormat("-pw {0} ", password);
+        if (uri.Port != -1)
+            args.AppendFormat("-P {0} ", uri.Port);
+        if (user != null)
+            args.AppendFormat("{0}@", user);
+        args.Append(uri.Host);
+
+        Debug.WriteLine("Running PuTTY command: {0} {1}", path, args);
+        Process.Start(path, args.ToString());
+    }
+}

ssh-handler/SshHandler.cs

@@ -0,0 +1,130 @@
+// SSH Handler
+//
+// Douglas Thrift
+//
+// SshHandler.cs
+
+/*  Copyright 2013 Douglas Thrift
+ *
+ *  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 System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+
+public class SshHandler
+{
+    private static IList<Handler> handlers = new Handler[]
+    {
+        new PuttyHandler(),
+        new OpensshHandler(),
+    };
+    private static Handler handler = null;
+
+    public static int Main(string[] args)
+    {
+        Application.EnableVisualStyles();
+
+        try
+        {
+            Regex usage = new Regex(@"^(?:/|--?)(?:h|help|usage|\?)$", RegexOptions.IgnoreCase);
+            IList<string> uriParts = null;
+
+            foreach (string arg in args)
+                if (uriParts == null)
+                {
+                    if (usage.IsMatch(arg))
+                        return Usage(0);
+
+                    if (!MatchHandler(arg))
+                        uriParts = new List<string>(new string[] { arg });
+                }
+                else
+                    uriParts.Add(arg);
+
+            if (uriParts != null)
+            {
+                Uri uri = new Uri(string.Join(" ", uriParts), UriKind.Absolute);
+                string user, password;
+
+                SetUserPassword(uri, out user, out password);
+
+                if (handler == null)
+                    handler = FindHandler();
+
+                handler.Execute(uri, user, password);
+            }
+            else
+                return Usage(1);
+        }
+        catch (Exception exception)
+        {
+            MessageBox.Show(exception.Message, "SSH Handler Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return 2;
+        }
+
+        return 0;
+    }
+
+    private static int Usage(int code)
+    {
+        MessageBox.Show("ssh-handler [/putty[:<putty-path>]] <ssh-url>\n\n" +
+            string.Join("\n\n", handlers.SelectMany(handler => handler.Usages)), "SSH Handler Usage",
+            MessageBoxButtons.OK, MessageBoxIcon.Information);
+        return code;
+    }
+
+    private static bool MatchHandler(string arg)
+    {
+        foreach (Handler handler in handlers)
+            switch (handler.DoMatch(arg))
+            {
+            case MatchOption.Set:
+                Debug.WriteLine("Setting handler: {0}", handler, null);
+                SshHandler.handler = handler;
+                goto case MatchOption.Option;
+            case MatchOption.Option:
+                return true;
+            }
+
+        return false;
+    }
+
+    private static void SetUserPassword(Uri uri, out string user, out string password)
+    {
+        if (uri.UserInfo.Length != 0)
+        {
+            string[] userInfo = uri.UserInfo.Split(new char[] { ':' }, 2);
+            user = userInfo[0];
+            password = userInfo.Length == 2 ? userInfo[1] : null;
+        }
+        else
+        {
+            user = null;
+            password = null;
+        }
+    }
+
+    private static Handler FindHandler()
+    {
+        foreach (Handler handler in handlers)
+            if (handler.Find())
+                return handler;
+
+        throw new Exception("Could not find a suitable SSH application.");
+    }
+}

ssh-handler/ssh-handler.csproj

@@ -61,8 +61,14 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <Compile Include="AbstractHandler.cs" />
+    <Compile Include="AutoYesNoOption.cs" />
+    <Compile Include="Handler.cs" />
+    <Compile Include="MatchOption.cs" />
+    <Compile Include="OpensshHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ssh-handler.cs" />
+    <Compile Include="PuttyHandler.cs" />
+    <Compile Include="SshHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">