Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't allow empty string as authors and description metadata #1728

Merged
merged 3 commits into from
Jun 16, 2016
Merged

Don't allow empty string as authors and description metadata #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9830c56
Don't allow empty description
inosik Jun 15, 2016
8567a35
Don't return empty string as author
inosik Jun 15, 2016
08b7d3b
Add missing metadata to integration tests
inosik Jun 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...rationtests/scenarios/i001234-missing-assemblyname/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project

description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001375-pack-specific/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001376-pack-template-plus/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ type project
id PaketBug
description
Silly empty demo project
authors Paket team
files
paket.references => content/net45+net451
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001376-pack-template/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions ...ests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions ...sts/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug2/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug2
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions ...grationtests/scenarios/i001429-pack-deps-specific/before/PaketBug2/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug2
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001429-pack-deps/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001429-pack-deps/before/PaketBug2/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug2
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001586-pack-referenced/before/PaketBug/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug
description
Silly empty demo project
authors Paket team
1 change: 1 addition & 0 deletions integrationtests/scenarios/i001586-pack-referenced/before/PaketBug2/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ type project
id PaketBug2
description
Silly empty demo project
authors Paket team
2 changes: 2 additions & 0 deletions integrationtests/scenarios/i001594-pack/before/paket.templatetemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
type project
description Test project.
authors Paket team
licenseUrl http://opensource.org/licenses/MIT
4 changes: 2 additions & 2 deletions src/Paket.Core/PackageMetaData.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ let getVersion versionFromAssembly attributes =

let getAuthors attributes =
attributes
|> Seq.tryPick (function Company a -> Some a | _ -> None)
|> Option.map (fun a ->
|> Seq.tryPick (function Company a when notNullOrEmpty a -> Some a | _ -> None)
|> Option.map (fun a ->
a.Split(',')
|> Array.map (fun s -> s.Trim())
|> List.ofArray)
Expand Down
2 changes: 1 addition & 1 deletion src/Paket.Core/PackageProcess.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ let private merge buildConfig buildPlatform versionFromAssembly specificVersions
[ if merged.Id = None then yield "Id"
if merged.Version = None then yield "Version"
if merged.Authors = None || merged.Authors = Some [] then yield "Authors"
if merged.Description = None then yield "Description" ]
if merged.Description = None || merged.Description = Some "" then yield "Description" ]
|> fun xs -> String.Join(", ",xs)

failwithf
Expand Down