spdx 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e09caa619b6cb6d86d982ad58ada05c5226de001a216fe24133a0416c78f4b
-  data.tar.gz: 2ad821cde618383e7595c81a2fbbfcb0737101951ab0f942bc9213901c792120
+  metadata.gz: dc59812be37956f04cda92f9f96ca4ecd86fcff8af570215464fbdfbef2ed2e7
+  data.tar.gz: 212505c4074311fed3bcd13b2cc89b618c64e3a4525e124152d3ecb234581f41
 SHA512:
-  metadata.gz: ad5d27388cd1414e708a3dbee08505aec3b020445d7a779678bf7151c18cdb58383e31f4b6a2240f32adeace6d0551b83da2d6bcc03e3b2b15fa8e38055bab7c
-  data.tar.gz: 5188f366d9dec69d06ef144ddb1648b05c3108c0840ebf06bc1f9c4e0f79994abda3a25b14c4f5126159eadd97c38c67f4ea5d4cba9276f364ea289540b0d464
+  metadata.gz: 35ed0504a7b247f40d8cdac9ebe8a3f71af8feb526efe960a1bbb09252006d70d6295e35af83d7e17bdf21116823d18133a7e4c91779408111083ceff5cc80b0
+  data.tar.gz: b2076f1d6bb44ec96899c008487f13da44737a97840ef44bb0c27d8050943df39d47f065d0ea2b6429486eb0b5b546d2d97385c40df57439efa09aca0651f703

data/README.md

@@ -1,7 +1,6 @@
-# [Spdx](http://libraries.io/rubygems/spdx) - A SPDX license normalizer
-
-This gem allows you to find the closest match using [FuzzyMatch](https://github.com/seamusabshere/fuzzy_match) in the [spdx-licenses](https://github.com/domcleal/spdx-licenses) list for similar (not necessarily exact) license names.
+# [Spdx](http://libraries.io/rubygems/spdx) - A SPDX license parser
 
+This gem allows you validate and parse spdx expressions. It also contains (relatively) up to date license and license exception lists from https://github.com/spdx/license-list-data/tree/master/json
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -21,14 +20,25 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-Spdx.find('Apache 2') # => <SpdxLicenses::License:0x007fa3a2b462c8 @id="Apache-2.0", @name="Apache License 2.0", @osi_approved=true>
+Spdx.valid_spdx?("(MIT OR AGPL-3.0+)")
+=> true
+```
+```ruby
+Spdx.parse_spdx("(MIT OR AGPL-3.0+)")
+=> CompoundExpression+CompoundExpression0 offset=0, "((MIT OR AGPL-3.0+))" (body):
+  Body offset=1, "(MIT OR AGPL-3.0+)":
+    CompoundExpression+CompoundExpression0 offset=1, "(MIT OR AGPL-3.0+)" (body):
+      Body offset=2, "MIT OR AGPL-3.0+":
+        License+License0 offset=2, "MIT"
+        LogicalOr+Or0 offset=5, " OR " (space1,space2)
+        License+License0 offset=9, "AGPL-3.0+"
 ```
 
 ## Testing
 
 Run the tests with:
 
-    $ bundle exec rake
+    $ bundle exec rspec
 
 ## Contributing
 

data/lib/spdx.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 require "spdx/version"
-require "fuzzy_match"
 require "spdx_parser"
 require "json"
 require_relative "exception"
 require_relative "license"
 
-# Fuzzy matcher for licenses to SPDX standard licenses
 module Spdx
   def self.names
     (licenses.keys + licenses.map { |_k, v| v["name"] }).sort

data/lib/spdx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spdx
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spdx.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.version       = Spdx::VERSION
   spec.authors       = ["Tidelift, Inc."]
   spec.email         = ["support@tidelift.com"]
-  spec.summary       = "A SPDX license normalizer"
+  spec.summary       = "A SPDX license parser"
   spec.homepage      = "https://github.com/librariesio/spdx"
   spec.license       = "MIT"
 
@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_dependency "treetop", "~> 1.6"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spdx
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tidelift, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fuzzy_match
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +150,7 @@ requirements: []
 rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: A SPDX license normalizer
+summary: A SPDX license parser
 test_files:
 - spec/spdx_spec.rb
 - spec/spec_helper.rb