Merge lp:~sergey.popov/nunit-summary/psg into lp:~charlie.poole/nunit-summary/old-trunk-do-not-use

[Sergey Popov]

[Sergey Popov (sergey.popov)]

A little bugfix.

[Charlie Poole (charlie.poole)]

I forgot this was pending... looks OK.

review: Approve

=== modified file 'XmlTransformerOptions.cs'
--- XmlTransformerOptions.cs	2009-07-05 05:50:06 +0000
+++ XmlTransformerOptions.cs	2009-07-08 03:29:33 +0000
@@ -20,7 +20,7 @@
         bool noheader = false;
         bool html = false;
         bool brief = false;
-       
+
         List<string> inputFiles = new List<string>();
 
         string transformFile = null;
@@ -28,21 +28,30 @@
 
         bool multipleOutput = false;
 
-        public XmlTransformerOptions( string[] args )
+        public XmlTransformerOptions(string[] args)
         {
             if (Path.DirectorySeparatorChar == '\\')
                 optionChars += "/";
 
-            foreach (string arg in args)
-                if (optionChars.IndexOf(arg[0]) >= 0)
-                    processOption( arg );
-                else if( IsWildCardPattern( arg ) )
-                    processWildCardPattern( arg );
-                else
-                    inputFiles.Add( arg );
+            try
+            {
+                foreach (string arg in args)
+                    if (optionChars.IndexOf(arg[0]) >= 0)
+                        processOption(arg);
+                    else if (IsWildCardPattern(arg))
+                        processWildCardPattern(arg);
+                    else
+                        inputFiles.Add(arg);
 
-            if (inputFiles.Count == 0)
-                inputFiles.Add("TestResult.xml");
+                if (inputFiles.Count == 0)
+                    inputFiles.Add("TestResult.xml");
+            }
+            catch (XmlTransformerOptionsException xcp)
+            {
+                Console.Error.WriteLine(xcp.Message);
+                error = true;
+                usage();
+            }
         }
 
         private void processOption(string arg)
@@ -53,10 +62,18 @@
             switch (opt[0])
             {
                 case "xsl":
+                    if (opt.Length != 2)
+                    {
+                        throw new XmlTransformerOptionsException("You must specify a file name for -xsl option!");
+                    }
                     transformFile = opt[1];
                     break;
                 case "o":
                 case "out":
+                    if (opt.Length != 2)
+                    {
+                        throw new XmlTransformerOptionsException("You must specify a file name for -out option!");
+                    }
                     outputFile = opt[1];
                     multipleOutput = Path.GetFileNameWithoutExtension(outputFile) == "*";
                     string ext = Path.GetExtension(outputFile);
@@ -77,10 +94,7 @@
                     brief = true;
                     break;
                 default:
-                    Console.Error.WriteLine("Invalid option: {0}", arg);
-                    error=true;
-                    usage();
-                    break;
+                    throw new XmlTransformerOptionsException(String.Format("Invalid option: {0}", arg));
             }
         }
 
@@ -91,9 +105,9 @@
             if (dir == "") dir = Environment.CurrentDirectory;
             string name = Path.GetFileName(arg);
 
-            if( IsWildCardPattern( dir ) )
-                processWildCardPattern( name, dir.Split(
-                    new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }) );
+            if (IsWildCardPattern(dir))
+                processWildCardPattern(name, dir.Split(
+                    new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }));
             else
                 foreach (string file in Directory.GetFiles(dir, name))
                     inputFiles.Add(file);
@@ -132,7 +146,7 @@
                     string temp = d;
                     for (int index = count + 1; index < parts.Length; index++)
                         temp = Path.Combine(temp, parts[index]);
-                    if( Directory.Exists( temp ) )
+                    if (Directory.Exists(temp))
                         processWildCardPattern(Path.Combine(temp, name));
                 }
             }
@@ -192,12 +206,12 @@
 
         void usage()
         {
-            Console.Error.WriteLine("Usage is: nunit-transform inputFile [options]" );
+            Console.Error.WriteLine("Usage is: nunit-transform inputFile [options]");
             Console.Error.WriteLine();
             Console.Error.WriteLine("  inputFile           The absolute or relative path to an input file to be");
-            Console.Error.WriteLine("                      to be processed. Multiple files may be specified and" );
+            Console.Error.WriteLine("                      to be processed. Multiple files may be specified and");
             Console.Error.WriteLine("                      wildcard specifications may be used in either the name");
-            Console.Error.WriteLine("                      of the file or the directory path. A directory specified" );
+            Console.Error.WriteLine("                      of the file or the directory path. A directory specified");
             Console.Error.WriteLine("                      as '**' represents all directories to any depth.");
             Console.Error.WriteLine();
             Console.Error.WriteLine("  -xsl=transform      Specify xsl transform to use. If not specified, an");
@@ -206,9 +220,9 @@
             Console.Error.WriteLine("                      gives the same output as nunit-console.");
             Console.Error.WriteLine();
             Console.Error.WriteLine("  -out=outputFile     Define the output file. If missing, output is written to");
-            Console.Error.WriteLine("  -o=outputFile       standard output. When multiple input files are processed," );
-            Console.Error.WriteLine("                      the output basename may be specified as '*' to create" );
-            Console.Error.WriteLine("                      a separate output file for each input using the basename" );
+            Console.Error.WriteLine("  -o=outputFile       standard output. When multiple input files are processed,");
+            Console.Error.WriteLine("                      the output basename may be specified as '*' to create");
+            Console.Error.WriteLine("                      a separate output file for each input using the basename");
             Console.Error.WriteLine("                      of the corresponding input file.");
             Console.Error.WriteLine();
             Console.Error.WriteLine("                      If the extension of the output file is html or htm, the");
@@ -231,4 +245,12 @@
             Console.Error.WriteLine("  nunit-summary **/TestResult*.xml -out=allplatforms.txt");
         }
     }
+
+    internal class XmlTransformerOptionsException : Exception
+    {
+        public XmlTransformerOptionsException(string message)
+            : base(message)
+        {
+        }
+    }
 }