Skip to content
Snippets Groups Projects
Commit ae6f82c5 authored by Christian Wulf's avatar Christian Wulf
Browse files

added readme, 

added file exists check for working dir,
added constants for paths
parent e166fb20
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
readme.txt 0 → 100644
+ 2
− 0
View file @ ae6f82c5
[Prerequisites]
- GIT_HOME\cmd (not GIT_HOME\bin) must be in PATH
\ No newline at end of file
resources/FM.xml
+ 10
− 10
View file @ ae6f82c5
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<repositoryBundle>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit</repositoryDirName>
<url>git@10.20.90.10:cockpit.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-common</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-common</repositoryDirName>
<url>git@10.20.90.10:cockpit-common.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-dashboard</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-dashboard</repositoryDirName>
<url>git@10.20.90.10:cockpit-dashboard.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-gis</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-gis</repositoryDirName>
<url>git@10.20.90.10:cockpit-gis.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-historization</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-historization</repositoryDirName>
<url>git@10.20.90.10:cockpit-historization.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-digital-pen</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-digital-pen</repositoryDirName>
<url>git@10.20.90.10:cockpit-digital-pen.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-tbm</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-tbm</repositoryDirName>
<url>git@10.20.90.10:cockpit-tbm.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-housing-industry-datamodel</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-housing-industry-datamodel</repositoryDirName>
<url>git@10.20.90.10:cockpit-housing-industry-datamodel.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-blue-folder</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-blue-folder</repositoryDirName>
<url>git@10.20.90.10:cockpit-blue-folder.git</url>
</repositories>
<repositories>
<repositoryDirName>C:\Users\wulf/workspace-esn/cockpit-plugins/cockpit-all-jobs</repositoryDirName>
<repositoryDirName>C:\Users\Nogge/workspace-esn/cockpit-plugins/cockpit-all-jobs</repositoryDirName>
<url>git@10.20.90.10:cockpit-all-jobs.git</url>
</repositories>
</repositoryBundle>
src/git/cmd/CommandLineGitProvider.java
+ 10
− 9
View file @ ae6f82c5
......@@ -9,7 +9,7 @@ import java.nio.file.Paths;
public class CommandLineGitProvider implements GitProvider {
private static final String GIT_CMD = "git.cmd";
public static final String GIT_CMD = "git.cmd";
private static final String PUSH_CMD = "push";
private static final String PULL_CMD = "pull";
private static final String COMMIT_CMD = "commit";
......@@ -31,6 +31,7 @@ public class CommandLineGitProvider implements GitProvider {
}
private void execSynchronously(final String[] cmdArray, final File workingDir) {
if (!workingDir.exists()) throw new IllegalStateException("File not found: " + workingDir);
logger.logWorkingDir(workingDir.getAbsolutePath());
logger.logNativeCommand(cmdArray);
try {
......
src/git/util/Paths.java 0 → 100644
+ 10
− 0
View file @ ae6f82c5
package git.util;
public final class Paths {
public static final String USER_HOME = System.getProperty("user.home");
private Paths() {
// utility class
}
}
test/git/cmd/CommandLineGitProviderTest.java
+ 17
− 4
View file @ ae6f82c5
package git.cmd;
import git.util.Paths;
import org.junit.Test;
public class CommandLineGitProviderTest {
private static final String GITLIB_DIR_NAME = Paths.USER_HOME + "/workspace-test/gitlib";
private static final String GITLIB_GIT_URL = "gitlab@build.se.informatik.uni-kiel.de:chw/gitlib.git";
@Test
public void testClone() throws Exception {
GitLogger logger = new EmptyGitLogger();
CommandLineGitProvider gitProvider = new CommandLineGitProvider(logger);
gitProvider.setRepositoryDirName(GITLIB_DIR_NAME);
gitProvider.cloneRepository(GITLIB_GIT_URL);
}
@Test
public void testStatus() throws Exception {
GitLogger logger = new EmptyGitLogger() {
......@@ -13,7 +26,7 @@ public class CommandLineGitProviderTest {
}
};
CommandLineGitProvider gitProvider = new CommandLineGitProvider(logger);
gitProvider.setRepositoryDirName("C:/Users/wulf/workspace/cockpit");
gitProvider.setRepositoryDirName(GITLIB_DIR_NAME);
gitProvider.status();
}
......@@ -21,7 +34,7 @@ public class CommandLineGitProviderTest {
public void testPull() throws Exception {
GitLogger logger = new EmptyGitLogger();
CommandLineGitProvider gitProvider = new CommandLineGitProvider(logger);
gitProvider.setRepositoryDirName("C:/Users/wulf/workspace/cockpit");
gitProvider.setRepositoryDirName(GITLIB_DIR_NAME);
gitProvider.pull();
}
......@@ -29,7 +42,7 @@ public class CommandLineGitProviderTest {
public void testPush() throws Exception {
GitLogger logger = new EmptyGitLogger();
CommandLineGitProvider gitProvider = new CommandLineGitProvider(logger);
gitProvider.setRepositoryDirName("C:/Users/wulf/workspace/cockpit");
gitProvider.setRepositoryDirName(GITLIB_DIR_NAME);
gitProvider.push();
}
......
test/git/repository/RepositoryTest.java
+ 11
− 10
View file @ ae6f82c5
package git.repository;
import git.repository.bundle.RepositoryBundle;
import git.util.Paths;
import java.io.File;
......@@ -19,69 +20,69 @@ public class RepositoryTest {
repositoryName = "cockpit";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/" + repositoryName);
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/" + repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-common";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-dashboard";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-gis";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-historization";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-digital-pen";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-tbm";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-housing-industry-datamodel";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-blue-folder";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
repositoryName = "cockpit-all-jobs";
repository = new Repository();
repository.setRepositoryDirName(System.getProperty("user.home") + "/workspace-esn/cockpit-plugins/"
repository.setRepositoryDirName(Paths.USER_HOME + "/workspace-esn/cockpit-plugins/"
+ repositoryName);
repository.setUrl("git@10.20.90.10:" + repositoryName + ".git");
bundle.getRepositories().add(repository);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment