licensed 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99d4424d324ded01c5f13692ae1b5a9734b9416d
-  data.tar.gz: dd71bfbd16503bdf6546b6288df73fe17553fbc3
+  metadata.gz: 877368e57ede0682327f09bcfcea106b6f34ac3a
+  data.tar.gz: 44e24e3dab3df7507ff805cd3eccc10591827586
 SHA512:
-  metadata.gz: 960f003a12c192fef141896c3e7e2e65c50c3adc4c5805f531575da15e56408c278e86abb099974c7b1f595664ad2fd16dcf44345d048be6c4f82124af035b7b
-  data.tar.gz: d7876610c8d0f856b71a10d7693cb5585500a0ee4e9543472857faeac2e3923c27cf04a17d3ad5d901ee7d105e5f6481528d195ffb9b51dc41eb6e9126da1305
+  metadata.gz: 7891002cbec39b405c48498b93be1fe6b261ef88815673f5efc2b0a0fdf9410afbfb374bc41f2bf3030e4afe3505cc2ea9002d969693c32e78960e7044d01855
+  data.tar.gz: 3f254744732b945cd9df93f1c113ca424844200c1cc5686687108af7907cc2cc5d37a719b4b94800703b0f25f52eeabd4c535c0e3b54415e60c36e5afc8db684

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 1.3.2 - 2018-08-15
+### Fixed
+- Fixed issue when multiple versions of a cabal package are found
+
 ## 1.3.1 - 2018-08-01
 ### Fixed
 - Fixed regression finding ruby gems by path
@@ -64,4 +68,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/1.3.1...HEAD
+[Unreleased]: https://github.com/github/licensed/compare/1.3.2...HEAD

data/lib/licensed/source/cabal.rb

@@ -66,7 +66,7 @@ module Licensed
 
       # Returns a `Set` of the package ids for all cabal dependencies
       def package_ids
-        recursive_dependencies(cabal_file_dependencies)
+        recursive_dependencies(cabal_file_dependency_ids)
       end
 
       # Recursively finds the dependencies for each cabal package.
@@ -151,29 +151,35 @@ module Licensed
       end
 
       # Returns a set containing the top-level dependencies found in cabal files
+      def cabal_file_dependency_ids
+        cabal_file_dependencies.map { |target| cabal_package_id(target) }.compact
+      end
+
       def cabal_file_dependencies
-        cabal_files.each_with_object(Set.new) do |cabal_file, packages|
+        @cabal_file_dependencies ||= cabal_files.each_with_object(Set.new) do |cabal_file, targets|
           content = File.read(cabal_file)
           next if content.nil? || content.empty?
 
           # add any dependencies for matched targets from the cabal file.
           # by default this will find executable and library dependencies
           content.scan(cabal_file_regex).each do |match|
-            # match[1] is a string of "," separated dependencies
-            dependencies = match[1].split(",").map(&:strip)
-            dependencies.each do |dep|
-              # the dependency might have a version specifier.
-              # remove it so we can get the full id specifier for each package
-              id = cabal_package_id(dep.split(/\s/)[0])
-              packages.add(id) if id
-            end
+            # match[1] is a string of "," separated dependencies.
+            # dependency packages might have a version specifier, remove them
+            # to get the full id specifier for each package
+            dependencies = match[1].split(",").map { |dep| dep.strip.split(/\s/)[0] }
+            targets.merge(dependencies)
           end
         end
       end
 
       # Returns an installed package id for the package.
       def cabal_package_id(package_name)
-        field = ghc_pkg_field_command(package_name, ["id"])
+        # using the first returned id assumes that package resolvers
+        # order returned package information in the same order that it would
+        # be used during build
+        field = ghc_pkg_field_command(package_name, ["id"]).lines.first
+        return unless field
+
         id = field.split(":", 2)[1]
         id.strip if id
       end

data/lib/licensed/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Licensed
-  VERSION = "1.3.1".freeze
+  VERSION = "1.3.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensed
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: licensee