diff --git a/build.sbt b/build.sbt index d7a87c9..444ea60 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ name := "args4s" -version := "1.2.0" +version := "1.2.1" deps ++= Seq( libs.value('args4j), diff --git a/project/plugins.sbt b/project/plugins.sbt index 846db4a..117ce55 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.hammerlab" % "sbt-parent" % "1.7.2") +addSbtPlugin("org.hammerlab" % "sbt-parent" % "1.7.3") diff --git a/src/main/scala/org/hammerlab/args4s/PathHandler.scala b/src/main/scala/org/hammerlab/args4s/PathHandler.scala index e7acb22..c9a690c 100644 --- a/src/main/scala/org/hammerlab/args4s/PathHandler.scala +++ b/src/main/scala/org/hammerlab/args4s/PathHandler.scala @@ -1,6 +1,6 @@ package org.hammerlab.args4s -import java.nio.file.{ Paths, Path ⇒ JPath } +import java.nio.file.{ Path ⇒ JPath } import org.hammerlab.paths.Path import org.kohsuke.args4j.spi.Setter @@ -14,11 +14,11 @@ class JPathHandler(parser: CmdLineParser, option: OptionDef, setter: Setter[JPath]) extends Handler[JPath]( - parser, - option, - setter, - "PATH", - Paths.get(_) + parser, + option, + setter, + "PATH", + Path(_).path ) /** @@ -28,9 +28,9 @@ class PathHandler(parser: CmdLineParser, option: OptionDef, setter: Setter[Path]) extends Handler[Path]( - parser, - option, - setter, - "PATH", - Path(_) + parser, + option, + setter, + "PATH", + Path(_) ) diff --git a/src/main/scala/org/hammerlab/args4s/PathOptionHandler.scala b/src/main/scala/org/hammerlab/args4s/PathOptionHandler.scala index da2c649..117c355 100644 --- a/src/main/scala/org/hammerlab/args4s/PathOptionHandler.scala +++ b/src/main/scala/org/hammerlab/args4s/PathOptionHandler.scala @@ -12,9 +12,9 @@ class PathOptionHandler(parser: CmdLineParser, option: OptionDef, setter: Setter[Option[Path]]) extends OptionHandler[Path]( - parser, - option, - setter, - "PATH", - Path(_) + parser, + option, + setter, + "PATH", + Path(_) ) diff --git a/src/test/scala/org/hammerlab/args4s/ArgsTest.scala b/src/test/scala/org/hammerlab/args4s/ArgsTest.scala index 5b0680b..4a6b865 100644 --- a/src/test/scala/org/hammerlab/args4s/ArgsTest.scala +++ b/src/test/scala/org/hammerlab/args4s/ArgsTest.scala @@ -76,18 +76,18 @@ class ArgsTest parser.parseArgument( Seq( "--str", "abc", - "--path", "http://a/b/c", + "--path", "file:///a/b/c", "--path-opt", "dd/ee/ff", "--strings", "aaa,bbb,ccc", - "gg/hh/ii", "ftp://jj/kk" + "gg/hh/ii", "file:///jj/kk" ) ) args.strOpt should be(Some("abc")) args.intOpt should be(None) - args.path should be(Path("http://a/b/c")) + args.path should be(Path("file:///a/b/c")) args.pathOpt should be(Some(Path("dd/ee/ff"))) args.strings should be(Array("aaa", "bbb", "ccc")) - args.paths should be(Array(Path("gg/hh/ii"), Path("ftp://jj/kk"))) + args.paths should be(Array(Path("gg/hh/ii"), Path("file:///jj/kk"))) } }