Merge pull request #24 from JamalZeynalov/update_cmd_tool

Update commandline tool to v. 1.5.0
JamalZeynalov · Jul 27, 2023 · 63fffaa · 63fffaa
2 parents d46db1d + adad440
commit 63fffaa
Show file tree

Hide file tree

Showing 25 changed files with 175 additions and 114 deletions.
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="swagger-coverage",
-    version="3.1.0",
+    version="3.2.0",
     author="Jamal Zeinalov",
     author_email="[email protected]",
     description='Python adapter for "swagger-coverage" tool',

diff --git a/swagger_coverage_py/swagger-coverage-commandline/bin/swagger-coverage-commandline b/swagger_coverage_py/swagger-coverage-commandline/bin/swagger-coverage-commandline
diff --git a/swagger_coverage_py/swagger-coverage-commandline/bin/swagger-coverage-commandline.bat b/swagger_coverage_py/swagger-coverage-commandline/bin/swagger-coverage-commandline.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  swagger-coverage-commandline startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%..
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -67,21 +68,23 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\swagger-coverage-commandline-1.0-SNAPSHOT.jar;%APP_HOME%\lib\swagger-coverage-commons-1.0-SNAPSHOT.jar;%APP_HOME%\lib\swagger-parser-2.0.25.jar;%APP_HOME%\lib\logback-classic-1.2.10.jar;%APP_HOME%\lib\swagger-parser-v2-converter-2.0.25.jar;%APP_HOME%\lib\swagger-compat-spec-parser-1.0.54.jar;%APP_HOME%\lib\swagger-parser-1.0.54.jar;%APP_HOME%\lib\swagger-core-1.6.2.jar;%APP_HOME%\lib\swagger-models-1.6.2.jar;%APP_HOME%\lib\swagger-parser-v3-2.0.25.jar;%APP_HOME%\lib\swagger-core-2.1.10.jar;%APP_HOME%\lib\slf4j-ext-1.7.28.jar;%APP_HOME%\lib\slf4j-api-1.7.32.jar;%APP_HOME%\lib\jcommander-1.81.jar;%APP_HOME%\lib\spring-web-5.3.7.jar;%APP_HOME%\lib\freemarker-2.3.31.jar;%APP_HOME%\lib\swagger-parser-core-2.0.25.jar;%APP_HOME%\lib\swagger-models-2.1.10.jar;%APP_HOME%\lib\jackson-datatype-jsr310-2.9.8.jar;%APP_HOME%\lib\jackson-annotations-2.12.3.jar;%APP_HOME%\lib\jackson-dataformat-yaml-2.12.3.jar;%APP_HOME%\lib\json-patch-1.13.jar;%APP_HOME%\lib\json-schema-validator-2.2.14.jar;%APP_HOME%\lib\json-schema-core-1.2.14.jar;%APP_HOME%\lib\jackson-coreutils-equivalence-1.0.jar;%APP_HOME%\lib\jackson-coreutils-2.0.jar;%APP_HOME%\lib\jackson-databind-2.12.3.jar;%APP_HOME%\lib\jackson-core-2.12.3.jar;%APP_HOME%\lib\commons-io-2.6.jar;%APP_HOME%\lib\logback-core-1.2.10.jar;%APP_HOME%\lib\spring-beans-5.3.7.jar;%APP_HOME%\lib\spring-core-5.3.7.jar;%APP_HOME%\lib\swagger-annotations-1.6.2.jar;%APP_HOME%\lib\jakarta.xml.bind-api-2.3.2.jar;%APP_HOME%\lib\commons-lang3-3.7.jar;%APP_HOME%\lib\swagger-annotations-2.1.10.jar;%APP_HOME%\lib\jakarta.validation-api-2.0.2.jar;%APP_HOME%\lib\snakeyaml-1.27.jar;%APP_HOME%\lib\spring-jcl-5.3.7.jar;%APP_HOME%\lib\jakarta.activation-api-1.2.1.jar;%APP_HOME%\lib\uri-template-0.10.jar;%APP_HOME%\lib\guava-28.2-android.jar;%APP_HOME%\lib\validation-api-1.1.0.Final.jar;%APP_HOME%\lib\httpclient-4.5.2.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\msg-simple-1.2.jar;%APP_HOME%\lib\btf-1.3.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\checker-compat-qual-2.5.5.jar;%APP_HOME%\lib\error_prone_annotations-2.3.4.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\mailapi-1.6.2.jar;%APP_HOME%\lib\joda-time-2.10.5.jar;%APP_HOME%\lib\libphonenumber-8.11.1.jar;%APP_HOME%\lib\jopt-simple-5.0.4.jar;%APP_HOME%\lib\httpcore-4.4.4.jar;%APP_HOME%\lib\commons-logging-1.2.jar;%APP_HOME%\lib\commons-codec-1.9.jar;%APP_HOME%\lib\rhino-1.7.7.2.jar
+set CLASSPATH=%APP_HOME%\lib\swagger-coverage-commandline-1.0-SNAPSHOT.jar;%APP_HOME%\lib\swagger-coverage-commons-1.0-SNAPSHOT.jar;%APP_HOME%\lib\swagger-parser-2.0.32.jar;%APP_HOME%\lib\logback-classic-1.2.10.jar;%APP_HOME%\lib\swagger-parser-v2-converter-2.0.32.jar;%APP_HOME%\lib\swagger-compat-spec-parser-1.0.59.jar;%APP_HOME%\lib\swagger-parser-1.0.59.jar;%APP_HOME%\lib\swagger-core-1.6.6.jar;%APP_HOME%\lib\swagger-models-1.6.6.jar;%APP_HOME%\lib\swagger-parser-v3-2.0.32.jar;%APP_HOME%\lib\swagger-core-2.2.0.jar;%APP_HOME%\lib\slf4j-api-1.7.32.jar;%APP_HOME%\lib\jcommander-1.81.jar;%APP_HOME%\lib\spring-web-5.3.7.jar;%APP_HOME%\lib\freemarker-2.3.31.jar;%APP_HOME%\lib\swagger-parser-core-2.0.32.jar;%APP_HOME%\lib\swagger-models-2.2.0.jar;%APP_HOME%\lib\jackson-datatype-jsr310-2.9.8.jar;%APP_HOME%\lib\jackson-annotations-2.12.3.jar;%APP_HOME%\lib\jackson-dataformat-yaml-2.12.3.jar;%APP_HOME%\lib\json-patch-1.13.jar;%APP_HOME%\lib\json-schema-validator-2.2.14.jar;%APP_HOME%\lib\json-schema-core-1.2.14.jar;%APP_HOME%\lib\jackson-coreutils-equivalence-1.0.jar;%APP_HOME%\lib\jackson-coreutils-2.0.jar;%APP_HOME%\lib\jackson-databind-2.12.3.jar;%APP_HOME%\lib\jackson-core-2.12.3.jar;%APP_HOME%\lib\commons-io-2.11.0.jar;%APP_HOME%\lib\logback-core-1.2.10.jar;%APP_HOME%\lib\spring-beans-5.3.7.jar;%APP_HOME%\lib\spring-core-5.3.7.jar;%APP_HOME%\lib\swagger-annotations-1.6.6.jar;%APP_HOME%\lib\jakarta.xml.bind-api-2.3.2.jar;%APP_HOME%\lib\commons-lang3-3.12.0.jar;%APP_HOME%\lib\swagger-annotations-2.2.0.jar;%APP_HOME%\lib\jakarta.validation-api-2.0.2.jar;%APP_HOME%\lib\snakeyaml-1.27.jar;%APP_HOME%\lib\spring-jcl-5.3.7.jar;%APP_HOME%\lib\jakarta.activation-api-1.2.1.jar;%APP_HOME%\lib\uri-template-0.10.jar;%APP_HOME%\lib\guava-31.0.1-android.jar;%APP_HOME%\lib\validation-api-1.1.0.Final.jar;%APP_HOME%\lib\httpclient-4.5.13.jar;%APP_HOME%\lib\failureaccess-1.0.1.jar;%APP_HOME%\lib\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar;%APP_HOME%\lib\msg-simple-1.2.jar;%APP_HOME%\lib\btf-1.3.jar;%APP_HOME%\lib\jsr305-3.0.2.jar;%APP_HOME%\lib\checker-qual-3.12.0.jar;%APP_HOME%\lib\checker-compat-qual-2.5.5.jar;%APP_HOME%\lib\error_prone_annotations-2.7.1.jar;%APP_HOME%\lib\j2objc-annotations-1.3.jar;%APP_HOME%\lib\mailapi-1.6.2.jar;%APP_HOME%\lib\joda-time-2.10.5.jar;%APP_HOME%\lib\libphonenumber-8.11.1.jar;%APP_HOME%\lib\jopt-simple-5.0.4.jar;%APP_HOME%\lib\httpcore-4.4.13.jar;%APP_HOME%\lib\commons-logging-1.2.jar;%APP_HOME%\lib\commons-codec-1.11.jar;%APP_HOME%\lib\rhino-1.7.7.2.jar
 
 
 @rem Execute swagger-coverage-commandline
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %SWAGGER_COVERAGE_COMMANDLINE_OPTS%  -classpath "%CLASSPATH%" com.github.viclovsky.swagger.coverage.CommandLine %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable SWAGGER_COVERAGE_COMMANDLINE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%SWAGGER_COVERAGE_COMMANDLINE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%SWAGGER_COVERAGE_COMMANDLINE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/checker-qual-3.12.0.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/checker-qual-3.12.0.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/commons-codec-1.11.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/commons-codec-1.11.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/commons-io-2.11.0.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/commons-io-2.11.0.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/commons-lang3-3.12.0.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/commons-lang3-3.12.0.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/error_prone_annotations-2.7.1.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/error_prone_annotations-2.7.1.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/guava-31.0.1-android.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/guava-31.0.1-android.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/httpclient-4.5.13.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/httpclient-4.5.13.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/httpcore-4.4.13.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/httpcore-4.4.13.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-annotations-1.6.6.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-annotations-1.6.6.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-annotations-2.2.0.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-annotations-2.2.0.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-compat-spec-parser-1.0.59.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-compat-spec-parser-1.0.59.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-core-1.6.6.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-core-1.6.6.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-core-2.2.0.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-core-2.2.0.jar
diff --git a/...overage_py/swagger-coverage-commandline/lib/swagger-coverage-commandline-1.0-SNAPSHOT.jar b/...overage_py/swagger-coverage-commandline/lib/swagger-coverage-commandline-1.0-SNAPSHOT.jar
diff --git a/...er_coverage_py/swagger-coverage-commandline/lib/swagger-coverage-commons-1.0-SNAPSHOT.jar b/...er_coverage_py/swagger-coverage-commandline/lib/swagger-coverage-commons-1.0-SNAPSHOT.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-models-1.6.6.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-models-1.6.6.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-models-2.2.0.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-models-2.2.0.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-1.0.59.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-1.0.59.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-2.0.32.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-2.0.32.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-core-2.0.32.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-core-2.0.32.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-v2-converter-2.0.32.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-v2-converter-2.0.32.jar
diff --git a/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-v3-2.0.32.jar b/swagger_coverage_py/swagger-coverage-commandline/lib/swagger-parser-v3-2.0.32.jar