Source.getLocation may return either a URI or a file path, protect ag…

…ainst that, fixes #30, closes #31

pom.xml

@@ -86,6 +86,14 @@
                 <role>contributor</role>
             </roles>
         </developer>
+        <developer>
+            <id>JHeiner</id>
+            <name>Jeremy Heiner</name>
+            <url>https://github.com/JHeiner</url>
+            <roles>
+                <role>contributor</role>
+            </roles>
+        </developer>
     </developers>
 
     <dependencies>
@@ -203,6 +211,7 @@
                         <exclude>**/README</exclude>
                         <exclude>**/LICENSE</exclude>
                         <exclude>.*</exclude>
+                        <exclude>**/.keepgit</exclude>
                         <exclude>src/quality/**</exclude>
                         <exclude>src/it/resources/**</exclude>
                         <exclude>src/it/**/invoker.properties</exclude>
@@ -332,6 +341,10 @@
                         <configuration>
                             <debug>false</debug>
                             <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                            <setupIncludes>
+                              <setupInclude>issues/*-pre/pom.xml</setupInclude>
+                              <setupInclude>*-pre/pom.xml</setupInclude>
+                            </setupIncludes>
                             <pomIncludes>
                                 <pomInclude>*/pom.xml</pomInclude>
                                 <pomInclude>issues/*/pom.xml</pomInclude>

src/it/issues/issue-30-pre/pom.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2016 Matthieu Brouillard [http://oss.brouillard.fr/jgitver-maven-plugin] ([email protected])
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>fr.brouillard.oss.it</groupId>
+    <artifactId>issue-30-pre</artifactId>
+    <version>0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <description>Build a jar file and install it without POM inside the repository</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <executions>
+                    <execution>
+                        <id>install-jar-without-pom</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                            <groupId>fr.brouillard.oss.it</groupId>
+                            <artifactId>int-set-builder</artifactId>
+                            <version>0.4</version>
+                            <packaging>jar</packaging>
+                            <generatePom>false</generatePom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/it/issues/issue-30-pre/src/main/java/outside/IntSetBuilder.java

@@ -0,0 +1,32 @@
+// @formatter:off
+/**
+ * Copyright (C) 2016 Matthieu Brouillard [http://oss.brouillard.fr/jgitver-maven-plugin] ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// @formatter:on
+
+package outside;
+
+public class IntSetBuilder
+    extends java.util.HashSet<Integer>
+    implements java.util.function.IntConsumer
+{
+    public long accepted = 0;
+
+    public void accept( int i )
+    {
+        ++ accepted;
+        add( i );
+    }
+}

src/it/issues/issue-30/.mvn/extensions.xml

@@ -0,0 +1,25 @@
+<!--
+
+    Copyright (C) 2016 Matthieu Brouillard [http://oss.brouillard.fr/jgitver-maven-plugin] ([email protected])
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>@project.groupId@</groupId>
+    <artifactId>@project.artifactId@</artifactId>
+    <version>@project.version@</version>
+  </extension>
+</extensions>

src/it/issues/issue-30/invoker.properties

@@ -0,0 +1 @@
+invoker.goals = install project-info-reports:dependencies

src/it/issues/issue-30/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2016 Matthieu Brouillard [http://oss.brouillard.fr/jgitver-maven-plugin] ([email protected])
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>fr.brouillard.oss.it</groupId>
+    <artifactId>issue-30</artifactId>
+    <version>0</version>
+
+    <description>NullPointerException in JGitverModelProcessor.provisionModel when POM unavailable.</description>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>fr.brouillard.oss.it</groupId>
+            <artifactId>int-set-builder</artifactId>
+            <version>0.4</version>
+        </dependency>
+    </dependencies>
+</project>

src/it/issues/issue-30/prebuild.groovy

@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2016 Matthieu Brouillard [http://oss.brouillard.fr/jgitver-maven-plugin] (matthieu@brouillard.fr)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+def log = new PrintWriter( new File(basedir, "prebuild.log").newWriter("UTF-8"), true )
+log.println( "Prebuild started at: " + new Date() + " in: " + basedir )
+
+[
+
+  "git --version",
+  "rm -rf .git",
+  "git init",
+  "git config user.name nobody",
+  "git config user.email [email protected]",
+  "echo A > content",
+  "git add .",
+  "git commit --message=initial_commit",
+  "git tag -a 1.0.0 --message=release_1.0.0",
+  "echo B > content",
+  "git add -u",
+  "git commit --message=added_B_data",
+  "git log --graph --oneline"
+
+].each{ command ->
+
+  def proc = command.execute(null, basedir)
+  def sout = new StringBuilder(), serr = new StringBuilder()
+  proc.waitForProcessOutput(sout, serr)
+
+  log.println( "cmd: " + command )
+  log.println( "out:" ) ; log.println( sout.toString().trim() )
+  log.println( "err:" ) ; log.println( serr.toString().trim() )
+  log.println( "ret: " + proc.exitValue() )
+
+  assert proc.exitValue() == 0
+
+}
+
+log.println( "Prebuild completed at: " + new Date() )
+log.close()
+return true

src/it/issues/issue-30/src/main/java/inside/Main.java

@@ -0,0 +1,39 @@
+// @formatter:off
+/**
+ * Copyright (C) 2016 Matthieu Brouillard [http://oss.brouillard.fr/jgitver-maven-plugin] ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// @formatter:on
+
+package inside;
+
+import outside.IntSetBuilder;
+
+public class Main
+{
+    public static double codePointsOverLength( String value )
+    {
+        IntSetBuilder isb = new IntSetBuilder();
+        value.codePoints().forEach( isb );
+        return isb.size() / (double) isb.accepted;
+    }
+
+    public static void main( String[] args )
+    {
+        String value = args.length > 0
+            ? String.join( " ", java.util.Arrays.asList(args) )
+            : "The quick brown fox jumps over the lazy dog.";
+        System.out.println( codePointsOverLength(value) + "  " + value );
+    }
+}

src/it/issues/issue-30/verify.groovy

@@ -0,0 +1,54 @@
+/**
+ * Copyright (C) 2016 Matthieu Brouillard [http://oss.brouillard.fr/jgitver-maven-plugin] (matthieu@brouillard.fr)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+def log = new PrintWriter( new File(basedir, "verify.log").newWriter("UTF-8"), true )
+log.println( "Verify started at: " + new Date() + " in: " + basedir )
+
+[
+  "rm -rf .git"
+].each{ command ->
+
+  def proc = command.execute(null, basedir)
+  def sout = new StringBuilder(), serr = new StringBuilder()
+  proc.waitForProcessOutput(sout, serr)
+
+  log.println( "cmd: " + command )
+  log.println( "out:" ) ; log.println( sout.toString().trim() )
+  log.println( "err:" ) ; log.println( serr.toString().trim() )
+  log.println( "ret: " + proc.exitValue() )
+
+  assert proc.exitValue() == 0
+
+}
+
+def buildLog = new File(basedir, "build.log").readLines()
+
+// Check the version was used by the plugin execution
+def versionChanges = buildLog.findAll { it =~ /fr.brouillard.oss.it::issue-30::0 -> 1.0.1-SNAPSHOT/ }
+log.println( "versionChanges: " + versionChanges )
+assert 0 < versionChanges.size()
+
+// And check that the produced artifact was installed with the good version
+File installedPomFile = new File(localRepositoryPath, "fr/brouillard/oss/it/issue-30/1.0.1-SNAPSHOT/issue-30-1.0.1-SNAPSHOT.pom")
+log.println( "installedPomFile: " + installedPomFile.isFile() + " " + installedPomFile )
+assert installedPomFile.isFile()
+def installedPomFileVersion = installedPomFile.readLines().findAll { it =~ /<version>1.0.1-SNAPSHOT<\/version>/ }
+log.println( "installedPomFileVersion: " + installedPomFileVersion )
+assert 1 == installedPomFileVersion.size()
+
+log.println( "Verify completed at: " + new Date() )
+log.close()
+return true

src/main/java/fr/brouillard/oss/jgitver/JGitverModelProcessor.java

@@ -124,12 +124,22 @@ private Model provisionModel(Model model, Map<String, ?> options) throws IOExcep
             throw new IOException("cannot build a Model object using jgitver", ex);
         }
 
-        if (Objects.isNull(options.get(ModelProcessor.SOURCE))) {
+        Source source = (Source) options.get(ModelProcessor.SOURCE);
+        //logger.debug( "JGitverModelProcessor.provisionModel source="+source );
+        if (source == null) {
             return model;
         }
 
-        Source source = Source.class.cast(options.get(ModelProcessor.SOURCE));
-        File relativePath = new File(source.getLocation()).getParentFile().getCanonicalFile();
+        File location = new File(source.getLocation());
+        //logger.debug( "JGitverModelProcessor.provisionModel location="+location );
+        if (!location.isFile()) {
+            // their JavaDoc says Source.getLocation "could be a local file path, a URI or just an empty string."
+            // if it doesn't resolve to a file then calling .getParentFile will throw an exception,
+            // but if it doesn't resolve to a file then it isn't under getMultiModuleProjectDirectory,
+            return model; // therefore the model shouldn't be modified.
+        }
+
+        File relativePath = location.getParentFile().getCanonicalFile();
 
         if (StringUtils.containsIgnoreCase(relativePath.getCanonicalPath(),
                 workingConfiguration.getMultiModuleProjectDirectory().getCanonicalPath())) {
@@ -245,4 +255,4 @@ private Model provisionModel(Model model, Map<String, ?> options) throws IOExcep
 
         return model;
     }
-}
+}