Fix a bug determining location of .tmcproject.yml

Author: nygrenh

build-tools/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.7.10-SNAPSHOT</version>
+    <version>0.7.11-SNAPSHOT</version>
     <name>build-tools</name>
 
     <!-- Deploy to maven.testmycode.net/nexus -->

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>tmc-langs</artifactId>
-    <version>0.7.10-SNAPSHOT</version>
+    <version>0.7.11-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tmc-langs</name>
     <url>http://testmycode.net</url>

tmc-langs-cli/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tmc-langs</artifactId>
         <groupId>fi.helsinki.cs.tmc</groupId>
-        <version>0.7.10-SNAPSHOT</version>
+        <version>0.7.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

tmc-langs-framework/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.10-SNAPSHOT</version>
+        <version>0.7.11-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <properties>

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/ConfigurableStudentFilePolicy.java

@@ -27,7 +27,6 @@ public abstract class ConfigurableStudentFilePolicy implements StudentFilePolicy
 
     private List<Path> extraStudentFiles;
     private List<Path> forceUpdateFiles;
-    private Path rootPath;
 
     public ConfigurableStudentFilePolicy(Path configFileParent) {
         this.configFileParentPath = configFileParent;
@@ -58,23 +57,21 @@ public boolean isStudentFile(Path path, Path projectRootPath) {
             return false;
         }
 
-        this.rootPath = projectRootPath;
-
-        return isExtraStudentFile(path)
+        return isExtraStudentFile(path, projectRootPath)
                 || projectRootPath.equals(path)
                 || isStudentSourceFile(
                         path.subpath(projectRootPath.getNameCount(), path.getNameCount()),
                         projectRootPath);
     }
 
     /** Determines whether a file is an <tt>ExtraStudentFile</tt>. */
-    private boolean isExtraStudentFile(Path path) {
+    private boolean isExtraStudentFile(Path path, Path rootPath) {
         if (extraStudentFiles == null) {
             TmcProjectYmlParser parser = new TmcProjectYmlParser(configFileParentPath);
             extraStudentFiles = parser.parseExtraStudentFiles();
         }
 
-        return isPathWhitelisted(path, extraStudentFiles);
+        return isPathWhitelisted(path, extraStudentFiles, rootPath);
     }
 
     @Override
@@ -85,14 +82,14 @@ public boolean mayDelete(Path file, Path projectRoot) {
     @Override
     public boolean isUpdatingForced(Path path, Path projectRootPath) {
         if (forceUpdateFiles == null) {
-            TmcProjectYmlParser parser = new TmcProjectYmlParser(rootPath);
+            TmcProjectYmlParser parser = new TmcProjectYmlParser(projectRootPath);
             forceUpdateFiles = parser.parseForceUpdateFiles();
         }
 
-        return isPathWhitelisted(path, forceUpdateFiles);
+        return isPathWhitelisted(path, forceUpdateFiles, projectRootPath);
     }
 
-    private boolean isPathWhitelisted(Path path, List<Path> paths) {
+    private boolean isPathWhitelisted(Path path, List<Path> paths, Path rootPath) {
         for (Path whitelistedPath : paths) {
             Path whitelistedFullPath = rootPath.resolve(whitelistedPath).toAbsolutePath();
             Path fullPath = path.toAbsolutePath();

tmc-langs-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.10-SNAPSHOT</version>
+        <version>0.7.11-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-make/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.10-SNAPSHOT</version>
+        <version>0.7.11-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-notests/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.10-SNAPSHOT</version>
+        <version>0.7.11-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-python3/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.10-SNAPSHOT</version>
+        <version>0.7.11-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-qmake/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.10-SNAPSHOT</version>
+        <version>0.7.11-SNAPSHOT</version>
     </parent>
 
     <properties>