From 547f4f12b19f513c2ec2db2a7a10edcf77ff5ced Mon Sep 17 00:00:00 2001 From: mo khan Date: Sun, 2 Feb 2020 16:17:54 -0700 Subject: Save license expression string instead of array --- CHANGELOG.md | 9 +++++++-- Gemfile.lock | 2 +- lib/spandx/gateways/nuget.rb | 2 +- lib/spandx/version.rb | 2 +- spec/unit/gateways/nuget_spec.rb | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec61426..a39ae58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -Version 0.4.0 +Version 0.4.1 # Changelog @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.1] - 2020-02-02 +### Fixed +- Save license expression as string instead of array. + ## [0.4.0] - 2020-02-02 ### Added - Add command to build offline index of nuget packages and their licenses. @@ -61,7 +65,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Provide ruby API to the latest SPDX catalogue. -[Unreleased]: https://github.com/mokhan/spandx/compare/v0.4.0...HEAD +[Unreleased]: https://github.com/mokhan/spandx/compare/v0.4.1...HEAD +[0.4.1]: https://github.com/mokhan/spandx/compare/v0.4.0...v0.4.1 [0.4.0]: https://github.com/mokhan/spandx/compare/v0.3.0...v0.4.0 [0.3.0]: https://github.com/mokhan/spandx/compare/v0.2.0...v0.3.0 [0.2.0]: https://github.com/mokhan/spandx/compare/v0.1.7...v0.2.0 diff --git a/Gemfile.lock b/Gemfile.lock index 20f15ab..b8c4162 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - spandx (0.4.0) + spandx (0.4.1) addressable (~> 2.7) bundler (>= 1.16, < 3.0.0) concurrent-ruby-ext (~> 1.1) diff --git a/lib/spandx/gateways/nuget.rb b/lib/spandx/gateways/nuget.rb index 53c75de..05d9932 100644 --- a/lib/spandx/gateways/nuget.rb +++ b/lib/spandx/gateways/nuget.rb @@ -105,7 +105,7 @@ module Spandx return if index.indexed?(key) if (license = spec['licenseExpression']) - index.write(key, [license]) + index.write(key, license) end puts [license, key].inspect end diff --git a/lib/spandx/version.rb b/lib/spandx/version.rb index d90f29a..854333d 100644 --- a/lib/spandx/version.rb +++ b/lib/spandx/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Spandx - VERSION = '0.4.0' + VERSION = '0.4.1' end diff --git a/spec/unit/gateways/nuget_spec.rb b/spec/unit/gateways/nuget_spec.rb index bfe1f61..1184469 100644 --- a/spec/unit/gateways/nuget_spec.rb +++ b/spec/unit/gateways/nuget_spec.rb @@ -27,6 +27,6 @@ RSpec.describe Spandx::Gateways::Nuget do end end - specify { expect(index).to have_received(:write).with(['api.nuget.org', 'Polaroider', '0.2.0'], ['MIT']) } + specify { expect(index).to have_received(:write).with(['api.nuget.org', 'Polaroider', '0.2.0'], 'MIT') } end end -- cgit v1.2.3