licensed 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed29bbc7c7c643bf2eda9aacca1d64bd5ccb6e9211e4eeda006c33ec1fe3900
-  data.tar.gz: eeefafd3638220b419d57353947ab74a17bc5504fca50562a2d63baf0562e485
+  metadata.gz: 1e2043fe7541ca6458302eab4e81fabdc22d874d5e80498eaac0f1551d7796e8
+  data.tar.gz: abe1b03af0e02be363661d357e82cac6b53a127a6fd01cfef2c7ba2b6c174116
 SHA512:
-  metadata.gz: 9d54389571ce81aadee0c3a46871f38c8c87768d86abd8c1ef50978378d23d4a17524c4188de8f306f4156a2b0ae670a5e437279aa458113b89e311919296332
-  data.tar.gz: 3a93838012493a51fd430815d42fa7b3b52ba85ea2513a879517a437e00af05d47f7325cfdeac2440adf299f05af0b0fbf2b0a16bb4b34caa81db4becc632808
+  metadata.gz: 8555b427c46ab7e0198cf4ac71ed02fae65a230576057bd6d2cbf38e5d26491479444cfc4ed6ec78549e615c5b8cf6d71ce762b31552bf7bfd1d348e228b1055
+  data.tar.gz: 30da66cc1abb37677768dab09d79f93c17df25a7d0a73e06dbfdcb51ce7bb3ea66af5962e97631a019a8119498f4b0ebdeaca46667cb8b2b3d3fe0a2bb63c254

data/.github/workflows/test.yml

@@ -5,6 +5,7 @@ on: pull_request
 jobs:
   bower:
     runs-on: ubuntu-latest
+    needs: core
     steps:
     - uses: actions/checkout@v2
     - name: Setup node
@@ -34,6 +35,7 @@ jobs:
 
   bundler:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         bundler: [ '~> 1.17.0', '~> 2.0.0', '~> 2.1.0', '~> 2.2.0' ]
@@ -64,6 +66,7 @@ jobs:
 
   cabal:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         ghc: [ '8.6', '8.8', '8.10', '9.0' ]
@@ -105,6 +108,7 @@ jobs:
 
   composer:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         php: [ '7.4', '8.0' ]
@@ -163,6 +167,7 @@ jobs:
 
   dep:
     runs-on: ubuntu-latest
+    needs: core
     steps:
     - uses: actions/checkout@v2
     - name: Setup go
@@ -190,6 +195,7 @@ jobs:
 
   go:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         go: [ '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x' ]
@@ -231,6 +237,7 @@ jobs:
 
   gradle:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         # TODO: the reporting plugin used to gather data is not yet fully compatible with
@@ -275,6 +282,7 @@ jobs:
 
   manifest:
     runs-on: ubuntu-latest
+    needs: core
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -296,6 +304,7 @@ jobs:
 
   mix:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         otp: [22.x, 23.x, 24.x]
@@ -327,6 +336,7 @@ jobs:
 
   npm:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         node_version: [ 12, 14, 16 ]
@@ -357,6 +367,7 @@ jobs:
 
   nuget:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         dotnet: [ '3.1.x', '5.x' ]
@@ -387,6 +398,7 @@ jobs:
 
   pip:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         python: [ '3.6', '3.7', '3.8', '3.9' ]
@@ -427,6 +439,7 @@ jobs:
 
   pipenv:
     runs-on: ubuntu-latest
+    needs: core
     steps:
     - uses: actions/checkout@v2
     - name: Setup python
@@ -457,6 +470,7 @@ jobs:
 
   swift:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         swift: [ "5.4", "5.3" ]
@@ -494,6 +508,7 @@ jobs:
 
   yarn:
     runs-on: ubuntu-latest
+    needs: core
     strategy:
       matrix:
         # not using 1.0.0 because it doesn't support `yarn list --production`
@@ -525,4 +540,4 @@ jobs:
     - name: Set up fixtures
       run: script/source-setup/yarn
     - name: Run tests
-      run: script/test yarn
+      run: script/test yarn

data/CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 3.2.3
+
+2021-09-14
+
+### Fixed
+
+- Bundler source will no longer infinitely recurse when enumerating specifications (https://github.com/github/licensed/pull/402)
+- Using the `--sources` command line option will no longer delete skipped sources' cached files (https://github.com/github/licensed/pull/401)
+
 ## 3.2.2
 
 2021-09-09
@@ -488,4 +497,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.2.2...HEAD
+[Unreleased]: https://github.com/github/licensed/compare/3.2.3...HEAD

data/lib/licensed/commands/cache.rb

@@ -39,11 +39,13 @@ module Licensed
       #
       # Returns whether the command succeeded for the dependency source enumerator
       def run_source(app, source, report)
+        result = super
+
         # add the full cache path to the list of cache paths
         # that should be cleaned up after the command run
-        cache_paths << app.cache_path.join(source.class.type)
+        cache_paths << app.cache_path.join(source.class.type) unless result == :skipped
 
-        super
+        result
       end
 
       # Cache dependency record data.

data/lib/licensed/commands/command.rb

@@ -121,13 +121,16 @@ module Licensed
       # source - A dependency source enumerator
       # report - A report object for this source
       #
-      # Returns whether the command succeeded for the dependency source enumerator
+      # Returns whether the command succeeded, failed, or was skipped for the dependency source enumerator
       def run_source(app, source, report)
         reporter.begin_report_source(source, report)
 
         if !sources_overrides.empty? && !sources_overrides.include?(source.class.type)
           report.warnings << "skipped source"
-          return true
+
+          # return a symbol to speficy the source was skipped.
+          # This is truthy and will result in the source being considered successful
+          return :skipped
         end
 
         dependencies = source.dependencies.sort_by { |dependency| dependency.name }

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

@@ -38,17 +38,20 @@ module Licensed
         "could not find #{name} (#{version}) in any sources"
       end
     end
+
+    module LazySpecification
+      def __materialize__
+        spec = super
+        return spec if spec
+
+        Licensed::Bundler::MissingSpecification.new(name: name, version: version, platform: platform, source: source)
+      end
+    end
   end
 end
 
 module Bundler
   class LazySpecification
-    alias_method :orig_materialize, :__materialize__
-    def __materialize__
-      spec = orig_materialize
-      return spec if spec
-
-      Licensed::Bundler::MissingSpecification.new(name: name, version: version, platform: platform, source: source)
-    end
+    prepend ::Licensed::Bundler::LazySpecification
   end
 end

data/lib/licensed/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: licensed
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: licensee