Added constant for config filename

ryanrousseau · ryanrousseau · commit 83c96713bdd5 · 2014-09-13T12:56:54.000-05:00
diff --git a/src/ScriptCs.Core/Constants.cs b/src/ScriptCs.Core/Constants.cs
@@ -18,7 +18,9 @@ public static class Constants
 
         [Obsolete("Use IFileSystem instead.")]
         public const string DllCacheFolder = ".cache";
-        
+
+        public const string ConfigFilename = "scriptcs.opts";
+
         public const string DefaultRepositoryUrl = "https://nuget.org/api/v2/";
     }
 }
diff --git a/src/ScriptCs.Core/FileSystem.cs b/src/ScriptCs.Core/FileSystem.cs
@@ -184,7 +184,7 @@ public virtual string NugetFile
 
         public virtual string GlobalOptsFile
         {
-            get { return Path.Combine(GlobalFolder, "scriptcs.opts"); }
+            get { return Path.Combine(GlobalFolder, Constants.ConfigFilename); }
         }
     }
 }
diff --git a/src/ScriptCs/Argument/ArgumentHandler.cs b/src/ScriptCs/Argument/ArgumentHandler.cs
@@ -28,7 +28,7 @@ public ArgumentParseResult Parse(string[] args)
             var sr = SplitScriptArgs(args);
 
             var commandArgs = _argumentParser.Parse(sr.CommandArguments);
-            var localConfigFile = commandArgs != null ? commandArgs.Config : "scriptcs.opts";
+            var localConfigFile = commandArgs != null ? commandArgs.Config : Constants.ConfigFilename;
             var localConfigPath = string.Format("{0}\\{1}", _fileSystem.CurrentDirectory, localConfigFile);
             var localConfigArgs = _configFileParser.Parse(GetFileContent(localConfigPath));
             var globalConfigArgs = _configFileParser.Parse(GetFileContent(_fileSystem.GlobalOptsFile));
diff --git a/src/ScriptCs/ScriptCsArgs.cs b/src/ScriptCs/ScriptCsArgs.cs
@@ -12,7 +12,7 @@ public class ScriptCsArgs
         public ScriptCsArgs()
         {
             LogLevel = LogLevel.Info;
-            Config = "scriptcs.opts";
+            Config = Constants.ConfigFilename;
         }
 
         [ArgDescription("Launch REPL mode when running script. To just launch REPL, simply use 'scriptcs' without any args.")]
@@ -67,7 +67,7 @@ public ScriptCsArgs()
         [ArgDescription("Specify modules to load")]
         public string Modules { get; set; }
 
-        [DefaultValue("scriptcs.opts")]
+        [DefaultValue(Constants.ConfigFilename)]
         [ArgDescription("Defines config file name")]
         public string Config { get; set; }
 
diff --git a/test/ScriptCs.Tests/ArgumentHandlerTests.cs b/test/ScriptCs.Tests/ArgumentHandlerTests.cs
@@ -11,13 +11,13 @@ public class ArgumentHandlerTests
     {
         public class ParseMethod
         {
-            private static IArgumentHandler Setup(string fileContent, string fileName = "scriptcs.opts", bool fileExists = true, string globalFileContent = null)
+            private static IArgumentHandler Setup(string fileContent, string fileName = Constants.ConfigFilename, bool fileExists = true, string globalFileContent = null)
             {
                 const string currentDirectory = "C:\\test\\folder";
                 const string moduleDirectory = "C:\\test\\moduleFolder";
 
                 string filePath = currentDirectory + '\\' + fileName;
-                string globalFilePath = moduleDirectory + "\\scriptcs.opts";
+                string globalFilePath = moduleDirectory + "\\" + Constants.ConfigFilename;
 
                 var fs = new Mock<IFileSystem>();
                 fs.SetupGet(x => x.CurrentDirectory).Returns(currentDirectory);
@@ -238,7 +238,7 @@ public void ShouldUseScriptOptsIfParsingFailed()
 
                 argumentHandler.Parse(new string[0]);
 
-                system.Verify(x => x.FileExists(@"C:\scriptcs.opts"), Times.Once());
+                system.Verify(x => x.FileExists(@"C:\" + Constants.ConfigFilename), Times.Once());
             }
 
             [Fact]
diff --git a/test/ScriptCs.Tests/ArgumentParserTests.cs b/test/ScriptCs.Tests/ArgumentParserTests.cs
@@ -46,7 +46,7 @@ public void ShouldHandleEmptyAttray()
                 result.ShouldNotBeNull();
                 result.Repl.ShouldBeTrue();
                 result.LogLevel.ShouldEqual(LogLevel.Info);
-                result.Config.ShouldEqual("scriptcs.opts");
+                result.Config.ShouldEqual(Constants.ConfigFilename);
             }
 
             [Fact]
@@ -58,7 +58,7 @@ public void ShouldHandleNull()
                 result.ShouldNotBeNull();
                 result.Repl.ShouldBeTrue();
                 result.LogLevel.ShouldEqual(LogLevel.Info);
-                result.Config.ShouldEqual("scriptcs.opts");
+                result.Config.ShouldEqual(Constants.ConfigFilename);
             }
 
             [Fact]

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ public static class Constants`
`18`	`18`
`19`	`19`	`[Obsolete("Use IFileSystem instead.")]`
`20`	`20`	`public const string DllCacheFolder = ".cache";`
`21`		`-`
	`21`	`+`
	`22`	`+ public const string ConfigFilename = "scriptcs.opts";`
	`23`	`+`
`22`	`24`	`public const string DefaultRepositoryUrl = "https://nuget.org/api/v2/";`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public virtual string NugetFile`
`184`	`184`
`185`	`185`	`public virtual string GlobalOptsFile`
`186`	`186`	`{`
`187`		`- get { return Path.Combine(GlobalFolder, "scriptcs.opts"); }`
	`187`	`+ get { return Path.Combine(GlobalFolder, Constants.ConfigFilename); }`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class ScriptCsArgs`
`12`	`12`	`public ScriptCsArgs()`
`13`	`13`	`{`
`14`	`14`	`LogLevel = LogLevel.Info;`
`15`		`- Config = "scriptcs.opts";`
	`15`	`+ Config = Constants.ConfigFilename;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`[ArgDescription("Launch REPL mode when running script. To just launch REPL, simply use 'scriptcs' without any args.")]`
`@@ -67,7 +67,7 @@ public ScriptCsArgs()`
`67`	`67`	`[ArgDescription("Specify modules to load")]`
`68`	`68`	`public string Modules { get; set; }`
`69`	`69`
`70`		`- [DefaultValue("scriptcs.opts")]`
	`70`	`+ [DefaultValue(Constants.ConfigFilename)]`
`71`	`71`	`[ArgDescription("Defines config file name")]`
`72`	`72`	`public string Config { get; set; }`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,13 @@ public class ArgumentHandlerTests`
`11`	`11`	`{`
`12`	`12`	`public class ParseMethod`
`13`	`13`	`{`
`14`		`- private static IArgumentHandler Setup(string fileContent, string fileName = "scriptcs.opts", bool fileExists = true, string globalFileContent = null)`
	`14`	`+ private static IArgumentHandler Setup(string fileContent, string fileName = Constants.ConfigFilename, bool fileExists = true, string globalFileContent = null)`
`15`	`15`	`{`
`16`	`16`	`const string currentDirectory = "C:\\test\\folder";`
`17`	`17`	`const string moduleDirectory = "C:\\test\\moduleFolder";`
`18`	`18`
`19`	`19`	`string filePath = currentDirectory + '\\' + fileName;`
`20`		`- string globalFilePath = moduleDirectory + "\\scriptcs.opts";`
	`20`	`+ string globalFilePath = moduleDirectory + "\\" + Constants.ConfigFilename;`
`21`	`21`
`22`	`22`	`var fs = new Mock<IFileSystem>();`
`23`	`23`	`fs.SetupGet(x => x.CurrentDirectory).Returns(currentDirectory);`
`@@ -238,7 +238,7 @@ public void ShouldUseScriptOptsIfParsingFailed()`
`238`	`238`
`239`	`239`	`argumentHandler.Parse(new string[0]);`
`240`	`240`
`241`		`- system.Verify(x => x.FileExists(@"C:\scriptcs.opts"), Times.Once());`
	`241`	`+ system.Verify(x => x.FileExists(@"C:\" + Constants.ConfigFilename), Times.Once());`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`[Fact]`