Revert "Scan npm package.json files directly from the source directory"

This reverts commit 74f5043.

Author: JohT

scripts/copyPackageJsonFiles.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+# Copies all package.json files inside the source directory into the artifacts/npm-package-json directory.
+# It retains the original folder structure where the package.json files were in.
+
+# This script "jq" ( https://stedolan.github.io/jq ).
+
+# Fail on any error ("-e" = exit on first error, "-o pipefail" exist on errors within piped commands)
+set -o errexit -o pipefail
+
+# Overrideable Defaults
+ARTIFACTS_DIRECTORY=${ARTIFACTS_DIRECTORY:-"artifacts"}
+SOURCE_DIRECTORY=${SOURCE_DIRECTORY:-"source"}
+NPM_PACKAGE_JSON_ARTIFACTS_DIRECTORY=${NPM_PACKAGE_JSON_ARTIFACTS_DIRECTORY:-"npm-package-json"} # Subdirectory of "artifacts" containing the npm package.json files to scan
+
+# Check if the repository is actually a git repository
+if [ ! -d "${SOURCE_DIRECTORY}" ]; then
+  echo "copyPackageJsonFiles: No ${SOURCE_DIRECTORY} directory. Skipping copy of package.json files."
+  return 0
+fi
+
+(
+    cd "./${SOURCE_DIRECTORY}"
+    
+    echo "copyPackageJsonFiles: Existing package.json files will be copied from from ${SOURCE_DIRECTORY} to ../${ARTIFACTS_DIRECTORY}/${NPM_PACKAGE_JSON_ARTIFACTS_DIRECTORY}"
+    echo "copyPackageJsonFiles: Author will be removed as workaround for https://github.com/jqassistant-plugin/jqassistant-npm-plugin/issues/5"
+    
+    for file in $( find . -type d -name node_modules -prune -o -name 'package.json' -print0 | xargs -0 -r -I {}); do
+        fileDirectory=$(dirname "${file}")
+        targetDirectory="../${ARTIFACTS_DIRECTORY}/${NPM_PACKAGE_JSON_ARTIFACTS_DIRECTORY}/${fileDirectory}"
+        # echo "copyPackageJsonFiles: Copying ${file} to ${targetDirectory}"
+
+        mkdir -p "${targetDirectory}"
+        cp -rf "${file}" "${targetDirectory}"
+
+        # Workaround until the following issue is resolved:
+        # https://github.com/jqassistant-plugin/jqassistant-npm-plugin/issues/5
+        fileName=$(basename "${file}")
+        jq 'del(.author)' "${targetDirectory}/${fileName}" > "${targetDirectory}/${fileName}.edited"
+        jq 'del(.contributors)' "${targetDirectory}/${fileName}.edited" > "${targetDirectory}/${fileName}"
+        rm -f "${targetDirectory}/${fileName}.edited"
+    done
+)

scripts/findPathsToScan.sh

@@ -36,10 +36,12 @@ if [ -d "${SOURCE_DIRECTORY}" ] ; then
     fi
 
     # Scan package.json files for npm (nodes package manager) in the source directory
-    npmPackageJsonFiles="$(find "${SOURCE_DIRECTORY}" -type d -name node_modules -prune -o -name 'package.json' -print0 | xargs -0 -r -I {} | tr '\n' ',' | sed 's/,$/\n/')"
-    if [ -n "${npmPackageJsonFiles}" ]; then
-        directoriesAndFilesToScan="$(appendNonEmpty "${directoriesAndFilesToScan}")${npmPackageJsonFiles}"
-    fi
+    # # TODO The following lines can be reactivated when the following issue is resolved:
+    # https://github.com/jqassistant-plugin/jqassistant-npm-plugin/issues/5
+    #npmPackageJsonFiles="$(find "${SOURCE_DIRECTORY}" -type d -name node_modules -prune -o -name 'package.json' -print0 | xargs -0 -r -I {} | tr '\n' ',' | sed 's/,$/\n/')"
+    #if [ -n "${npmPackageJsonFiles}" ]; then
+    #    directoriesAndFilesToScan="$(appendNonEmpty "${directoriesAndFilesToScan}")${npmPackageJsonFiles}"
+    #fi
 
     # Scan git repositories in the artifacts directory
     if [ "${IMPORT_GIT_LOG_DATA_IF_SOURCE_IS_PRESENT}" = "" ] || [ "${IMPORT_GIT_LOG_DATA_IF_SOURCE_IS_PRESENT}" = "plugin" ] ; then

scripts/resetAndScanChanged.sh

@@ -4,7 +4,7 @@
 
 # Note: "resetAndScan" expects jQAssistant to be installed in the "tools" directory.
 
-# Requires resetAndScan.sh, detectChangedArtifacts.sh, findPathsToScan.sh
+# Requires resetAndScan.sh, copyPackageJsonFiles.sh, detectChangedArtifacts.sh, findPathsToScan.sh
 
 # Fail on any error ("-e" = exit on first error, "-o pipefail" exist on errors within piped commands)
 set -o errexit -o pipefail
@@ -18,6 +18,11 @@ echo "resetAndScanChanged SCRIPTS_DIR=${SCRIPTS_DIR}"
 
 filesAndDirectoriesToScan=$( source "${SCRIPTS_DIR}/findPathsToScan.sh" )
 
+# Prepare scan
+# TODO "copyPackageJsonFiles.sh" can be deleted here when the following issue is resolved:
+# https://github.com/jqassistant-plugin/jqassistant-npm-plugin/issues/5
+source "${SCRIPTS_DIR}/copyPackageJsonFiles.sh"
+
 # Scan and analyze Artifacts when they were changed
 changeDetectionReturnCode=$( source "${SCRIPTS_DIR}/detectChangedArtifacts.sh" --readonly --paths "${filesAndDirectoriesToScan}")
 if [[ "${changeDetectionReturnCode}" == "0" ]] ; then