release 1.1.3 => new '-d' --dontoverwrite option

Author: monoman

CopyDeployer.cs

@@ -33,10 +33,6 @@ internal class CopyDeployer
 		public CopyDeployer(CopyDeployerOptions options)
 		{
 			_options = options;
-			if (_options.Summary)
-				_options.Quiet = true;
-			if (_options.Quiet)
-				_options.Verbose = false;
 		}
 
 		public int Execute()
@@ -48,17 +44,24 @@ public int Execute()
 					Quiet("Path to copy from is not a valid directory: {0}", from);
 					return 2;
 				}
-				if (!Directory.Exists(Path.GetDirectoryName(to))) {
+				if (!Directory.Exists(ParentDir(to))) {
 					Quiet("Path to deploy into is not a valid directory: {0}", to);
 					return 3;
 				}
-				Quiet("Deploying from {0} into {1}", from, to);
-				if (_options.CleanTarget && Directory.Exists(to)) {
-					Quiet("Removing previous content at: {0}", to);
-					Directory.Delete(to, true);
+				if (_options.DontOverWrite && Directory.Exists(to)) {
+					Summary("Skipping existing target directory: {0}", to);
+				} else {
+					Quiet("Deploying from {0} into {1}", from, to);
+					if (_options.CleanTarget && Directory.Exists(to)) {
+						Quiet("Removing previous content at: {0}", to);
+						Directory.Delete(to, true);
+					}
+					DeployDir(from, to);
+					if (_options.CleanTarget)
+						Summary("{0} files copied", _filesCopied);
+					else
+						Summary("{0} files copied, {1} files skipped", _filesCopied, _filesSkipped);
 				}
-				DeployDir(from, to);
-				Summary("{0} files copied, {1} files skipped", _filesCopied, _filesSkipped);
 				return 0;
 			} catch (Exception e) {
 				Quiet("Exception: {0}", e);
@@ -70,6 +73,11 @@ public int Execute()
 		private int _filesSkipped = 0;
 		private CopyDeployerOptions _options;
 
+		private static string ParentDir(string to)
+		{
+			return Path.GetDirectoryName(to);
+		}
+
 		private void DeployDir(string from, string to)
 		{
 			if (!Directory.Exists(to))
@@ -105,22 +113,22 @@ private byte[] HashFile(string file)
 				return md5.ComputeHash(stream);
 		}
 
-		private void Summary(string format, params object[] parameters)
+		private void Quiet(string format, params object[] parameters)
 		{
-			WriteLine(_options.Summary || !_options.Quiet, format, parameters);
+			WriteLineIf(!_options.Quiet, format, parameters);
 		}
 
-		private void Quiet(string format, params object[] parameters)
+		private void Summary(string format, params object[] parameters)
 		{
-			WriteLine(!_options.Quiet, format, parameters);
+			WriteLineIf(_options.Summary || !_options.Quiet, format, parameters);
 		}
 
 		private void Verbose(string format, params object[] parameters)
 		{
-			WriteLine(_options.Verbose, format, parameters);
+			WriteLineIf(_options.Verbose, format, parameters);
 		}
 
-		private void WriteLine(bool condition, string format, object[] parameters)
+		private void WriteLineIf(bool condition, string format, object[] parameters)
 		{
 			if (condition)
 				Console.WriteLine(string.Format(format, parameters));

CopyDeployerOptions.cs

@@ -38,17 +38,28 @@ public CopyDeployerOptions(string[] args)
 		[Option("Clean target directory", "clean", ShortForm = 'c')]
 		public bool CleanTarget { get; set; }
 
+		[Option("Do not overwrite if there is a target directory", "dontoverwrite", ShortForm = 'd')]
+		public bool DontOverWrite { get; set; }
+
 		[Option("Path to {directory} to copy from (default: current directory)", "from", ShortForm = 'f')]
 		public string From { get; set; }
 
 		public bool IsOk
 		{
 			get
 			{
+				if (CleanTarget && DontOverWrite) {
+					ReportError(-1, "You can't ask to clean the target directory and not to overwrite it at the same time!!!");
+					return false;
+				}
 				if (string.IsNullOrWhiteSpace(FirstArgument)) {
 					DoHelp();
 					return false;
 				}
+				if (Summary)
+					Quiet = true;
+				if (Quiet)
+					Verbose = false;
 				return true;
 			}
 		}
@@ -80,7 +91,6 @@ protected override void InitializeOtherDefaults()
 		{
 			base.InitializeOtherDefaults();
 			From = Directory.GetCurrentDirectory();
-			Verbose = false;
 		}
 	}
 }

Properties/AssemblyInfo.cs

@@ -33,9 +33,9 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.1.2")]
-[assembly: AssemblyFileVersion("1.1.2")]
-[assembly: AssemblyInformationalVersion("1.1.2")]
+[assembly: AssemblyVersion("1.1.3")]
+[assembly: AssemblyFileVersion("1.1.3")]
+[assembly: AssemblyInformationalVersion("1.1.3")]
 [assembly: UsageComplement("<path of directory to deploy into>")]
 [assembly: ReportBugsTo("https://github.com/managed-commons/cpdeploy/issues")]
 [assembly: License(LicenseType.MIT)]