tests done, gradle binaries added

Author: Denis

.gitignore

@@ -12,7 +12,6 @@
 hs_err_pid*
 /.gradle/
 /.settings
-/gradle
 /.classpath
 /.project
 /build/

build.gradle

@@ -16,18 +16,20 @@ repositories {
 }
 
 defaultTasks 'build';
-
-dependencies {
-	compile 'com.github.ProjectKaiser:pk-vcs-api:master-SNAPSHOT'
+                                                                                  
+dependencies {                                                            
+    compile 'com.github.ProjectKaiser:pk-vcs-api:master-SNAPSHOT'
     compile 'commons-logging:commons-logging:1.2'
     compile 'org.eclipse.jgit:org.eclipse.jgit:4.3.0.201604071810-r'
 
     testCompile 'org.kohsuke:github-api:1.75'
     testCompile 'org.mockito:mockito-core:2.0.62-beta'
     testCompile 'junit:junit:4.12'
-    
+    testCompile 'com.github.ProjectKaiser:pk-vcs-test:master-SNAPSHOT'
 }
 
+
+
 task sourcesJar(type: Jar, dependsOn: classes) {
 	classifier = 'sources'
 	from sourceSets.main.allSource

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Fri Apr 22 10:26:49 GMT+03:00 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -31,19 +31,19 @@
 import com.projectkaiser.scm.vcs.api.exceptions.EVCSException;
 import com.projectkaiser.scm.vcs.api.exceptions.EVCSFileNotFound;
 import com.projectkaiser.scm.vcs.api.workingcopy.IVCSLockedWorkingCopy;
-import com.projectkaiser.scm.vcs.api.workingcopy.IVCSRepository;
+import com.projectkaiser.scm.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 
 public class GitVCS implements IVCS {
 
 	private CredentialsProvider credentials;
 
-	IVCSRepository repo;
+	IVCSRepositoryWorkspace repo;
 
 	public CredentialsProvider getCredentials() {
 		return credentials;
 	}
 
-	public GitVCS(IVCSRepository repo) {
+	public GitVCS(IVCSRepositoryWorkspace repo) {
 		this.repo = repo;
 	}
 
@@ -77,6 +77,7 @@ public void createBranch(String srcBranchName, String newBranchName, String comm
 							.setRefSpecs(refSpec)
 							.setCredentialsProvider(credentials)
 							.call();
+					git.getRepository().close();
 				}
 			}
 		} catch (RefAlreadyExistsException e) {
@@ -119,6 +120,7 @@ public void deleteBranch(String branchName, String commitMessage) {
 							.setRemote("origin")
 							.setCredentialsProvider(credentials)
 							.call();
+					git.getRepository().close();
 				}
 			}
 		} catch (GitAPIException e) {
@@ -149,14 +151,15 @@ public Git getLocalGit(IVCSLockedWorkingCopy wc) {
 						.setURI(repo.getRepoUrl())
 						.setCredentialsProvider(credentials)
 						.setNoCheckout(true)
-						.call();
+						.call()
+						.close();
 			} catch (GitAPIException e) {
 				throw new EVCSException(e);
 			}
 
 		}
-		
-		return new Git(gitRepo);
+		Git res = new Git(gitRepo);
+		return res; 
 	}
 
 	@Override
@@ -170,7 +173,11 @@ public PKVCSMergeResult merge(String sourceBranchUrl, String destBranchUrl, Stri
 							.setCredentialsProvider(credentials)
 							.call();
 
-					checkout(destBranchUrl, git);
+					git
+							.checkout()
+							.setCreateBranch(false)
+							.setName(destBranchUrl)
+							.call(); 
 
 					MergeResult mr = git
 							.merge()
@@ -195,7 +202,7 @@ public PKVCSMergeResult merge(String sourceBranchUrl, String destBranchUrl, Stri
 									.setMode(ResetType.HARD)
 									.call();
 						} catch(Exception e) {
-							wc.setCorrupt(true);
+							wc.setCorrupted(true);
 						}
 					} else {
 						git
@@ -205,7 +212,7 @@ public PKVCSMergeResult merge(String sourceBranchUrl, String destBranchUrl, Stri
 								.setCredentialsProvider(credentials)
 								.call();
 					}
-					
+					git.getRepository().close();
 					return res;
 				}
 			}
@@ -216,14 +223,6 @@ public PKVCSMergeResult merge(String sourceBranchUrl, String destBranchUrl, Stri
 		}
 	}
 
-	private void checkout(String destBranchUrl, Git git) throws GitAPIException {
-		git
-				.checkout()
-				.setCreateBranch(false)
-				.setName(destBranchUrl)
-				.call(); 
-	}
-	
 	@Override
 	public void setCredentials(String user, String password) {
 		credentials = new UsernamePasswordCredentialsProvider(user, password);
@@ -237,7 +236,7 @@ public void setProxy(final String host, final int port, String proxyUser, String
 
 			@Override
 			public List<Proxy> select(URI uri) {
-				if (uri.toString().contains(repo.getRepoUrl())) {
+				if (uri.toString().toLowerCase().contains(repo.getRepoUrl().toLowerCase())) {
 					return Arrays.asList(new Proxy(Type.HTTP, InetSocketAddress
 		                    .createUnresolved(host, port)));
 				} else {
@@ -276,6 +275,8 @@ public String getFileContent(String branchName, String fileRelativePath, String
 						.addPath(fileRelativePath)
 						.setName(branchName)
 						.call();
+				git.getRepository().close();
+				
 				File file = new File(wc.getFolder(), fileRelativePath);
 
 				try {
@@ -330,6 +331,7 @@ public void setFileContent(String branchName, String filePath, String content, S
 							.setRemote("origin")
 							.setCredentialsProvider(credentials)
 							.call();
+					git.getRepository().close();
 				}
 			}
 		} catch (GitAPIException e) {