Merge branch 'master' into release/2

# Conflicts:
#	README.md
#	run.groovy
#	version

Author: host6

.travis.yml

@@ -10,5 +10,5 @@ cache:
     - $HOME/.gradle/wrapper/
 after_success:
   - ./gradlew jacocoTestReport coveralls
-#after_failure:
-#  - cat build/test-results/test/*.xml
+after_failure:
+  - cat build/test-results/test/*.xml

README.md

@@ -1,6 +1,6 @@
-[![Release](https://jitpack.io/v/scm4j/scm4j-wf.svg)](https://jitpack.io/#scm4j/scm4j-wf)
-[![Build Status](https://travis-ci.org/scm4j/scm4j-wf.svg?branch=release/2)](https://travis-ci.org/scm4j/scm4j-wf)
-[![Coverage Status](https://coveralls.io/repos/github/scm4j/scm4j-wf/badge.svg?branch=release/2)](https://coveralls.io/github/scm4j/scm4j-wf?branch=release/2)
+[![Release](https://jitpack.io/v/scm4j/scm4j-releaser.svg)](https://jitpack.io/#scm4j/scm4j-releaser)
+[![Build Status](https://travis-ci.org/scm4j/scm4j-releaser.svg?branch=master)](https://travis-ci.org/scm4j/scm4j-releaser)
+[![Coverage Status](https://coveralls.io/repos/github/scm4j/scm4j-releaser/badge.svg?branch=master)](https://coveralls.io/github/scm4j/scm4j-releaser?branch=master)
 
 # Status
 
@@ -29,7 +29,7 @@ For version definitions ref. [semantic Versioning 2.0.0](http://semver.org/).
 
 # Installation
 
-Install groovy, download [run.grovy](https://raw.githubusercontent.com/scm4j/scm4j-wf/master/run.groovy) and execute `groovy run.groovy`, it will list available commands
+Install groovy, download [run.grovy](https://raw.githubusercontent.com/scm4j/scm4j-releaser/release/2/run.groovy) and execute `groovy run.groovy`, it will list available commands
 
 # Data Structure
 
@@ -43,4 +43,4 @@ Install groovy, download [run.grovy](https://raw.githubusercontent.com/scm4j/scm
 
 # See also
 
-[Historical version](https://github.com/scm4j/scm4j-wf/blob/d540cb00674d485846117dbd68df19bdad306e56/README.md)
+[Historical version](https://github.com/scm4j/scm4j-releaser/blob/d540cb00674d485846117dbd68df19bdad306e56/README.md)

build.gradle

@@ -31,8 +31,11 @@ repositories {
 }
 
 test {
-	testLogging.showStandardStreams = true
 	jvmArgs '-Xmx128m'
+ 	testLogging {
+		events "failed"
+		exceptionFormat "full"
+	}
 }
 
 dependencies {
@@ -45,8 +48,6 @@ dependencies {
 
 	testCompile 'junit:junit:4.12'
 	testCompile 'org.mockito:mockito-all:1.9.5'
-	testCompile 'org.powermock:powermock-mockito-release-full:1.6.3'
-	testCompile 'org.powermock:powermock-api-mockito:1.6.3'
 	testCompile 'nl.jqno.equalsverifier:equalsverifier:2.3'
 	testCompile 'org.hamcrest:hamcrest-all:1.3'
 

docs/branches-statuses.md

@@ -16,7 +16,7 @@ All statuses are calculated by `BranchesStatuses` class
 - `MDEPS_FROZEN`
   - All mdeps (if any) have fixed version 
 - `MDEPS_ACTUAL`
-   - For every mdeps entry tag which corresponds to mdeps.component.version exists and points to the component-repo.branches.version.commits.head-1  
+   - For every mdeps entry tag which corresponds to mdeps.component.version exists and points to the component-repo.branches.version.commits.head-1. Or no mdeps at all.
 - `ACTUAL`
   - `MDEPS_ACTUAL` (or no mdeps) and tag which corresponds to version.minor.patch-1 exists and points to head-1 (no commits after last patch but `#scm-ver`)
 

run.groovy

@@ -1,10 +1,14 @@
 @GrabResolver(name='jitpack', root='https://jitpack.io')
-@Grab('com.github.scm4j:scm4j-wf:2.0')
+@Grab('com.github.scm4j:scm4j-releaser:master-SNAPSHOT')
 
-import  org.scm4j.wf.cli.CLI;
+import org.scm4j.releaser.cli.CLI;
+import org.scm4j.releaser.exceptions.EConfig;
 
 class CLIRunner {
 	static void main(args) {
+		try {
 		CLI.main(args);
+		} catch (EConfig e) {
 	}
 }
+}

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'scm4j-wf'
+rootProject.name = 'scm4j-releaser'

src/main/java/org/scm4j/wf/LogTag.java …main/java/org/scm4j/releaser/LogTag.javasrc/main/java/org/scm4j/wf/LogTag.java renamed to src/main/java/org/scm4j/releaser/LogTag.java src/main/java/org/scm4j/wf/LogTag.java renamed to src/main/java/org/scm4j/releaser/LogTag.java

@@ -1,4 +1,4 @@
-package org.scm4j.wf;
+package org.scm4j.releaser;
 
 public class LogTag {
 	public static final String SCM_VER = "#scm-ver";

…/main/java/org/scm4j/wf/SCMWorkflow.java …java/org/scm4j/releaser/SCMReleaser.javasrc/main/java/org/scm4j/wf/SCMWorkflow.java renamed to src/main/java/org/scm4j/releaser/SCMReleaser.java src/main/java/org/scm4j/wf/SCMWorkflow.java renamed to src/main/java/org/scm4j/releaser/SCMReleaser.java

@@ -1,27 +1,28 @@
-package org.scm4j.wf;
+package org.scm4j.releaser;
 
+import org.scm4j.commons.Version;
+import org.scm4j.releaser.actions.ActionKind;
+import org.scm4j.releaser.actions.ActionNone;
+import org.scm4j.releaser.actions.IAction;
+import org.scm4j.releaser.branch.DevelopBranch;
+import org.scm4j.releaser.branch.DevelopBranchStatus;
+import org.scm4j.releaser.branch.ReleaseBranch;
+import org.scm4j.releaser.branch.ReleaseBranchStatus;
+import org.scm4j.releaser.conf.*;
+import org.scm4j.releaser.exceptions.EComponentConfig;
+import org.scm4j.releaser.scmactions.ReleaseReason;
+import org.scm4j.releaser.scmactions.SCMActionBuild;
+import org.scm4j.releaser.scmactions.SCMActionFork;
+import org.scm4j.releaser.scmactions.SCMActionTagRelease;
 import org.scm4j.vcs.api.IVCS;
 import org.scm4j.vcs.api.VCSTag;
-import org.scm4j.wf.actions.ActionKind;
-import org.scm4j.wf.actions.ActionNone;
-import org.scm4j.wf.actions.IAction;
-import org.scm4j.wf.branch.DevelopBranch;
-import org.scm4j.wf.branch.DevelopBranchStatus;
-import org.scm4j.wf.branch.ReleaseBranch;
-import org.scm4j.wf.branch.ReleaseBranchStatus;
-import org.scm4j.wf.conf.*;
-import org.scm4j.wf.exceptions.EComponentConfig;
-import org.scm4j.wf.scmactions.ReleaseReason;
-import org.scm4j.wf.scmactions.SCMActionBuild;
-import org.scm4j.wf.scmactions.SCMActionFork;
-import org.scm4j.wf.scmactions.SCMActionTagRelease;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 
-public class SCMWorkflow {
+public class SCMReleaser {
 
 	public static final String MDEPS_FILE_NAME = "mdeps";
 	public static final String VER_FILE_NAME = "version";
@@ -30,11 +31,11 @@ public class SCMWorkflow {
 
 	private final List<Option> options;
 
-	public SCMWorkflow(List<Option> options) {
+	public SCMReleaser(List<Option> options) {
 		this.options = options;
 	}
 
-	public SCMWorkflow() {
+	public SCMReleaser() {
 		this(new ArrayList<Option>());
 	}
 
@@ -49,15 +50,15 @@ public static List<Option> parseOptions(String[] args) {
 	}
 
 	public static File getDelayedTagsFile() {
-		return new File(SCMWorkflow.DELAYED_TAGS_FILE_NAME);
+		return new File(SCMReleaser.DELAYED_TAGS_FILE_NAME);
 	}
 
 	public IAction getProductionReleaseAction(String componentName) {
-		return getProductionReleaseAction(new Component(componentName), ActionKind.AUTO);
+		return getProductionReleaseAction(new Component(componentName, true), ActionKind.AUTO);
 	}
 
 	public IAction getProductionReleaseAction(String componentCoords, ActionKind actionKind) {
-		return getProductionReleaseAction(new Component(componentCoords), actionKind);
+		return getProductionReleaseAction(new Component(componentCoords, true), actionKind);
 	}
 
 	public IAction getProductionReleaseAction(Component comp) {
@@ -66,11 +67,16 @@ public IAction getProductionReleaseAction(Component comp) {
 
 	public IAction getProductionReleaseAction(Component comp, ActionKind actionKind) {
 		List<IAction> childActions = new ArrayList<>();
-		DevelopBranch db = new DevelopBranch(comp);
-		List<Component> devMDeps = db.getMDeps();
+		ReleaseBranch rb = new ReleaseBranch(comp);
+		List<Component> mDeps;
+		if (rb.exists()) {
+			mDeps = rb.getMDeps();
+		} else {
+			mDeps = new DevelopBranch(comp).getMDeps();
+		}
 
-		for (Component mDep : devMDeps) {
-			childActions.add(getProductionReleaseAction(mDep, actionKind));
+		for (Component mDep : mDeps) {
+			childActions.add(getProductionReleaseAction(mDep, actionKind)); 
 		}
 
 		return getProductionReleaseActionRoot(comp, childActions, actionKind);
@@ -86,44 +92,41 @@ public IAction getProductionReleaseActionRoot(Component comp, List<IAction> chil
 		if (dbs == DevelopBranchStatus.IGNORED) {
 			return new ActionNone(comp, childActions, "develop branch is IGNORED");
 		}
-
+		
 		ReleaseBranch rb = new ReleaseBranch(comp);
 		ReleaseBranchStatus rbs = rb.getStatus();
 
 		if (rbs == ReleaseBranchStatus.MISSING) {
 			skipAllBuilds(childActions);
 			if (actionKind == ActionKind.BUILD) {
-				return new ActionNone(comp, childActions, "nothing to build ");
-			}
-			if (dbs == DevelopBranchStatus.MODIFIED) {
-				return new SCMActionFork(comp, childActions, ReleaseReason.NEW_FEATURES, options);
-			} else {
-				return new SCMActionFork(comp, childActions, ReleaseReason.NEW_DEPENDENCIES, options);
+				return new ActionNone(comp, childActions, "nothing to build. " + rb.getVersion() + " " + rb.getStatus());
 			}
+			
+			return new SCMActionFork(comp, childActions, ReleaseBranchStatus.MISSING, ReleaseBranchStatus.MDEPS_ACTUAL, options);
 		}
 
 		if (rbs == ReleaseBranchStatus.BRANCHED) {
 			// need to freeze mdeps
 			skipAllBuilds(childActions);
 			if (actionKind == ActionKind.BUILD) {
-				return new ActionNone(comp, childActions, "nothing to build");
+				return new ActionNone(comp, childActions, "nothing to build. " + rb.getVersion() + " " + rb.getStatus());
 			}
-			return new SCMActionFork(comp, childActions, ReleaseReason.NEW_FEATURES, options);
+			return new SCMActionFork(comp, childActions, ReleaseBranchStatus.BRANCHED,  ReleaseBranchStatus.MDEPS_ACTUAL, options);
 		}
 
 		if (rbs == ReleaseBranchStatus.MDEPS_FROZEN) {
 			if (needToActualizeMDeps(rb)) {
 				// need to actualize
 				skipAllBuilds(childActions);
 				if (actionKind == ActionKind.BUILD) {
-					return new ActionNone(comp, childActions, "nothing to build");
+					return new ActionNone(comp, childActions, "nothing to build. " + rb.getVersion() + " " + rb.getStatus());
 				}
-				return new SCMActionFork(comp, childActions, ReleaseReason.ACTUALIZE_MDEPS, options);
+				return new SCMActionFork(comp, childActions, ReleaseBranchStatus.MDEPS_FROZEN, ReleaseBranchStatus.MDEPS_ACTUAL, options);
 			} else {
 				// All necessary version will be build by Child Actions. Need to build
 				skipAllForks(childActions);
 				if (actionKind == ActionKind.FORK) {
-					return new ActionNone(comp, childActions, "nothing to fork");
+					return new ActionNone(comp, childActions, "nothing to fork. " + rb.getVersion() + " " + rb.getStatus());
 				}
 				return new SCMActionBuild(comp, childActions, ReleaseReason.NEW_DEPENDENCIES, rb.getVersion(), options);
 			}
@@ -132,31 +135,37 @@ public IAction getProductionReleaseActionRoot(Component comp, List<IAction> chil
 		if (rbs == ReleaseBranchStatus.MDEPS_ACTUAL) {
 			// need to build
 			if (actionKind == ActionKind.FORK) {
-				return new ActionNone(comp, childActions, "nothing to fork");
+				return new ActionNone(comp, childActions, "nothing to fork. " + rb.getVersion() + " " + rb.getStatus());
 			}
 			return new SCMActionBuild(comp, childActions, ReleaseReason.NEW_FEATURES, rb.getVersion(), options);
 		}
 
 		if (hasForkChildActions(childActions)) {
 			skipAllBuilds(childActions);
 			if (actionKind == ActionKind.FORK) {
-				return new ActionNone(comp, childActions, "nothing to build");
+				return new ActionNone(comp, childActions, "nothing to build. " + rb.getVersion() + " " + rb.getStatus());
 			}
-			return new SCMActionFork(comp, childActions, ReleaseReason.NEW_DEPENDENCIES, options);
+			return new SCMActionFork(comp, childActions, rbs, rbs, options);
 		}
 
-		return new ActionNone(comp, childActions, rbs.toString());
+		return new ActionNone(comp, childActions, rb.getVersion().toString() + " " + rbs.toString());
 	}
 
 	private boolean needToActualizeMDeps(ReleaseBranch currentCompRB) {
 		List<Component> mDeps = currentCompRB.getMDeps();
 		ReleaseBranch mDepRB;
 		for (Component mDep : mDeps) {
 			mDepRB = new ReleaseBranch(mDep);
-			if (mDepRB.getStatus() == ReleaseBranchStatus.MDEPS_ACTUAL) {
+			ReleaseBranchStatus rbs = mDepRB.getStatus();
+			if (rbs == ReleaseBranchStatus.MDEPS_ACTUAL) {
 				if (!mDepRB.getCurrentVersion().equals(mDep.getVersion())) {
 					return true;
 				}
+			
+			} else if (rbs == ReleaseBranchStatus.ACTUAL) {
+				if (!mDepRB.getCurrentVersion().toPreviousPatch().equals(mDep.getVersion())) {
+					return true;
+				}
 			} else {
 				if (needToActualizeMDeps(mDepRB)) {
 					return true;
@@ -194,7 +203,8 @@ private void skipAllBuilds(List<IAction> childActions) {
 			action = li.next();
 			skipAllBuilds(action.getChildActions());
 			if (action instanceof SCMActionBuild) {
-				li.set(new ActionNone(((SCMActionBuild) action).getComponent(), action.getChildActions(), "build skipped because not all parent components forked"));
+				li.set(new ActionNone(((SCMActionBuild) action).getComponent(), action.getChildActions(), ((SCMActionBuild) action).getTargetVersion() + 
+						" build skipped because not all parent components forked"));
 			}
 		}
 	}
@@ -229,7 +239,7 @@ private IAction getTagReleaseActionRoot(Component comp, List<IAction> childActio
 		if (tagsOnRevision.isEmpty()) {
 			return new SCMActionTagRelease(comp, childActions, options);
 		}
-		Version delayedTagVersion = new Version(vcs.getFileContent(rb.getName(), SCMWorkflow.VER_FILE_NAME, delayedRevisionToTag));
+		Version delayedTagVersion = new Version(vcs.getFileContent(rb.getName(), SCMReleaser.VER_FILE_NAME, delayedRevisionToTag));
 		for (VCSTag tag : tagsOnRevision) {
 			if (tag.getTagName().equals(delayedTagVersion.toReleaseString())) {
 				return new ActionNone(comp, childActions, "tag " + tag.getTagName() + " already exists");
@@ -243,4 +253,8 @@ public static TagDesc getTagDesc(String verStr) {
 		String tagMessage = tagName + " release";
 		return new TagDesc(tagName, tagMessage);
 	}
+
+	public List<Option> getOptions() {
+		return options;
+	}
 }

…c/main/java/org/scm4j/wf/VCSFactory.java …/java/org/scm4j/releaser/VCSFactory.javasrc/main/java/org/scm4j/wf/VCSFactory.java renamed to src/main/java/org/scm4j/releaser/VCSFactory.java src/main/java/org/scm4j/wf/VCSFactory.java renamed to src/main/java/org/scm4j/releaser/VCSFactory.java

@@ -1,16 +1,16 @@
-package org.scm4j.wf;
+package org.scm4j.releaser;
 
+import org.scm4j.releaser.conf.Credentials;
+import org.scm4j.releaser.conf.VCSType;
 import org.scm4j.vcs.GitVCS;
 import org.scm4j.vcs.api.IVCS;
 import org.scm4j.vcs.api.workingcopy.IVCSWorkspace;
 import org.scm4j.vcs.svn.SVNVCS;
-import org.scm4j.wf.conf.Credentials;
-import org.scm4j.wf.conf.VCSType;
 
 public class VCSFactory {
 
 	public static IVCS getVCS(VCSType type, Credentials creds, String url, IVCSWorkspace ws) {
-		IVCS vcs;
+		IVCS vcs = null;
 		switch (type) {
 		case GIT: {
 			vcs = new GitVCS(ws.getVCSRepositoryWorkspace(url));
@@ -27,9 +27,6 @@ public static IVCS getVCS(VCSType type, Credentials creds, String url, IVCSWorks
 					creds == null ? null : creds.getPassword());
 			break;
 		}
-		default: {
-			throw new RuntimeException("Unsupported VCSTtype for repository: " + url);
-		}
 		}
 		return vcs;
 	}

…org/scm4j/wf/actions/ActionAbstract.java …m4j/releaser/actions/ActionAbstract.javasrc/main/java/org/scm4j/wf/actions/ActionAbstract.java renamed to src/main/java/org/scm4j/releaser/actions/ActionAbstract.java src/main/java/org/scm4j/wf/actions/ActionAbstract.java renamed to src/main/java/org/scm4j/releaser/actions/ActionAbstract.java

@@ -1,8 +1,8 @@
-package org.scm4j.wf.actions;
+package org.scm4j.releaser.actions;
 
+import org.scm4j.releaser.conf.Component;
+import org.scm4j.releaser.conf.Option;
 import org.scm4j.vcs.api.IVCS;
-import org.scm4j.wf.conf.Component;
-import org.scm4j.wf.conf.Option;
 
 import java.util.List;
 
@@ -35,9 +35,4 @@ public List<IAction> getChildActions() {
 	public String getName() {
 		return comp.getName();
 	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName() + " [" + comp.getName() + "]";
-	}
 }