Resolve #4, support committing specific files.

- Rename unittests.xml to integration-tests.xml. - Add tests for committing multiple specific paths.
rimerosolutions · Feb 23, 2014 · d907057 · d907057
1 parent 7053fb1
commit d907057
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 7 deletions.
diff --git a/README.org b/README.org
@@ -12,7 +12,7 @@ Maven/Apache Ivy repository hosting is provided via [[https://oss.sonatype.org/i
 
 * Tasks description
 For an overview of available Ant tasks, please consult the [[https://github.com/rimerosolutions/ant-git-tasks/wiki][wiki pages]].
-The [[https://github.com/rimerosolutions/ant-git-tasks/blob/master/src/test/resources/unittests.xml][available Apache AntUnit tests]] give a good overview of the intended usage.
+The [[https://github.com/rimerosolutions/ant-git-tasks/blob/master/src/test/resources/integration-tests.xml][available Apache AntUnit tests]] give a good overview of the intended usage.
 The *ant-git-tasks* project is tested with Apache Ant itself, to have a feel of what's working and how usable the tasks are.
 
 * General information

diff --git a/example-pom.xml b/example-pom.xml
@@ -96,7 +96,7 @@
                                                                 <taskdef uri="antlib:com.rimerosolutions.ant.git"
                                                                          resource="com/rimerosolutions/ant/git/jgit-ant-lib.xml"
                                                                          classpath="${plugin_classpath}"/>
-                                                                <!--                       <ant antfile="${basedir}/src/test/resources/unittests.xml" target="testAdd"/>
+                                                                <!--                       <ant antfile="${basedir}/src/test/resources/integration-tests.xml" target="testAdd"/>
                                                                 -->
 
                                                                 <git:settings refId="git.test"

diff --git a/src/main/java/com/rimerosolutions/ant/git/tasks/CommitTask.java b/src/main/java/com/rimerosolutions/ant/git/tasks/CommitTask.java
@@ -20,7 +20,10 @@
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.revwalk.RevCommit;
-
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.resources.Union;
+import java.io.File;
+import java.io.IOException;
 import com.rimerosolutions.ant.git.AbstractGitRepoAwareTask;
 import com.rimerosolutions.ant.git.GitBuildException;
 import com.rimerosolutions.ant.git.GitTaskUtils;
@@ -47,7 +50,8 @@ public class CommitTask extends AbstractGitRepoAwareTask {
         private String reflogComment;
         private String revCommitIdProperty;
         private String only;
-
+        private Union path;
+
         @Override
         public String getName() {
                 return TASK_NAME;
@@ -62,6 +66,34 @@ public String getName() {
         public void setOnly(String only) {
                 this.only = only;
         }
+
+        /**
+         * Configure the fileset(s) of files to add to revision control
+         *
+         * @param fileset The fileset to add
+         */
+        public void addFileset(FileSet fileset) {
+                getPath().add(fileset);
+        }
+
+        private synchronized Union getPath() {
+                if (path == null) {
+                        path = new Union();
+                        path.setProject(getProject());
+                }
+                return path;
+        }
+
+        private String translateFilePathUsingPrefix(String file, String prefix) throws IOException {
+                if (file.equals(prefix)) {
+                        return ".";
+                }
+                String result = new File(file).getCanonicalPath().substring(prefix.length() + 1);
+                if (File.separatorChar != '/') {
+                	result = result.replace(File.separatorChar, '/');
+                }
+                return result;
+        }
 
         /**
          * Assign the commit revision id to a property
@@ -79,13 +111,26 @@ protected void doExecute() throws BuildException {
                         setFailOnError(true);
                         CommitCommand cmd = git.commit();
 
-                        if (message != null) {
+                        if (!GitTaskUtils.isNullOrBlankString(message)) {
                                 cmd.setMessage(GitTaskUtils.BRANDING_MESSAGE + " " + message);
                         }
+                        else {
+                                cmd.setMessage(GitTaskUtils.BRANDING_MESSAGE);
+                        }
 
+                        String prefix = getDirectory().getCanonicalPath();
+                        String[] allFiles = getPath().list();
+
                         if (!GitTaskUtils.isNullOrBlankString(only)) {
                                 cmd.setOnly(only);
                         }
+                        else if (allFiles.length > 0) {
+                                for (String file : allFiles) {
+                                        String modifiedFile = translateFilePathUsingPrefix(file, prefix);
+                                        log("Will commit " + modifiedFile);
+                                        cmd.setOnly(modifiedFile);
+                                }
+                        }
                         else {
                                 cmd.setAll(true);
                         }
@@ -104,7 +149,10 @@ protected void doExecute() throws BuildException {
                         }
 
                         log(revCommit.getFullMessage());
-                } catch (GitAPIException ex) {
+                } catch (IOException ioe) {
+                        throw new GitBuildException(MESSAGE_COMMIT_FAILED, ioe);
+                }
+                catch (GitAPIException ex) {
                         throw new GitBuildException(MESSAGE_COMMIT_FAILED, ex);
                 }
         }

diff --git a/src/test/resources/unittests.xml → src/test/resources/integration-tests.xml b/src/test/resources/unittests.xml → src/test/resources/integration-tests.xml
@@ -297,12 +297,25 @@ limitations under the License.
                         <git:commit message="${dummy.commit.message}" revCommitIdProperty="testAdd.revcommit"/>
                         <git:uptodate failOnError="true"/>
                 </git:git>
-
+
+                <echo file="${testLocalRepo}/test-fileset1.txt" message="test"/>
+                <echo file="${testLocalRepo}/test-fileset2.txt" message="test"/>
+                <git:git directory="${testLocalRepo}" verbose="true" settingsRef="git.testing">
+                        <git:add>
+                                <fileset dir="${testLocalRepo}" includes="test-fileset*.txt"/>
+                        </git:add>
+                        <git:commit message="${dummy.commit.message}" revCommitIdProperty="testAdd.revcommit">
+                                <fileset dir="${testLocalRepo}" includes="test-fileset*.txt"/>
+                        </git:commit>
+                        <git:uptodate failOnError="true"/>
+                </git:git>
+
                 <au:expectfailure>
                         <git:git directory="${testLocalRepo}" verbose="true" settingsRef="git.testing">
                                 <git:commit message="${dummy.commit.message}" only="test.txt"/>
                         </git:git>
                 </au:expectfailure>
+
         </target>
 
         <target name="testClean" description="Test git-clean">