licensed 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0f6c78059b52e669e7febd8a0a146c7d2bc1d2ff9c7a4e962941470a13845c
-  data.tar.gz: 14c6ff763c08e1317b430704fe8ec4552373f9ab24df80838f114fdb4d1fe906
+  metadata.gz: f4589c212dd085a4f62711a077b50ec04ee1ca398a1c4b39e29644caebd4795e
+  data.tar.gz: e2366f102dec2839fa56e3050ceedcba249ecc9fb8012a2cf5074356918a20f4
 SHA512:
-  metadata.gz: 7c7af4fe377c93becf816adab3b549452dba206aaf03080f18c42f944991f3572e4822ba768c6cc0ef1f320a81b9643738313097637f6da548b5285180a89ae2
-  data.tar.gz: be4466294a92d6cdb807fb6ace47b2ff0231430b118e60c7059dbfed92379a4e827e75f9df276e916c034f8f9a7226a95ef621239f1dbd0baecb942a30427a1a
+  metadata.gz: c40137a979df559cb8b3adeaf4645c453102b96b7b177fcf391276eb0b93154e10be855325021c231ea1ebd27fca55d43d858ba77b73051a07f1f783d122eeba
+  data.tar.gz: 856405d0edbd8dc18d29705004e361a3307fb52efbea60372d17adb941f0a8ebccc977548bae136b16e3956607354b1ab8a3a646fef44344d942e44b83be23f7

data/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 4.0.2
+
+### Fixed
+
+- The path to a gradlew executable can be configured when enumerating gradle dependencies (:tada: @LouisBoudreau https://github.com/github/licensed/pull/610)
+
+## 4.0.1
+
+### Fixed
+
+- Running gradle tests will no longer fail when gradle is not available (https://github.com/github/licensed/pull/606)
+
 ## 4.0.0
 
 ### Added
@@ -677,4 +689,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/4.0.0...HEAD
+[Unreleased]: https://github.com/github/licensed/compare/4.0.2...HEAD

data/docs/sources/gradle.md

@@ -14,6 +14,7 @@ gradle:
     - runtime
     - runtimeClassPath
 ```
+
 ### Multi-build projects
 
 To run `licensed` for specific projects in a [multi-build project](https://docs.gradle.org/current/userguide/multi_project_builds.html) you must specify the [apps](../configuration/application_source.md) configuration key.
@@ -21,4 +22,13 @@ To run `licensed` for specific projects in a [multi-build project](https://docs.
 ```yml
 apps:
   - source_path: ./path/to/subproject
-```
+```
+
+### Gradlew
+
+The `gradle.gradlew` property is used to determine where the `gradlew` executable is. The default location the [configuration root](../configuration/configuration_root.md).
+
+```yml
+gradle:
+  gradlew: path/from/root/to/gradle/gradlew
+```

data/lib/licensed/sources/gradle.rb

@@ -42,7 +42,7 @@ module Licensed
       end
 
       def enabled?
-        gradle_runner.enabled? && File.exist?(config.pwd.join("build.gradle"))
+        !executable.to_s.empty? && File.exist?(config.pwd.join("build.gradle"))
       end
 
       def enumerate_dependencies
@@ -62,8 +62,18 @@ module Licensed
 
       private
 
+      def executable
+        return @executable if defined?(@executable)
+
+        @executable = begin
+          return gradlew if File.executable?(gradlew)
+
+          "gradle" if Licensed::Shell.tool_available?("gradle")
+        end
+      end
+
       def gradle_runner
-        @gradle_runner ||= Runner.new(config.pwd, configurations)
+        @gradle_runner ||= Runner.new(config.pwd, configurations, executable)
       end
 
       # Returns the configurations to include in license generation.
@@ -78,6 +88,14 @@ module Licensed
         end
       end
 
+      # Returns the path to the Gradle wrapper.
+      def gradlew
+        @gradlew ||= begin
+          gradlew = config.dig("gradle", "gradlew")
+          config.root.join(gradlew || "gradlew").to_s
+        end
+      end
+
       # Returns a key to uniquely identify a name and version in the obtained CSV content
       def csv_key(name:, version:)
         "#{name}-#{version}"
@@ -116,8 +134,9 @@ module Licensed
       # The Gradle::Runner class is a wrapper which provides
       # an interface to run gradle commands with the init script initialized
       class Runner
-        def initialize(root_path, configurations)
+        def initialize(root_path, configurations, executable)
           @root_path = root_path
+          @executable = executable
           @init_script = create_init_script(root_path, configurations)
         end
 
@@ -126,28 +145,13 @@ module Licensed
           # The configuration cache is an incubating feature that can be activated manually.
           # The gradle plugin for licenses does not support it so we prevent it to run for gradle version supporting it.
           args << "--no-configuration-cache" if gradle_version >= "6.6"
-          Licensed::Shell.execute(executable, "-q", "--init-script", @init_script.path, *args)
-        end
-
-        def enabled?
-          !executable.to_s.empty?
+          Licensed::Shell.execute(@executable, "-q", "--init-script", @init_script.path, *args)
         end
 
         private
 
         def gradle_version
-          @gradle_version ||= Licensed::Shell.execute(executable, "--version").scan(/Gradle [\d+]\.[\d+]/).last.split(" ").last
-        end
-
-        def executable
-          return @executable if defined?(@executable)
-
-          @executable = begin
-            gradlew = File.join(@root_path, "gradlew")
-            return gradlew if File.executable?(gradlew)
-
-            "gradle" if Licensed::Shell.tool_available?("gradle")
-          end
+          @gradle_version ||= Licensed::Shell.execute(@executable, "--version").scan(/Gradle [\d+]\.[\d+]/).last.split(" ").last
         end
 
         def create_init_script(path, configurations)
@@ -202,7 +206,7 @@ module Licensed
         # Prefixes the gradle command with the project name for multi-build projects.
         def format_command(command, source_path)
           Dir.chdir(source_path) do
-            path = Licensed::Shell.execute(executable, "properties", "-Dorg.gradle.logging.level=quiet").scan(/path:.*/).last.split(" ").last
+            path = Licensed::Shell.execute(@executable, "properties", "-Dorg.gradle.logging.level=quiet").scan(/path:.*/).last.split(" ").last
             path == ":" ? command : "#{path}:#{command}"
           end
         end

data/lib/licensed/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Licensed
-  VERSION = "4.0.0".freeze
+  VERSION = "4.0.2".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: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: licensee