licensed 3.7.0 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b28b00b1b23f91bc89a99928d3ae07396afe29700e06c4e22debe1e4f3b2d45
-  data.tar.gz: 5e8ccfb04df77cb4802bc51825562ec52a5f8368718e66434460b61e425a864f
+  metadata.gz: e919e2ec9a285b628baa46bf6688d7ec0c996d799abd776fde4f3edb8b80fe7d
+  data.tar.gz: 5eb688ce8bf9416b61be54ce32a721afeda344602c649de68c58e415e727da5f
 SHA512:
-  metadata.gz: 2b71b2fd45dcd9e61b425a08f0b2148ecd568ae4f3a0ffacd15213850fba8c313362783945cb3828592ef397f4d2ced750f890f6bf18447e6a32c02cbbb47795
-  data.tar.gz: aa587ef6d6e420761098ab2364aa485a36885cfdd6b09f9eec5ad838dbd108f759a91447818bc0279992b489513efad8a2381966dbbcf3f6fea3f3946069e676
+  metadata.gz: aeee74cfa46d80c77a6a13d41106f6e7f94b9e5e440b9d75e5aea8ef5955a860da3c220bdd5214196cbab425fb29059a174ab97a20881872e0f05efc569adfaf
+  data.tar.gz: f91d94a0a7a28c5804515f5988a82c87e68257428f042d483fd436d596ce219ec35649e7b2c57cf2e52b44d2d97f6479d57df32d4c4aab40bf2cf51935dedb49

data/CHANGELOG.md

@@ -6,6 +6,34 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 3.7.3
+
+### Fixed
+
+- Swift test fixtures build artifacts are now ignored (:tada: @CvX https://github.com/github/licensed/pull/524)
+- Running cargo test fixture setup no longer deletes test files (:tada: @CvX https://github.com/github/licensed/pull/525)
+- Bundler test fixtures are compatible with latest macOS silicon(:tada: @CvX https://github.com/github/licensed/pull/528)
+- Fix segfaults seen using licensed with ruby 3.0.4 (https://github.com/github/licensed/pull/530)
+- Fix compatibility with latest versions of bundler 2.3 (https://github.com/github/licensed/pull/535)
+- Fix compatibility with latest versions of bundler 2.3 (:tada: @CvX https://github.com/github/licensed/pull/522)
+
+## 3.7.2
+
+### Fixed
+
+- Comparing dependency license contents now finds matching contents regardless of the order of the licenses (https://github.com/github/licensed/pull/516)
+- Fixed typo in a link in README.md (https://github.com/github/licensed/pull/514) 
+
+### Changed
+
+- Elixir testing setup is migrated to erlef/setup-beam (https://github.com/github/licensed/pull/512)
+
+## 3.7.1
+
+### Fixed
+
+- Dependencies' legal notice file matching has been made more strict to reduce false positives on code files containing the word `legal` (https://github.com/github/licensed/pull/510)
+
 ## 3.7.0
 
 ### Changed
@@ -603,4 +631,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Initial release :tada:
 
-[Unreleased]: https://github.com/github/licensed/compare/3.7.0...HEAD
+[Unreleased]: https://github.com/github/licensed/compare/3.7.3...HEAD

data/README.md

@@ -86,7 +86,7 @@ A configuration file is required for most commands.  See the [configuration file
 
 ### Available dependency sources
 
-Licensed can enumerate dependency for many languages, package managers, and frameworks.  See the [sources documentation](./docs/sources) for the list of currently available sources.  Sources can be explicitly enabled and disabled as a [configuration option](./docs/configuration/dependency_source_enumerators.md.md).
+Licensed can enumerate dependency for many languages, package managers, and frameworks.  See the [sources documentation](./docs/sources) for the list of currently available sources.  Sources can be explicitly enabled and disabled as a [configuration option](./docs/configuration/dependency_source_enumerators.md).
 
 ## Development
 

data/lib/licensed/configuration.rb

@@ -243,15 +243,16 @@ module Licensed
 
       # try to expand the source path for glob patterns
       expanded_source_paths = source_path_array.reduce(Set.new) do |matched_paths, pattern|
-        current_matched_paths = if pattern.start_with?("!")
-          # if the pattern is an exclusion, remove all matching files
-          # from the result
-          matched_paths - Dir.glob(pattern[1..-1])
-        else
-          # if the pattern is an inclusion, add all matching files
-          # to the result
-          matched_paths + Dir.glob(pattern)
-        end
+        current_matched_paths =
+          if pattern.start_with?("!")
+            # if the pattern is an exclusion, remove all matching files
+            # from the result
+            matched_paths - Dir.glob(pattern[1..-1])
+          else
+            # if the pattern is an inclusion, add all matching files
+            # to the result
+            matched_paths + Dir.glob(pattern)
+          end
 
         current_matched_paths.select { |p| File.directory?(p) }
       end

data/lib/licensed/dependency.rb

@@ -3,7 +3,7 @@ require "licensee"
 
 module Licensed
   class Dependency < Licensee::Projects::FSProject
-    LEGAL_FILES_PATTERN = /(AUTHORS|NOTICE|LEGAL)(?:\..*)?\z/i
+    LEGAL_FILES_PATTERN = /#{File::SEPARATOR}(AUTHORS|NOTICE|LEGAL)(?:\..*)?\z/i
 
     attr_reader :name
     attr_reader :version

data/lib/licensed/dependency_record.rb

@@ -27,6 +27,14 @@ module Licensed
           "text" => text
         }
       end
+
+      def key
+        @key ||= begin
+          # rubocop:disable GitHub/InsecureHashAlgorithm
+          Digest::XXHash64.digest(sources.join("") + text)
+          # rubocop:enable GitHub/InsecureHashAlgorithm
+        end
+      end
     end
 
     include Licensee::ContentHelper
@@ -84,7 +92,7 @@ module Licensed
     # `Licensee::CotentHelper`
     def content
       return if licenses.nil? || licenses.empty?
-      licenses.map(&:text).compact.join
+      licenses.sort_by(&:key).map(&:text).compact.join
     end
 
     # Returns whether two records match based on their contents

data/lib/licensed/reporters/status_reporter.rb

@@ -19,7 +19,7 @@ module Licensed
       # app - An application configuration
       # report - A report containing information about the app evaluation
       def begin_report_app(app, report)
-          shell.info "Checking cached dependency records for #{app["name"]}"
+        shell.info "Checking cached dependency records for #{app["name"]}"
       end
 
       # Reports any errors found when checking status, as well as

data/lib/licensed/sources/bundler/missing_specification.rb

@@ -40,8 +40,15 @@ module Licensed
     end
 
     module LazySpecification
-      def __materialize__
-        spec = super
+      def materialize_for_installation(*args)
+        spec = super(*args)
+        return spec unless spec.is_a?(LazySpecification)
+
+        Licensed::Bundler::MissingSpecification.new(name: name, version: version, platform: platform, source: source)
+      end
+
+      def __materialize__(*args)
+        spec = super(*args)
         return spec if spec
 
         Licensed::Bundler::MissingSpecification.new(name: name, version: version, platform: platform, source: source)

data/lib/licensed/sources/git_submodule.rb

@@ -20,12 +20,13 @@ module Licensed
         git_submodules_command.lines.map do |line|
           displaypath, toplevel, version, homepage = line.strip.split
           name = File.basename(displaypath)
-          submodule_path = if toplevel == config.pwd.to_s
-            name
-          else
-            parent = File.basename(toplevel)
-            "#{submodule_paths[parent]}/#{name}"
-          end
+          submodule_path =
+            if toplevel == config.pwd.to_s
+              name
+            else
+              parent = File.basename(toplevel)
+              "#{submodule_paths[parent]}/#{name}"
+            end
           submodule_paths[name] = submodule_path
 
           Licensed::Dependency.new(

data/lib/licensed/sources/go.rb

@@ -36,11 +36,12 @@ module Licensed
 
       # Returns an array of dependency package import paths
       def packages
-        dependency_packages = if go_version < Gem::Version.new("1.11.0")
-          root_package_deps
-        else
-          go_list_deps
-        end
+        dependency_packages =
+          if go_version < Gem::Version.new("1.11.0")
+            root_package_deps
+          else
+            go_list_deps
+          end
 
         # don't include go std packages
         # don't include packages under the root project that aren't vendored

data/lib/licensed/sources/helpers/content_versioning.rb

@@ -27,14 +27,14 @@ module Licensed
       def version_strategy
         # default to git for backwards compatible behavior
         @version_strategy ||= begin
-           case config.fetch("version_strategy", nil)
-           when CONTENTS
-             CONTENTS
-           when GIT
-             GIT
-           else
-             Licensed::Git.available? ? GIT : CONTENTS
-           end
+          case config.fetch("version_strategy", nil)
+          when CONTENTS
+            CONTENTS
+          when GIT
+            GIT
+          else
+            Licensed::Git.available? ? GIT : CONTENTS
+          end
         end
       end
 

data/lib/licensed/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Licensed
-  VERSION = "3.7.0".freeze
+  VERSION = "3.7.3".freeze
 
   def self.previous_major_versions
     major_version = Gem::Version.new(Licensed::VERSION).segments.first

data/licensed.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-xxHash", "~> 0.4"
   spec.add_dependency "parallel", ">= 0.18.0"
   spec.add_dependency "reverse_markdown", ">= 1", "< 3"
+  spec.add_dependency "json", ">= 2.6.2"
 
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensed
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.3
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: licensee
@@ -140,6 +140,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement