Merge pull request #356 from anthonylangsworth/missing_author_NullReference

Fix for missing author null reference (#332)

Author: nemec

.gitignore

@@ -39,4 +39,6 @@ artifacts/*
 .vs/*
 *.xproj.user
 *.nuget.targets
-*.lock.json
+*.lock.json
+*.nuget.props
+

src/CommandLine/Error.cs

@@ -157,6 +157,11 @@ public abstract class TokenError : Error, IEquatable<TokenError>
 {
 privatereadonlystringtoken;
 
+/// <summary>
+/// Initializes a new instance of the <see cref="CommandLine.TokenError"/> class.
+/// </summary>
+/// <param name="tag">Error type.</param>
+/// <param name="token">Problematic token.</param>
 protectedinternalTokenError(ErrorTypetag,stringtoken)
 :base(tag)
 {
@@ -232,6 +237,12 @@ public abstract class NamedError : Error, IEquatable<NamedError>
 {
 privatereadonlyNameInfonameInfo;
 
+/// <summary>
+/// Initializes a new instance of the <see cref="CommandLine.NamedError"/> class.
+/// </summary>
+/// <param name="tag">Error type.</param>
+/// <param name="nameInfo">Problematic name.</param>
+
 protectedinternalNamedError(ErrorTypetag,NameInfonameInfo)
 :base(tag)
 {

src/CommandLine/Infrastructure/ReflectionHelper.cs

@@ -1,18 +1,57 @@
 // Copyright 2005-2015 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information.
 
 usingSystem;
+usingSystem.Collections.Generic;
 usingSystem.Linq;
 usingSystem.Reflection;
+usingSystem.Runtime.Remoting.Messaging;
 usingCommandLine.Core;
 usingCSharpx;
 
 namespaceCommandLine.Infrastructure
 {
 staticclassReflectionHelper
 {
+/// <summary>
+/// Per thread assembly attribute overrides for testing.
+/// </summary>
+[ThreadStatic]privatestaticIDictionary<Type,Attribute>_overrides;
+
+/// <summary>
+/// Assembly attribute overrides for testing.
+/// </summary>
+/// <remarks>
+/// The implementation will fail if two or more attributes of the same type
+/// are included in <paramref name="overrides"/>.
+/// </remarks>
+/// <param name="overrides">
+/// Attributes that replace the existing assembly attributes or null,
+/// to clear any testing attributes.
+/// </param>
+publicstaticvoidSetAttributeOverride(IEnumerable<Attribute>overrides)
+{
+if(overrides!=null)
+{
+_overrides=overrides.ToDictionary(attr =>attr.GetType(), attr =>attr);
+}
+else
+{
+_overrides=null;
+}
+}
+
 publicstaticMaybe<TAttribute>GetAttribute<TAttribute>()
 whereTAttribute:Attribute
 {
+// Test support
+if(_overrides!=null)
+{
+return
+_overrides.ContainsKey(typeof(TAttribute))?
+Maybe.Just((TAttribute)_overrides[typeof(TAttribute)]):
+Maybe.Nothing<TAttribute>();
+}
+
 varassembly=GetExecutingOrEntryAssembly();
 
 #if NET40

src/CommandLine/Text/CopyrightInfo.cs

@@ -1,6 +1,7 @@
 // Copyright 2005-2015 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information.
 
 usingSystem;
+usingSystem.Dynamic;
 usingSystem.Globalization;
 usingSystem.Reflection;
 usingSystem.Text;
@@ -24,6 +25,17 @@ public class CopyrightInfo
 privatereadonlystringauthor;
 privatereadonlyintbuilderSize;
 
+/// <summary>
+/// An empty object used for initialization.
+/// </summary>
+publicstaticCopyrightInfoEmpty
+{
+get
+{
+returnnewCopyrightInfo("author",1);
+}
+}
+
 /// <summary>
 /// Initializes a new instance of the <see cref="CommandLine.Text.CopyrightInfo"/> class
 /// specifying author and year.

src/CommandLine/Text/HeadingInfo.cs

@@ -33,6 +33,17 @@ public HeadingInfo(string programName, string version = null)
 this.version=version;
 }
 
+/// <summary>
+/// An empty object used for initialization. 
+/// </summary>
+publicstaticHeadingInfoEmpty
+{
+get
+{
+returnnewHeadingInfo("");
+}
+}
+
 /// <summary>
 /// Gets the default heading instance.
 /// The title is retrieved from <see cref="AssemblyTitleAttribute"/>,

src/CommandLine/Text/HelpText.cs

@@ -212,13 +212,23 @@ public static HelpText AutoBuild<T>(
 {
 varauto=newHelpText
 {
-Heading=HeadingInfo.Default,
-Copyright=CopyrightInfo.Default,
+Heading=HeadingInfo.Empty,
+Copyright=CopyrightInfo.Empty,
 AdditionalNewLineAfterOption=true,
 AddDashesToOption=!verbsIndex,
 MaximumDisplayWidth=maxDisplayWidth
 };
 
+try
+{
+auto.Heading=HeadingInfo.Default;
+auto.Copyright=CopyrightInfo.Default;
+}
+catch(Exception)
+{
+auto=onError(auto);
+}
+
 varerrors=Enumerable.Empty<Error>();
 
 if(onError!=null&&parserResult.Tag==ParserResultType.NotParsed)

tests/CommandLine.Tests/Unit/Text/HelpTextTests.cs

@@ -4,8 +4,11 @@
 usingSystem.Collections.Generic;
 usingSystem.Globalization;
 usingSystem.Linq;
+usingSystem.Reflection;
 usingCommandLine.Core;
+usingCommandLine.Infrastructure;
 usingCommandLine.Tests.Fakes;
+usingCommandLine.Tests.Unit.Infrastructure;
 usingCommandLine.Text;
 usingFluentAssertions;
 usingXunit;
@@ -564,5 +567,95 @@ public void Default_set_to_sequence_should_be_properly_printed()
 // Teardown
 }
 #endif
+
+[Fact]
+publicvoidAutoBuild_when_no_assembly_attributes()
+{
+try
+{
+stringexpectedCopyright="Copyright (C) 1 author";
+
+ReflectionHelper.SetAttributeOverride(newAttribute[0]);
+
+ParserResult<Simple_Options>fakeResult=newNotParsed<Simple_Options>(
+TypeInfo.Create(typeof(Simple_Options)),newError[0]);
+boolonErrorCalled=false;
+HelpTextactualResult=HelpText.AutoBuild(fakeResult, ht =>
+{
+onErrorCalled=true;
+returnht;
+}, ex =>ex);
+
+onErrorCalled.Should().BeTrue();
+actualResult.Copyright.Should().Be(expectedCopyright);
+}
+finally
+{
+ReflectionHelper.SetAttributeOverride(null);
+}
+}
+
+[Fact]
+publicvoidAutoBuild_with_assembly_title_and_version_attributes_only()
+{
+try
+{
+stringexpectedTitle="Title";
+stringexpectedVersion="1.2.3.4";
+
+ReflectionHelper.SetAttributeOverride(newAttribute[]
+{
+newAssemblyTitleAttribute(expectedTitle),
+newAssemblyInformationalVersionAttribute(expectedVersion)
+});
+
+ParserResult<Simple_Options>fakeResult=newNotParsed<Simple_Options>(
+TypeInfo.Create(typeof(Simple_Options)),newError[0]);
+boolonErrorCalled=false;
+HelpTextactualResult=HelpText.AutoBuild(fakeResult, ht =>
+{
+onErrorCalled=true;
+returnht;
+}, ex =>ex);
+
+onErrorCalled.Should().BeTrue();
+actualResult.Heading.Should().Be(string.Format("{0}{1}",expectedTitle,expectedVersion));
+}
+finally
+{
+ReflectionHelper.SetAttributeOverride(null);
+}
+}
+
+
+[Fact]
+publicvoidAutoBuild_with_assembly_company_attribute_only()
+{
+try
+{
+stringexpectedCompany="Company";
+
+ReflectionHelper.SetAttributeOverride(newAttribute[]
+{
+newAssemblyCompanyAttribute(expectedCompany)
+});
+
+ParserResult<Simple_Options>fakeResult=newNotParsed<Simple_Options>(
+TypeInfo.Create(typeof(Simple_Options)),newError[0]);
+boolonErrorCalled=false;
+HelpTextactualResult=HelpText.AutoBuild(fakeResult, ht =>
+{
+onErrorCalled=true;
+returnht;
+}, ex =>ex);
+
+onErrorCalled.Should().BeFalse();// Other attributes have fallback logic
+actualResult.Copyright.Should().Be(string.Format("Copyright (C){0}{1}",DateTime.Now.Year,expectedCompany));
+}
+finally
+{
+ReflectionHelper.SetAttributeOverride(null);
+}
+}
 }
 }