licensure 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5887811c86a3c1c6981aa5ec6c9b1efd5ac9b3752a93eb1d588c6d62acb9d704
-  data.tar.gz: 53baba973dcbc133f942fbf251b30bc380a745b473aa235bddd06cc929eb0098
+  metadata.gz: 2805125ca2b8cc001a334352f8b5799fd95687e28f3f452a8b9ddd3363e1ca6a
+  data.tar.gz: a3cbb3378e66fb24a4239c7d317c39c2c35ccb5765900b862ebf4eb9edb879d8
 SHA512:
-  metadata.gz: fd784c7b336d63fc34f34e229757877a8fd9efabc392dd66930da6241fbf7be4a2e19f450eaaed47f4930b4cc8dc9994fd1320c510cf83736de2650729d06dca
-  data.tar.gz: ebded542cf8af7901a0e59a4ab1c92e8f3a4e7531167a99022a7ce8c3a409208cd53617f225b630c2f36d3f0aba0bb565f23b793cfe03bba964595496ad5b778
+  metadata.gz: d495b2ee905388c8683376c37b94cba58c7519228b434851dd2f1c4f3b009ab2f43df8479fc3a15cabe6620b5f4de1e983c77eeb36a309a0dd2e693cbd1c005e
+  data.tar.gz: f7a3e6aa8ea488b1173a7a9767d0ad23b1c1f05edb79c880ba607a8411f4a5263d302c0a24fe69f5b1b32f66e2bc33c8f5df8d0a2d18e1e396f3da312e4faf0c

data/README.md

@@ -1,4 +1,4 @@
-# Licensure
+# Licensure [![Gem Version](https://badge.fury.io/rb/licensure.svg)](https://badge.fury.io/rb/licensure) [![Ruby](https://github.com/ydah/licensure/actions/workflows/main.yml/badge.svg)](https://github.com/ydah/licensure/actions/workflows/main.yml)
 
 Licensure is a RubyGem CLI tool that inspects dependency licenses from `Gemfile.lock` and checks them against a configurable allow list.
 

data/lib/licensure/license_checker.rb

@@ -52,7 +52,15 @@ module Licensure
     # @param licenses [Array<String>]
     # @return [Array<String>]
     def disallowed_licenses(licenses)
-      licenses.reject { |license| @configuration.allowed_licenses.include?(license) }
+      licenses.reject { |license| allowed_license?(license) }
+    end
+
+    # @param license [String]
+    # @return [Boolean]
+    def allowed_license?(license)
+      @configuration.allowed_licenses.any? do |allowed_license|
+        LicenseMatcher.match?(allowed_license, license)
+      end
     end
   end
 end

data/lib/licensure/license_fetcher.rb

@@ -193,26 +193,15 @@ module Licensure
     # @param key [String, nil]
     # @return [Array<String>]
     def canonicalize_licenses(licenses, spdx_id, name, key)
-      fingerprints = [spdx_id, name, key].filter_map { |value| license_fingerprint(value) }.uniq
+      fingerprints = [spdx_id, name, key].filter_map { |value| LicenseMatcher.fingerprint(value) }.uniq
       return licenses if fingerprints.empty?
 
       licenses.map do |license|
-        fingerprint = license_fingerprint(license)
+        fingerprint = LicenseMatcher.fingerprint(license)
         fingerprints.include?(fingerprint) ? spdx_id : license
       end.uniq
     end
 
-    # @param value [String, nil]
-    # @return [String, nil]
-    def license_fingerprint(value)
-      fingerprint = value.to_s.downcase
-                         .gsub(/\b(the|license|version)\b/, "")
-                         .gsub(/[^a-z0-9]/, "")
-      return nil if fingerprint.empty?
-
-      fingerprint
-    end
-
     # @param name [String]
     # @param version [String]
     # @param licenses [Array<String>]

data/lib/licensure/license_matcher.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Licensure
+  # Compares license labels with lightweight normalization.
+  module LicenseMatcher
+    module_function
+
+    # @param left [String]
+    # @param right [String]
+    # @return [Boolean]
+    def match?(left, right)
+      return true if left == right
+
+      left_fingerprint = fingerprint(left)
+      right_fingerprint = fingerprint(right)
+      return false unless left_fingerprint && right_fingerprint
+
+      left_fingerprint == right_fingerprint
+    end
+
+    # @param value [String, nil]
+    # @return [String, nil]
+    def fingerprint(value)
+      normalized = value.to_s.downcase
+                        .gsub(/\b(the|license|version)\b/, "")
+                        .gsub(/[^a-z0-9]/, "")
+      return nil if normalized.empty?
+
+      normalized
+    end
+  end
+end

data/lib/licensure/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Licensure
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/licensure.rb

@@ -6,6 +6,7 @@ require_relative "licensure/types"
 require_relative "licensure/configuration"
 require_relative "licensure/dependency_resolver"
 require_relative "licensure/license_fetcher"
+require_relative "licensure/license_matcher"
 require_relative "licensure/license_checker"
 require_relative "licensure/formatters/base"
 require_relative "licensure/formatters/table"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: licensure
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yudai Takada
@@ -63,6 +63,7 @@ files:
 - lib/licensure/formatters/table.rb
 - lib/licensure/license_checker.rb
 - lib/licensure/license_fetcher.rb
+- lib/licensure/license_matcher.rb
 - lib/licensure/types.rb
 - lib/licensure/version.rb
 homepage: https://github.com/ydah/licensure