diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 17050f9..4768ee2 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -5,15 +5,80 @@ on: [push] jobs: eslint: - name: runner / eslint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: "20" - - run: npm i --force - - name: 'Run reviewdog' - uses: reviewdog/action-eslint@v1 - with: - reporter: github-check + name: runner / eslint + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 2 + + - uses: actions/setup-node@v2 + with: + node-version: 19 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0.0' + bundler-cache: true + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'adopt' + + - name: Cache local Maven repository + uses: actions/cache@v3 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Building gitdiff + run: | + mvn install -f gitdiff + + - name: Running gitdiff + run: java -jar gitdiff/target/gitdiff-0.1.jar > gitdiff/gitdiff.yaml + + - name: Install npm dependencies + run: npm i --force # OR: yarn + + - name: Running eslint + run: npx eslint $(git diff --name-only HEAD^ | grep -E '\.(ts|tsx)$' | xargs) --format json > eslinted.json || true + + - name: Running filter + run: ruby gitdiff/filter_diff.rb gitdiff/gitdiff.yaml eslinted.json > filtered.json + + - uses: reviewdog/action-setup@v1 + with: + reviewdog_version: latest + + - name: Running reviewdog + env: + REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: cat filtered.json | reviewdog -f=rdjsonl -reporter=github-check + # github-pr-review + + # - name: Annotate + # uses: actions/annotations + + # # - name: Adding annotations + + # - name: Install dependencies + # run: npm i --force # OR: yarn + + # - name: Install other deps + # run: npm install --force --save-dev eslint-plugin-n@latest + + # - name: Run eslint on changed files + # uses: tj-actions/eslint-changed-files@v20 + # with: + # config_path: ".eslintrc.yml" + # fail_on_error: false + # file_extensions: | + # **/*.ts + # **/*.tsx diff --git a/gitdiff/.gitignore b/gitdiff/.gitignore new file mode 100644 index 0000000..5a03bc3 --- /dev/null +++ b/gitdiff/.gitignore @@ -0,0 +1,15 @@ +Thumbs.db +.DS_Store +.gradle +build/ +target/ +out/ +.micronaut/ +.idea +*.iml +*.ipr +*.iws +.project +.settings +.classpath +.factorypath diff --git a/gitdiff/.gitlab-ci.yml b/gitdiff/.gitlab-ci.yml new file mode 100644 index 0000000..086854e --- /dev/null +++ b/gitdiff/.gitlab-ci.yml @@ -0,0 +1,34 @@ +image: eclipse-temurin:17 +variables: + MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" + MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" +build: + stage: build + script: ./mvnw $MAVEN_CLI_OPTS compile + cache: + key: "$CI_COMMIT_REF_NAME" + policy: push + paths: + - target + - .mvn +test: + stage: test + script: ./mvnw $MAVEN_CLI_OPTS verify + cache: + key: "$CI_COMMIT_REF_NAME" + policy: pull + paths: + - target + - .mvn +package: + stage: deploy + script: ./mvnw $MAVEN_CLI_OPTS package + artifacts: + paths: + - target/gitdiff-*.jar + cache: + key: "$CI_COMMIT_REF_NAME" + policy: pull + paths: + - target + - .mvn diff --git a/gitdiff/.mvn/wrapper/maven-wrapper.jar b/gitdiff/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..bf82ff0 Binary files /dev/null and b/gitdiff/.mvn/wrapper/maven-wrapper.jar differ diff --git a/gitdiff/.mvn/wrapper/maven-wrapper.properties b/gitdiff/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..6caf474 --- /dev/null +++ b/gitdiff/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/gitdiff/.vscode/settings.json b/gitdiff/.vscode/settings.json new file mode 100644 index 0000000..04cd618 --- /dev/null +++ b/gitdiff/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} diff --git a/gitdiff/README.md b/gitdiff/README.md new file mode 100644 index 0000000..87e2a18 --- /dev/null +++ b/gitdiff/README.md @@ -0,0 +1,24 @@ +## Micronaut 4.0.2 Documentation + +- [User Guide](https://docs.micronaut.io/4.0.2/guide/index.html) +- [API Reference](https://docs.micronaut.io/4.0.2/api/index.html) +- [Configuration Reference](https://docs.micronaut.io/4.0.2/guide/configurationreference.html) +- [Micronaut Guides](https://guides.micronaut.io/index.html) +--- + +- [Micronaut Maven Plugin documentation](https://micronaut-projects.github.io/micronaut-maven-plugin/latest/) +## Feature gitlab-workflow-ci documentation + +- [https://docs.gitlab.com/ee/ci/](https://docs.gitlab.com/ee/ci/) + + +## Feature serialization-jackson documentation + +- [Micronaut Serialization Jackson Core documentation](https://micronaut-projects.github.io/micronaut-serialization/latest/guide/) + + +## Feature maven-enforcer-plugin documentation + +- [https://maven.apache.org/enforcer/maven-enforcer-plugin/](https://maven.apache.org/enforcer/maven-enforcer-plugin/) + + diff --git a/gitdiff/filter_diff.rb b/gitdiff/filter_diff.rb new file mode 100644 index 0000000..40d1ac3 --- /dev/null +++ b/gitdiff/filter_diff.rb @@ -0,0 +1,50 @@ +require 'json' +require 'yaml' + + +changed_regions = YAML.load(File.read ARGV.first) + .map do |key, value| + next File.expand_path(key), value.map do _1['start'].._1['finish'] end + end.to_h + + +warnings = JSON.load(File.read ARGV.last) + + + +def map_for_reviewdog(file, warn) + { + location: { + path: file, + range: { + start: { + line: warn['line'], + column: warn['column'] + } + } + }, + code: { + value: warn['ruleId'] + }, + message: warn['message'] + } +end + +warnings.each do |warning| + + path = warning['filePath'] + + changed = changed_regions[path] + + next unless changed + + warning['messages'].each do |messages| + + line = messages['line'] + range = changed.find do _1 === line end + next unless range + + puts JSON.dump(map_for_reviewdog path, messages) + end +end + diff --git a/gitdiff/micronaut-cli.yml b/gitdiff/micronaut-cli.yml new file mode 100644 index 0000000..88b1b39 --- /dev/null +++ b/gitdiff/micronaut-cli.yml @@ -0,0 +1,6 @@ +applicationType: cli +defaultPackage: com.fulcanelly.gitdiff +testFramework: junit +sourceLanguage: java +buildTool: maven +features: [app-name, gitlab-workflow-ci, http-client-test, java, junit, logback, maven, maven-enforcer-plugin, picocli, picocli-java-application, picocli-junit, properties, readme, serialization-jackson, shade] diff --git a/gitdiff/mvnw b/gitdiff/mvnw new file mode 100755 index 0000000..8822887 --- /dev/null +++ b/gitdiff/mvnw @@ -0,0 +1,287 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.1.1 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + printf '%s' "$(cd "$basedir"; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname $0)") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $wrapperUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + QUIET="--quiet" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + elif command -v curl > /dev/null; then + QUIET="--silent" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=`cygpath --path --windows "$javaSource"` + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/gitdiff/mvnw.bat b/gitdiff/mvnw.bat new file mode 100644 index 0000000..1d7c59b --- /dev/null +++ b/gitdiff/mvnw.bat @@ -0,0 +1,187 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.1.1 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/gitdiff/pom.xml b/gitdiff/pom.xml new file mode 100644 index 0000000..13b0579 --- /dev/null +++ b/gitdiff/pom.xml @@ -0,0 +1,154 @@ + + + 4.0.0 + com.fulcanelly.gitdiff + gitdiff + 0.1 + ${packaging} + + + io.micronaut.platform + micronaut-parent + 4.0.2 + + + jar + 17 + 17 + 4.0.2 + com.fulcanelly.gitdiff.GitdiffCommand + + + + + sonatype-snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + true + + + false + + + + central + https://repo.maven.apache.org/maven2 + + + + + + + + + + org.eclipse.jgit + org.eclipse.jgit + 6.6.0.202305301015-r + + + + org.yaml + snakeyaml + 1.29 + + + + info.picocli + picocli + compile + + + io.micronaut.picocli + micronaut-picocli + compile + + + io.micronaut.serde + micronaut-serde-jackson + compile + + + ch.qos.logback + logback-classic + runtime + + + io.micronaut.test + micronaut-test-junit5 + test + + + + org.projectlombok + lombok + [1.18.20,) + provided + + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + + io.micronaut.maven + micronaut-maven-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + + org.projectlombok + lombok + 1.18.28 + + + info.picocli + picocli-codegen + ${picocli.version} + + + io.micronaut.serde + micronaut-serde-processor + ${micronaut.serialization.version} + + + io.micronaut + micronaut-inject + + + + + + -Amicronaut.processing.group=com.fulcanelly.gitdiff + -Amicronaut.processing.module=gitdiff + + + + + + + diff --git a/gitdiff/src/main/java/com/fulcanelly/gitdiff/GitdiffCommand.java b/gitdiff/src/main/java/com/fulcanelly/gitdiff/GitdiffCommand.java new file mode 100644 index 0000000..285d04a --- /dev/null +++ b/gitdiff/src/main/java/com/fulcanelly/gitdiff/GitdiffCommand.java @@ -0,0 +1,149 @@ +package com.fulcanelly.gitdiff; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Spliterator; +import java.util.Spliterators; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.diff.DiffEntry; +import org.eclipse.jgit.diff.DiffFormatter; +import org.eclipse.jgit.diff.Edit; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevTree; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.storage.file.FileRepositoryBuilder; +import org.eclipse.jgit.treewalk.AbstractTreeIterator; +import org.eclipse.jgit.treewalk.CanonicalTreeParser; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; + +import io.micronaut.configuration.picocli.PicocliRunner; +import io.micronaut.context.ApplicationContext; +import io.micronaut.context.annotation.Parameter; +import lombok.Data; +import lombok.SneakyThrows; +import picocli.CommandLine; +import picocli.CommandLine.Command; +import picocli.CommandLine.Option; +import picocli.CommandLine.Parameters; + +@Command(name = "gitdiff", description = "...", mixinStandardHelpOptions = true) +public class GitdiffCommand implements Runnable { + + @Option(names = { "-v", "--verbose" }, description = "...") + boolean verbose; + + @Option(names = { "-p", "--path" }, description = "Path to repository", defaultValue = ".") + String path = "."; + + public static void main(String[] args) { + new GitdiffCommand().run(); + ; + // PicocliRunner.run(GitdiffCommand.class, args); + } + + Repository repository; + + @Data + class EditRange { + int start, finish; + + EditRange(Edit edit) { + start = edit.getBeginB() + 1; + finish = edit.getEndB(); + } + + Map toMap() { + return Map.of( + "start", start, + "finish", finish); + } + } + + @SneakyThrows + Stream getChangedLinesFromDiffEntry(DiffEntry diffEntry) { + try (var df = new DiffFormatter(null)) { + df.setRepository(repository); + return df.toFileHeader(diffEntry).toEditList() + .stream() + .filter(edit -> edit.getType() == Edit.Type.INSERT || edit.getType() == Edit.Type.REPLACE) + .map(EditRange::new); + } + } + + public static String prettyPrintToYaml(Map data) { + DumperOptions options = new DumperOptions(); + options.setIndent(2); // Set the indentation to 2 spaces + options.setPrettyFlow(true); // Enable pretty flow style + options.setExplicitEnd(false); + Yaml yaml = new Yaml(options); + return yaml.dump(data); + } + + @SneakyThrows + public void run() { + FileRepositoryBuilder builder = new FileRepositoryBuilder(); + + Repository repository = builder// .setGitDir(new File("/Users/user/code/Circuits/.git")) + .readEnvironment() + .findGitDir() + .build(); + + this.repository = repository; + + var git = new Git(repository); + + var commit = git.log().call().iterator().next(); + + var parent = commit.getParent(0); + + var diff = git.diff() + .setNewTree(prepareTreeParser(commit.getTree())) + .setOldTree(prepareTreeParser(parent.getTree())) + .call(); + + var result = new HashMap(); + + for (var diffEntry : diff) { + var file = diffEntry.getPath(DiffEntry.Side.NEW); + + var ranges = getChangedLinesFromDiffEntry(diffEntry) + .map(EditRange::toMap) + .collect(Collectors.toList()); + + result.put(file, ranges); + } + + System.out.println(prettyPrintToYaml(result)); + + git.close(); + } + + public static Stream getStreamFromIterator(Iterator iterator) { + return StreamSupport.stream( + Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), + false); + } + + @SneakyThrows + AbstractTreeIterator prepareTreeParser(RevTree tree) { + + CanonicalTreeParser treeParser = new CanonicalTreeParser(); + try (ObjectReader reader = repository.newObjectReader()) { + treeParser.reset(reader, tree.getId()); + } + + return treeParser; + } +} diff --git a/gitdiff/src/main/resources/application.properties b/gitdiff/src/main/resources/application.properties new file mode 100644 index 0000000..8523a52 --- /dev/null +++ b/gitdiff/src/main/resources/application.properties @@ -0,0 +1,2 @@ +#Wed Aug 02 22:01:57 GMT 2023 +micronaut.application.name=gitdiff diff --git a/gitdiff/src/main/resources/logback.xml b/gitdiff/src/main/resources/logback.xml new file mode 100644 index 0000000..44b79c4 --- /dev/null +++ b/gitdiff/src/main/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/gitdiff/src/test/java/com/fulcanelly/gitdiff/GitdiffCommandTest.java b/gitdiff/src/test/java/com/fulcanelly/gitdiff/GitdiffCommandTest.java new file mode 100644 index 0000000..ea63751 --- /dev/null +++ b/gitdiff/src/test/java/com/fulcanelly/gitdiff/GitdiffCommandTest.java @@ -0,0 +1,29 @@ +package com.fulcanelly.gitdiff; + +import io.micronaut.configuration.picocli.PicocliRunner; +import io.micronaut.context.ApplicationContext; +import io.micronaut.context.env.Environment; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class GitdiffCommandTest { + + @Test + public void testWithCommandLineOption() throws Exception { + // ByteArrayOutputStream baos = new ByteArrayOutputStream(); + // System.setOut(new PrintStream(baos)); + + // try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) { + // String[] args = new String[] { "-v" }; + // PicocliRunner.run(GitdiffCommand.class, ctx, args); + + // // gitdiff + // assertTrue(baos.toString().contains("Hi!")); + + // } + } +} diff --git a/package.json b/package.json index 5828615..64586cc 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,8 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "eslint-config-standard-with-typescript": "^37.0.0", + "eslint-plugin-n": "^16.0.1", + "eslint-plugin-promise": "^6.1.1", "ramda": "^0.28.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/src/model.ts b/src/model.ts index 320de9b..bbfd6ef 100644 --- a/src/model.ts +++ b/src/model.ts @@ -184,6 +184,7 @@ export function findWires(tiles: PinCell[]): [Wire[], PinCell[]] { } export function getValueAt(cells: PinCell[], input: Input): boolean { + // olosdkkf const samePosition = cell => R.equals(cell.position, input.position) return cells.find(samePosition)?.pins[input.pinIndex].value! } @@ -192,7 +193,6 @@ function pinCellToCell(cells: PinCell[]): Cell[] { return cells.map(it => it.actual) } - export function updateCellsNToActuall(cells: PinCell[]): Cell[] { let [wires, rest] = findWires(cells) let result: PinCell[] = [] @@ -224,3 +224,8 @@ export function updateCellsNToActuall(cells: PinCell[]): Cell[] { return pinCellToCell(result) } + + +function x () { + return 1 /2 as any as StaticRangeInit; +} diff --git a/src/reducer.ts b/src/reducer.ts index 3f36788..3cfb37d 100644 --- a/src/reducer.ts +++ b/src/reducer.ts @@ -24,16 +24,17 @@ function startingCells(): Cell[] { } +function loh(a, b) { + return 11 + b +} // TODO const events = { - toggle_editing: { send(dispatch: React.Dispatch) { }, handle() { - } } }