Add management of partial url

SsrsDeploy.Testing/ProgramTest.cs

@@ -0,0 +1,67 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SsrsDeploy.Testing
+{
+    [TestFixture]
+    public class ProgramTest
+    {
+        [Test]
+        public void GetUrl_FullName()
+        {
+            var options = new Options() { Url = "http://reporting.company.com/ReportServer/ReportService2010.asmx" };
+            var url = Program.GetUrl(options);
+
+            Assert.That(url, Is.EqualTo("http://reporting.company.com/ReportServer/ReportService2010.asmx"));
+        }
+
+        [Test]
+        public void GetUrl_Host()
+        {
+            var options = new Options() { Url = "reporting.company.com" };
+            var url = Program.GetUrl(options);
+
+            Assert.That(url, Is.EqualTo("http://reporting.company.com/ReportServer/ReportService2010.asmx"));
+        }
+
+        [Test]
+        public void GetUrl_HostPath()
+        {
+            var options = new Options() { Url = "reporting.company.com/ReportServer" };
+            var url = Program.GetUrl(options);
+
+            Assert.That(url, Is.EqualTo("http://reporting.company.com/ReportServer/ReportService2010.asmx"));
+        }
+
+        [Test]
+        public void GetUrl_HostPathSlash()
+        {
+            var options = new Options() { Url = "reporting.company.com/ReportServer/" };
+            var url = Program.GetUrl(options);
+
+            Assert.That(url, Is.EqualTo("http://reporting.company.com/ReportServer/ReportService2010.asmx"));
+        }
+
+        [Test]
+        public void GetUrl_HostPathFile()
+        {
+            var options = new Options() { Url = "reporting.company.com/ReportServer/ReportService2010.asmx" };
+            var url = Program.GetUrl(options);
+
+            Assert.That(url, Is.EqualTo("http://reporting.company.com/ReportServer/ReportService2010.asmx"));
+        }
+
+        [Test]
+        public void GetUrl_SchemeHostPort()
+        {
+            var options = new Options() { Url = "http://reporting.company.com:8080" };
+            var url = Program.GetUrl(options);
+
+            Assert.That(url, Is.EqualTo("http://reporting.company.com:8080/ReportServer/ReportService2010.asmx"));
+        }
+    }
+}

SsrsDeploy.Testing/SsrsDeploy.Testing.csproj

@@ -59,6 +59,7 @@
     <Compile Include="Parser\Xml\DataSourceParserTest.cs" />
     <Compile Include="Parser\Xml\FolderParserTest.cs" />
     <Compile Include="Parser\Xml\ReportParserTest.cs" />
+    <Compile Include="ProgramTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

SsrsDeploy/Options.cs

@@ -7,7 +7,7 @@
 
 namespace SsrsDeploy
 {
-    class Options
+    public class Options
     {
         [Option('u', "url", Required = true,
           HelpText = "Url of the webservice where to deploy the reports.")]

SsrsDeploy/Program.cs

@@ -10,7 +10,7 @@
 
 namespace SsrsDeploy
 {
-    class Program
+    public class Program
     {
         static int Main(string[] args)
         {
@@ -23,7 +23,7 @@ static int Main(string[] args)
             var argsValue = ((Parsed<Options>)result).Value;
 
             var rs = new ReportingService.ReportingService2010();
-            rs.Url = argsValue.Url;
+            rs.Url = GetUrl(argsValue);
             rs.Credentials = System.Net.CredentialCache.DefaultCredentials;
 
             var rootPath = argsValue.Root ?? Path.GetDirectoryName(argsValue.Source);
@@ -38,5 +38,28 @@ static int Main(string[] args)
 
             return exitCode;
         }
+
+        public static string GetUrl(Options options)
+        {
+            var baseUrl = options.Url;
+            var builder = new UriBuilder(baseUrl);
+
+            if (string.IsNullOrEmpty(builder.Scheme))
+                builder.Scheme = Uri.UriSchemeHttp;
+
+            if (builder.Scheme != Uri.UriSchemeHttp && builder.Scheme != Uri.UriSchemeHttps)
+                throw new ArgumentException();
+
+            if (!builder.Path.EndsWith("/ReportService2010.asmx"))
+                builder.Path += (builder.Path.EndsWith("/") ? "" : "/") + "ReportService2010.asmx";
+
+            if (builder.Path.Equals("/ReportService2010.asmx"))
+                builder.Path = "/ReportServer" + builder.Path;
+
+            if (builder.Uri.IsDefaultPort)
+                return builder.Uri.GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped);
+
+            return builder.ToString();
+        }
     }
 }