licensed 3.7.3 → 3.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e919e2ec9a285b628baa46bf6688d7ec0c996d799abd776fde4f3edb8b80fe7d
-  data.tar.gz: 5eb688ce8bf9416b61be54ce32a721afeda344602c649de68c58e415e727da5f
+  metadata.gz: 2c460f79af039dfcd0059dafa8c1ce9ea096f5fc869c05ed374a61e9d1504520
+  data.tar.gz: 98729cb3117d5642fe1bb6b81a8b5f9781578751407f0425ea2ed0c5842ae0ac
 SHA512:
-  metadata.gz: aeee74cfa46d80c77a6a13d41106f6e7f94b9e5e440b9d75e5aea8ef5955a860da3c220bdd5214196cbab425fb29059a174ab97a20881872e0f05efc569adfaf
-  data.tar.gz: f91d94a0a7a28c5804515f5988a82c87e68257428f042d483fd436d596ce219ec35649e7b2c57cf2e52b44d2d97f6479d57df32d4c4aab40bf2cf51935dedb49
+  metadata.gz: 3f5bd011838dc17f8bb74da74b0799da181419718bf96f55ac097af2a077546bba007a1efa2ec8613bd03f345c1f82bf5b97fcad64ebb140ef06a99210ee45db
+  data.tar.gz: 79b667beb6bde2a62ec1c53c706a5379f761bc9189f2fd6caf4da10e7e2ca51216f44816fc06721c023f81446c7f1a480ca482cc6b77f53af92dcb1943a535b5

data/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 3.7.5
+
+### Fixed
+
+- Python dependency metadata will be correctly parsed from the ouput of `pip show` (https://github.com/github/licensed/pull/555)
+
+## 3.7.4
+
+### Fixed
+
+- Licenses for Python dependencies built with Hatchling are correctly found (https://github.com/github/licensed/pull/547)
+
 ## 3.7.3
 
 ### Fixed
@@ -631,4 +643,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.3...HEAD
+[Unreleased]: https://github.com/github/licensed/compare/3.7.5...HEAD

data/lib/licensed/sources/pip.rb

@@ -42,8 +42,12 @@ module Licensed
       # folder per https://peps.python.org/pep-0639/
       def package_license_location(package)
         dist_info = File.join(package["Location"], package["Name"].gsub("-", "_") +  "-" + package["Version"] + ".dist-info")
-        license_files = File.join(dist_info, "license_files")
-        return File.exist?(license_files) ? license_files : dist_info
+
+        license_path = ["license_files", "licenses"]
+          .map { |directory| File.join(dist_info, directory) }
+          .find { |path| File.exist?(path) }
+
+        license_path || dist_info
       end
 
       # Returns parsed information for all packages used by the project,
@@ -70,11 +74,13 @@ module Licensed
       # Returns a hash filled with package info parsed from the email-header formatted output
       # returned by `pip show`
       def parse_package_info(package_info)
-        package_info.lines.each_with_object(Hash.new(0)) { |pkg, a|
+        package_info.lines.each_with_object(Hash.new(0)) do |pkg, a|
+          next if pkg.start_with?(/^\s/)
+
           k, v = pkg.split(":", 2)
           next if k.nil? || k.empty?
           a[k.strip] = v&.strip
-        }
+        end
       end
 
       # Returns the output from `pip list --format=json`

data/lib/licensed/version.rb

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

data/licensed.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.8"
   spec.add_development_dependency "mocha", "~> 1.0"
-  spec.add_development_dependency "rubocop", "~> 1.26", "< 1.27"
   spec.add_development_dependency "rubocop-github", "~> 0.6"
   spec.add_development_dependency "byebug", "~> 11.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensed
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.5
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: licensee
@@ -196,26 +196,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.26'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.27'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.26'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.27'
 - !ruby/object:Gem::Dependency
   name: rubocop-github
   requirement: !ruby/object:Gem::Requirement