jdb/gtd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for Windows-style paths.

Browse Source
This commit is contained in:
Jonathan Bernard 2013-10-08 14:30:14 -05:00
parent 1e0a3b4063
commit 9fee96cb25
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project.properties
View File

@ -1,8 +1,8 @@
#Sun, 22 Sep 2013 16:05:26 -0500 #Tue, 08 Oct 2013 14:15:21 -0500
lib.local=true lib.local=true
name=jdb-gtd name=jdb-gtd
version=1.2 version=1.3
nailgun.classpath.dir=/home/jdbernard/programs/nailgun/classpath nailgun.classpath.dir=/home/jdbernard/programs/nailgun/classpath
executable.jar=true executable.jar=true
main.class=com.jdblabs.gtd.cli.GTDCLI main.class=com.jdblabs.gtd.cli.GTDCLI
build.number=49 build.number=2

8
src/main/com/jdblabs/gtd/Util.groovy
View File

@ -40,8 +40,8 @@ public class Util {
* path. This algorithm does not consider symlinks or hard links. It * path. This algorithm does not consider symlinks or hard links. It
* operates based on the textual path names. */ * operates based on the textual path names. */
public static boolean inPath(File parent, File child) { public static boolean inPath(File parent, File child) {
def parentPath = parent.canonicalPath.split("/") def parentPath = parent.canonicalPath.split("[\\\\/]")
def childPath = child.canonicalPath.split("/") def childPath = child.canonicalPath.split("[\\\\/]")
/// If the parent path is longer than the child path it cannot contain /// If the parent path is longer than the child path it cannot contain
/// the child path. /// the child path.
@ -64,8 +64,8 @@ public class Util {
* contained within the parent path, return the relative path from the * contained within the parent path, return the relative path from the
* parent to the child. */ * parent to the child. */
public static String getRelativePath(File parent, File child) { public static String getRelativePath(File parent, File child) {
def parentPath = parent.canonicalPath.split("/") def parentPath = parent.canonicalPath.split("[\\\\/]")
def childPath = child.canonicalPath.split("/") def childPath = child.canonicalPath.split("[\\\\/]")
/// If the parent path is longer it cannot contain the child path and /// If the parent path is longer it cannot contain the child path and
/// we cannot construct a relative path without backtracking. /// we cannot construct a relative path without backtracking.

5
src/main/com/jdblabs/gtd/cli/GTDCLI.groovy
View File

@ -23,7 +23,7 @@ import static com.jdblabs.gtd.Util.*
* @org gtd.jdb-labs.com/cli/GTDCLI */ * @org gtd.jdb-labs.com/cli/GTDCLI */
public class GTDCLI { public class GTDCLI {
public static final String VERSION = "1.2" public static final String VERSION = "1.3"
private static String EOL = System.getProperty("line.separator") private static String EOL = System.getProperty("line.separator")
/// We have a persistent instance when we are in the context of a Nailgun /// We have a persistent instance when we are in the context of a Nailgun
@ -520,7 +520,8 @@ public class GTDCLI {
if (!dir.exists() || !dir.isDirectory()) return if (!dir.exists() || !dir.isDirectory()) return
println "-- ${getRelativePath(gtdDirs.root, dir)} --" println "-- ${getRelativePath(gtdDirs.root, dir)} --"
dir.eachFile { file -> dir.eachFile { file ->
if (!file.exists() || !file.isFile() || file.isHidden()) if (!file.exists() || !file.isFile() || file.isHidden() ||
file.name.startsWith('.'))
return return
def item = new Item(file) def item = new Item(file)