Ignore vendor/cache directories

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 16, 2025 · 67d0633 · 67d0633
1 parent ae4c1e6
commit 67d0633
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/java-reachables-test.yml b/.github/workflows/java-reachables-test.yml
@@ -100,13 +100,15 @@ jobs:
         run: |
           echo "ATOM_RUBY_HOME: ${ATOM_RUBY_HOME}"
           echo "BUNDLE_PATH: ${BUNDLE_PATH}"
+          atom --help
+          rbastgen --help
           node $GITHUB_WORKSPACE/bin/cdxgen.js -p -t ruby --profile research -o bom.json . --lifecycle pre-build
           ls -lh
           cp bom.json *.slices.json $GITHUB_WORKSPACE/rubyresults
         env:
           CDXGEN_DEBUG_MODE: debug
           ATOM_RUBY_HOME: ${{ steps.ruby34.outputs.ruby-prefix }}
-          BUNDLE_PATH: vendor/bundle
+          CDXGEN_GEM_HOME: vendor/bundle/ruby/3.3.0
         working-directory: ./repotests/campsite/api
       - uses: actions/upload-artifact@v4
         with:

diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -5192,13 +5192,16 @@ export async function createRubyBom(path, options) {
       exclude: excludeList,
     },
   );
-  const gemHome = process.env.CDXGEN_GEM_HOME || process.env.GEM_HOME;
+  let gemHome = process.env.CDXGEN_GEM_HOME || process.env.GEM_HOME;
+  if (!gemHome && (process.env.BUNDLE_PATH || process.env.GEM_PATH)) {
+    gemHome = process.env.BUNDLE_PATH || process.env.GEM_PATH;
+  }
   let isGemHomeEmpty = true;
   // In deep mode, let's collect all gems that got installed in our custom GEM_HOME directory.
   // This would improve the accuracy of any security analysis downstream at cost of a slight increase in time.
   if (options.deep && process.env.CDXGEN_GEM_HOME) {
     const gemHomeSpecFiles = getAllFiles(
-      process.env.CDXGEN_GEM_HOME,
+      process.env.CDXGEN_GEM_HOME || process.env.BUNDLE_PATH,
       "**/specifications/**/*.gemspec",
       options,
     );

diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -6321,7 +6321,7 @@ export function collectGemModuleNames(
       }
       if (DEBUG_MODE) {
         console.log(
-          `Is ${altGemName} an alternative gem name for the package ${gemName}? Please let us know if this is the case.`,
+          `Is ${altGemName} an alternative gem name for '${gemName}' package? Please let us know if this is correct.`,
         );
       }
     }

diff --git a/types/lib/cli/index.d.ts.map b/types/lib/cli/index.d.ts.map