Removed GenerationException throw when default patterns file is not found.

Author: SecretDeveloper

README.md

@@ -25,7 +25,7 @@ A library and command line tool that can be used to generate data for testing, t
 If you are familiar with Regular Expressions then most of the syntax used will be familiar but there are significant differences in place given that regex is used to match a string against a pattern.  The generator instead uses simple patterns of symbols to produce strings, because of the difference in usage the syntaxes cannot match up entirely.  Patterns define what the generated values will be and can be composed using text and symbols.  Sections of the pattern can be repeated a specific number of times (they can also be repeated a random number of times by providing a min and max).  Patterns can also include alternate items that will be randomly selected, helping to produce relatively complicated outputs. 
 
 ### Symbols
-The pattern is as follows:
+The following symbols are shorthand tokens which you can use in your generation patterns:
 - `\.` - A single random character of any type.
 - `\W` - A single random character from the following list ' .,;:\"'!&?£€$%^<>{}[]()*+-=\@#|~/'.
 - `\w` - A single random upper-case or lower-case letter.
@@ -37,6 +37,7 @@ The pattern is as follows:
 - `\c` - A single random lower-case consonant.
 - `\D` - A single random non number character.
 - `\d` - A single random number, 1-9.
+- `\S` - A single random non-whitespace character
 - `\s` - A whitespace character (Tab, New Line, Space, Carriage Return or Form Feed)
 - `\n` - A newline character.
 - `\t` - A tab character.
@@ -128,6 +129,8 @@ You can use the `tdg.exe` application to generate test data from the command lin
 ### Pattern Files
 Pattern files contain Named Patterns which can be used within Templates. TDG comes with a few pattern files contained within the 'tdg-patterns' folder and you can add your own if you wish.  The files are structured as simple xml documents that should be pretty self explanatory.  To use a pattern file you have created you need to add its path to a GenerationConfig object when using the library or as part of the configuration directive at the start of a template.  You can also include them from the command line using the `-n` or `--namedpatterns` argument.
 
+**If you are adding TDG to a project using nuget and wish to use some of the named patterns defined in default.tdg-patterns you will need to change its build settings to "Content" and "Copy Always" to ensure it gets deployed with your application.**
+
 ### Commandline examples
 - Single repeating symbols using the following syntax
   - `tdg -t 'Letters <<\L{20}>> and Numbers <<\d{12}>>'`
@@ -147,7 +150,7 @@ Pattern files contain Named Patterns which can be used within Templates. TDG com
 - Generate 100 strings with random name like values and output to file.
   - `tdg -t 'Hi there <<\L\v\l\v \L\v\l\l\v\v\l\l\v>> how are you doing?' -c 100 -o C:\test1.txt`
   - Produces 100 items like *'Aepi Euuwoavio'*.
-- `tdg -t '<<Letters \w{2,20} and Numbers \d{2,12}\n>>'` produces the following output: *'Letters lKYjfCAuZEz and Numbers 1134618008
+- `tdg -t '<<Letters \w{2,20} and Numbers \d{2,12}\n>>'` produces the following output: *'Letters nR9mhIGy_KE and Numbers 1134618008
 '*
 
 ## This README was generated using the generator.  See the unit tests for other examples.

VERSION

@@ -103,7 +103,7 @@ function document{
         Write-host "DOCUMENT FAILED!"  -foregroundcolor:red
         exit
     }
-    Invoke-expression "./src/buildoutput/tdg.exe -i '.\src\templates\README.template.txt' -o '.\src\buildoutput\README.txt'"    
+    Invoke-expression "./src/buildoutput/tdg.exe -i '.\src\templates\README.template.md' -o '.\src\buildoutput\README.txt'"    
     if($? -eq $False){
         Write-host "DOCUMENT FAILED!"  -foregroundcolor:red
         exit
@@ -124,7 +124,7 @@ function deploy{
     # DEPLOYING
     write-host "Deploying" -foregroundcolor:blue
     $outputName = $projectName+"_V"+$buildVersion+"_BUILD.zip"
-    zip a -tzip .\src\buildoutput\$outputName -r .\src\BuildOutput\*.* >> $logPath\LogDeploy.log    
+    zip a -tzip .\releases\$outputName -r .\src\BuildOutput\*.* >> $logPath\LogDeploy.log    
 
 }
 

make.ps1

@@ -31,4 +31,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4.0.0")]
+[assembly: AssemblyVersion("3.4.1.0")]

releases/TestDataGenerator_V3.4.1.zip

@@ -15,14 +15,14 @@
     <tags>Test data generator generate regular expression</tags>
   </metadata>
 <files>
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\gk.DataGenerator.dll" target="lib\net45\gk.DataGenerator.dll" />
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg.exe" target="lib\net45\tdg.exe" />
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg-patterns\default.tdg-patterns" target="lib\net45\tdg-patterns\default.tdg-patterns" />
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg-patterns\language.tdg-patterns" target="lib\net45\tdg-patterns\language.tdg-patterns" />
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\Eloquent.dll" target="lib\net45\Eloquent.dll" />
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\CommandLine.dll" target="lib\net45\CommandLine.dll" />
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\CommandLine.xml" target="lib\net45\CommandLine.xml" />
-      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg.exe.config" target="lib\net45\tdg.exe.config" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\gk.DataGenerator.dll" target="" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg.exe" target="" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg-patterns\default.tdg-patterns" target="" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg-patterns\language.tdg-patterns" target="" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\Eloquent.dll" target="" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\CommandLine.dll" target="" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\CommandLine.xml" target="" />
+      <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\tdg.exe.config" target="" />
       <file src="C:\Development\projects\github.com\secretdeveloper\TestDataGenerator\src\BuildOutput\README.txt" target="" />
   </files>
 </package>

releases/tdg.3.4.1.0.nupkg

@@ -9,6 +9,9 @@ namespace gk.DataGenerator
 {
     public static class FileReader
     {
+        private const string _PatternFolder_Name = "tdg-patterns";
+        private const string _PatternFile_Extension = "tdg-patterns";
+
         public static NamedPatterns LoadNamedPatterns(string path)
         {
             NamedPatterns result;
@@ -22,7 +25,7 @@ public static NamedPatterns LoadNamedPatterns(string path)
 
         public static string GetPatternFilePath(string filePath)
         {
-            if (!Path.HasExtension(filePath)) filePath = Path.ChangeExtension(filePath, "tdg-patterns");
+            if (!Path.HasExtension(filePath)) filePath = Path.ChangeExtension(filePath, _PatternFile_Extension);
 
             var paths = new List<string>();
             paths.Add(filePath);
@@ -34,17 +37,16 @@ public static string GetPatternFilePath(string filePath)
                 paths.Add(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filePath));
 
                 // check if it is within the _PatternFolder_Name folder
-                paths.Add(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "tdg-patterns", filePath));
+                paths.Add(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, _PatternFolder_Name, filePath));
             }
 
             foreach (var path in paths)
             {
                 if (File.Exists(path)) return path;
             }
 
-            var msg = string.Format("Unable to find pattern file '{0}'. Searched in the following locations:\n{1}", filePath, string.Join("\n", paths));
+            var msg = String.Format("Unable to find pattern file '{0}'. Searched in the following locations:\n{1}", filePath, String.Join("\n", paths));
             throw new GenerationException(msg);
         }
-
     }
 }

src/DataGenerator/gk.DataGenerator.CommandLine/Properties/AssemblyInfo.cs

@@ -26,7 +26,7 @@ public int? Seed
         private Random mRandom;
         public Random Random
         {
-            get { return mRandom ?? (mRandom = new Random(mSeed.Value)); }
+            get { return mRandom; }
             set { mRandom = value; }
         }
 

src/DataGenerator/gk.DataGenerator.CommandLine/gk.DataGenerator.tdg.nuspec

@@ -11,24 +11,24 @@ namespace gk.DataGenerator.Generators
 {
     public static class AlphaNumericGenerator 
     {
-        private const string _AllPossibleCharacters = _AllLetters + _AllNumbers + _AllNonAlphaNumericCharacters;
+        private const string _AllPossibleCharacters = _AllLetters + _AllNumbers + _AllNonWhitespaceNonAlphaNumericCharacters + " ";
         private const string _AllLetters = _ShortHand_l + _ShortHand_L;
         private const string _AllNumbers = "0123456789";
-        private const string _AllNonAlphaNumericCharacters = " .,;:\"'!&?£$€$%^<>{}[]()*\\+-=@#_|~/";
+        private const string _AllWhitespaceCharacters = " \t\n\r\f";
+        private const string _AllNonWhitespaceNonAlphaNumericCharacters = ".,;:\"'!&?£$€$%^<>{}[]()*\\+-=@#_|~/";
 
         private const string _ShortHand_l = "abcdefghijklmnopqrstuvwxyz"; // \l
         private const string _ShortHand_L = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; // \L
         private const string _ShortHand_V = "AEIOU"; // \V
         private const string _ShortHand_v = "aeiou"; // \v
         private const string _ShortHand_C = "BCDFGHJKLMNPQRSTVWXYZ"; // \C
         private const string _ShortHand_c = "bcdfghjklmnpqrstvwxyz"; // \c
-        private const string _ShortHand_D = _AllLetters + _AllNonAlphaNumericCharacters; // \D
+        private const string _ShortHand_D = _AllLetters + _AllNonWhitespaceNonAlphaNumericCharacters + " "; // \D
         private const string _ShortHand_d = _AllNumbers; // \d
-        private const string _ShortHand_W = " .,;:\"'!&?£€$%^<>{}[]()*\\+-=@#|~/";  // \W
-        private const string _ShortHand_w = _AllLetters; // \w
-        private const string _ShortHand_s = " \t\n\r\f";  // \s
-        private const string _ShortHand_S = _ShortHand_l + _ShortHand_L + _AllNumbers + _AllNonAlphaNumericCharacters;  // \S
-
+        private const string _ShortHand_W = _AllNonWhitespaceNonAlphaNumericCharacters + " ";  // \W
+        private const string _ShortHand_w = _AllLetters + _AllNumbers + "_"; // \w
+        private const string _ShortHand_s = _AllWhitespaceCharacters;  // \s
+        private const string _ShortHand_S = _AllLetters + _AllNumbers + _AllNonWhitespaceNonAlphaNumericCharacters;  // \S
 
         private const string _Config_Start = "<#";
         private const string _Config_End = "#>";
@@ -54,9 +54,6 @@ public static class AlphaNumericGenerator
 
         private const int _ErrorSnippet_ContextLength = 50;
 
-        private const string _PatternFolder_Name = "tdg-patterns";
-        private const string _PatternFile_Extension = "tdg-patterns";
-
 
         /// <summary>
         /// The number of characters before and after the problem location to include in error messages.
@@ -205,9 +202,6 @@ private static void AppendPatternsFromConfigToCollection(GenerationConfig config
             {
                 var correctedPath = FileReader.GetPatternFilePath(patternFile);
 
-                if (!File.Exists(correctedPath)) 
-                    throw new GenerationException("PatternFile not found:" + patternFile + "\n Attempted to locate it at\n'"+correctedPath+"\nbut it was not found.");
-
                 try
                 {
                     var patt = FileReader.LoadNamedPatterns(correctedPath);
@@ -241,11 +235,17 @@ private static GenerationConfig LoadAndRemoveConfigFromTemplate(ref string templ
         private static NamedPatterns LoadDefaultNamedPatterns()
         {
             var patterns = new NamedPatterns();
-            var path = FileReader.GetPatternFilePath("default");
-                //Path.Combine(AppDomain.CurrentDomain.BaseDirectory, _PatternFolder_Name, "default.tdg-patterns");
-            if (File.Exists(path))
+            try
+            {
+                var path = FileReader.GetPatternFilePath("default");
+                if (File.Exists(path))
+                {
+                    patterns = FileReader.LoadNamedPatterns(path);
+                }
+            }
+            catch(GenerationException)
             {
-                patterns = FileReader.LoadNamedPatterns(path);
+                // Error loading defaults - not throwing as they may not have been deployed
             }
             return patterns;
         }