jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

Merge pull request #153 from firstBitMarksistskaya/develop

Browse Source 
Sync
This commit is contained in:
Nikita Fedkin
2025-01-27 18:37:45 +01:00
committed by GitHub
parent e2d587cc60 b26bdd15b4
commit 3233ada828
5 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
LICENSE.md
View File

@@ -1,25 +1,25 @@
The MIT License (MIT) The MIT License (MIT)
===================== =====================
Copyright © `2020` `First Bit Semenovskaya, Первый Бит Семеновская` Copyright © `2020` `First Bit Semenovskaya, Первый Бит Семеновская`
Permission is hereby granted, free of charge, to any person Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation obtaining a copy of this software and associated documentation
files (the “Software”), to deal in the Software without files (the “Software”), to deal in the Software without
restriction, including without limitation the rights to use, restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following Software is furnished to do so, subject to the following
conditions: conditions:
The above copyright notice and this permission notice shall be The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software. included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE. OTHER DEALINGS IN THE SOFTWARE.

5
src/ru/pulsar/jenkins/library/steps/Yaxunit.groovy
View File

@@ -86,7 +86,10 @@ class Yaxunit implements Serializable, Coverable {
FilePath pathToAllureReport = FileUtils.getFilePath("$env.WORKSPACE/$allureReport") FilePath pathToAllureReport = FileUtils.getFilePath("$env.WORKSPACE/$allureReport")
String allureReportDir = FileUtils.getLocalPath(pathToAllureReport.getParent()) String allureReportDir = FileUtils.getLocalPath(pathToAllureReport.getParent())
pathToJUnitReport.copyTo(pathToAllureReport) String pathToJUnitReportString = pathToJUnitReport.getRemote()
if (steps.fileExists(pathToJUnitReportString)) {
pathToJUnitReport.copyTo(pathToAllureReport)
}
steps.stash(YAXUNIT_ALLURE_STASH, "$allureReportDir/**", true) steps.stash(YAXUNIT_ALLURE_STASH, "$allureReportDir/**", true)
} }

19
src/ru/pulsar/jenkins/library/utils/FileUtils.groovy
View File

@@ -29,17 +29,20 @@ class FileUtils {
static String getLocalPath(FilePath filePath) { static String getLocalPath(FilePath filePath) {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor() IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
String workspacePath = steps.env().WORKSPACE
String fileRemotePath = filePath.getRemote()
def env = steps.env(); // Нормализуем пути: заменяем обратные слэши на прямые
workspacePath = workspacePath.replace('\\', '/')
fileRemotePath = fileRemotePath.replace('\\', '/')
Path workspacePath = new File(env.WORKSPACE).toPath() // Проверяем, что файл находится внутри рабочей директории
Path rawFilePath = new File(filePath.getRemote()).toPath() if (!fileRemotePath.startsWith(workspacePath)) {
throw new IllegalArgumentException("File path is not within the workspace directory")
}
return workspacePath.relativize(rawFilePath) // Вычисляем относительный путь
.toString() return fileRemotePath.substring(workspacePath.length() + 1)
.replaceAll('\\\\\\\\', '/')
.replaceAll('\\\\', '/')
.toString()
} }
static void loadFile(String filePathFrom, def env, String filePathTo) { static void loadFile(String filePathFrom, def env, String filePathTo) {

2
test/unit/groovy/ru/pulsar/jenkins/library/utils/EnvUtils.java
View File

@@ -7,7 +7,7 @@ import java.io.IOException;
public class EnvUtils implements EnvironmentAction { public class EnvUtils implements EnvironmentAction {
public String NODE_NAME = "node"; public String NODE_NAME = "built-in";
public String WORKSPACE = "ws"; public String WORKSPACE = "ws";
public String BRANCH_NAME = "master"; public String BRANCH_NAME = "master";

32
test/unit/groovy/ru/pulsar/jenkins/library/utils/FileUtilsTest.java Normal file
View File

@@ -0,0 +1,32 @@
package ru.pulsar.jenkins.library.utils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import ru.pulsar.jenkins.library.IStepExecutor;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
class FileUtilsTest {
private final IStepExecutor steps = TestUtils.getMockedStepExecutor();
@BeforeEach
void setUp() {
TestUtils.setupMockedContext(steps);
}
@Test
void testGetLocalPath() {
// given
var env = new EnvUtils();
when(steps.env()).thenReturn(env);
var filePath = FileUtils.getFilePath(env.WORKSPACE + "/src/cf");
// when
String localPath = FileUtils.getLocalPath(filePath);
// then
assertThat(localPath).isEqualTo("src/cf");
}
}