Skip to content

Commit

Permalink
Merge cb9893d into 6c81a8a
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-williams committed Jun 20, 2017
2 parents 6c81a8a + cb9893d commit bfa8a6e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 27 deletions.
2 changes: 1 addition & 1 deletion build.sbt
@@ -1,5 +1,5 @@
name := "args4s"
version := "1.2.2"
version := "1.2.3"

deps ++= Seq(
libs.value('args4j),
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
@@ -1 +1 @@
addSbtPlugin("org.hammerlab" % "sbt-parent" % "1.7.4")
addSbtPlugin("org.hammerlab" % "sbt-parent" % "2.0.1")
20 changes: 0 additions & 20 deletions src/main/scala/org/hammerlab/args4s/PathHandler.scala
@@ -1,29 +1,9 @@
package org.hammerlab.args4s

import java.nio.file.{ Path JPath }

import org.hammerlab.paths.Path
import org.kohsuke.args4j.spi.Setter
import org.kohsuke.args4j.{ CmdLineParser, OptionDef }

/**
* Since [[Path]] is an [[AnyVal]], options with type [[Path]] end up as type [[java.nio.file.Path]] at run-time, and
* should be used with this [[Handler]].
*/
class JPathHandler(parser: CmdLineParser,
option: OptionDef,
setter: Setter[JPath])
extends Handler[JPath](
parser,
option,
setter,
"PATH",
Path(_).path
)

/**
* Options that have type [[Array[Path]]] will box [[Path]]s, and so should be fed this [[Handler]].
*/
class PathHandler(parser: CmdLineParser,
option: OptionDef,
setter: Setter[Path])
Expand Down
4 changes: 0 additions & 4 deletions src/main/scala/org/hammerlab/args4s/PathOptionHandler.scala
Expand Up @@ -4,10 +4,6 @@ import org.hammerlab.paths.Path
import org.kohsuke.args4j.spi.Setter
import org.kohsuke.args4j.{ CmdLineParser, OptionDef }

/**
* Options of type [[Option[Path]]] will box their [[Path]] during instantiation/assignment, so this [[Handler]] uses
* [[Path]] instead of [[java.nio.file.Path]] (see [[PathHandler]] / [[JPathHandler]]).
*/
class PathOptionHandler(parser: CmdLineParser,
option: OptionDef,
setter: Setter[Option[Path]])
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/org/hammerlab/args4s/ArgsTest.scala
Expand Up @@ -26,7 +26,7 @@ class Args {

@args4j.Option(
name = "--path",
handler = classOf[JPathHandler],
handler = classOf[PathHandler],
usage = "A path"
)
var path: Path = _
Expand Down

0 comments on commit bfa8a6e

Please sign in to comment.