Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add implicit `Ordering` for `SemVer`. Add methods to obtain the next major, minor and patch versions of a `Core`. Remove string extractor from `SemVer`, for consistency with other `Version` implementations.
- Loading branch information
Showing
10 changed files
with
203 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
semver/src/main/scala/lgbt/princess/v/semver/extractors.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package lgbt.princess.v.semver | ||
|
|
||
| import lgbt.princess.v.semver.Identifiers._ | ||
|
|
||
| /** | ||
| * This extractor is for extracting the version core and pre-release identifiers | ||
| * of a SemVer version. If you want to extract build identifiers as well, | ||
| * use the [[:- `:-`]] extractor instead. Sadly, there is no way to have both | ||
| * functionalities in the same extractor. | ||
| */ | ||
| object - { | ||
|
|
||
| /** | ||
| * Extracts the version core and pre-release identifiers from a SemVer | ||
| * version. | ||
| */ | ||
| def unapply(sv: SemVer): Option[(Core, PreRelease)] = { | ||
| if (sv.build.isDefined || sv.preRelease.isEmpty) None | ||
| else Some((sv.core, sv.preRelease.get)) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This extractor is for extracting the version core of a SemVer version, | ||
| * and is for use specifically with the [[+ `+`]] extractor (which | ||
| * extracts the pre-release identifiers and build identifiers). If you | ||
| * only want to extract the core and pre-release identifiers, use the | ||
| * [[- `-`]] extractor instead. | ||
| */ | ||
| object :- { | ||
|
|
||
| /** | ||
| * Extracts the version core from a SemVer version and leaves the | ||
| * pre-release identifiers and build identifiers partially extracted. | ||
| */ | ||
| def unapply(sv: SemVer): Option[(Core, (PreRelease, Option[Build]))] = | ||
| sv match { | ||
| case SemVer(core, Some(preRelease), build) => Some((core, (preRelease, build))) | ||
| case _ => None | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This extractor is for extracting the version core and build | ||
| * identifiers of a SemVer version, or for extracting the pre-release | ||
| * identifiers and build-identifiers when the version core has already | ||
| * been extracted by the [[:- `:-`]] extractor. | ||
| */ | ||
| object + { | ||
|
|
||
| /** | ||
| * Extracts the version core and build identifiers from a SemVer | ||
| * version. | ||
| */ | ||
| def unapply(sv: SemVer): Option[(Core, Build)] = | ||
| sv match { | ||
| case SemVer(core, None, Some(build)) => Some((core, build)) | ||
| case _ => None | ||
| } | ||
|
|
||
| /** | ||
| * Extracts the pre-release identifiers and build identifiers from | ||
| * a partially extracted SemVer version. | ||
| */ | ||
| def unapply(arg: (PreRelease, Option[Build])): Option[(PreRelease, Build)] = | ||
| arg match { | ||
| case (preRelease, Some(build)) => Some((preRelease, build)) | ||
| case _ => None | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,9 @@ | ||
| package lgbt.princess.v | ||
|
|
||
| import scala.language.implicitConversions | ||
|
|
||
| /** | ||
| * This package contains the [[SemVer]] class for representing | ||
| * [[https://semver.org/ SemVer versions]], as well as symbolic | ||
| * methods for conveniently constructing and extracting SemVer | ||
| * versions. | ||
| */ | ||
| package object semver { | ||
| import Identifiers._ | ||
|
|
||
| /** | ||
| * This extractor is for extracting the version core and pre-release identifiers | ||
| * of a SemVer version. If you want to extract build identifiers as well, | ||
| * use the [[:- `:-`]] extractor instead. Sadly, there is no way to have both | ||
| * functionalities in the same extractor. | ||
| */ | ||
| object - { | ||
|
|
||
| /** | ||
| * Extracts the version core and pre-release identifiers from a SemVer | ||
| * version. | ||
| */ | ||
| def unapply(sv: SemVer): Option[(Core, PreRelease)] = { | ||
| if (sv.build.isDefined || sv.preRelease.isEmpty) None | ||
| else Some((sv.core, sv.preRelease.get)) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This extractor is for extracting the version core of a SemVer version, | ||
| * and is for use specifically with the [[+ `+`]] extractor (which | ||
| * extracts the pre-release identifiers and build identifiers). If you | ||
| * only want to extract the core and pre-release identifiers, use the | ||
| * [[- `-`]] extractor instead. | ||
| */ | ||
| object :- { | ||
|
|
||
| /** | ||
| * Extracts the version core from a SemVer version and leaves the | ||
| * pre-release identifiers and build identifiers partially extracted. | ||
| */ | ||
| def unapply(sv: SemVer): Option[(Core, (PreRelease, Option[Build]))] = | ||
| sv match { | ||
| case SemVer(core, Some(preRelease), build) => Some((core, (preRelease, build))) | ||
| case _ => None | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This extractor is for extracting the version core and build | ||
| * identifiers of a SemVer version, or for extracting the pre-release | ||
| * identifiers and build-identifiers when the version core has already | ||
| * been extracted by the [[:- `:-`]] extractor. | ||
| */ | ||
| object + { | ||
|
|
||
| /** | ||
| * Extracts the version core and build identifiers from a SemVer | ||
| * version. | ||
| */ | ||
| def unapply(sv: SemVer): Option[(Core, Build)] = | ||
| sv match { | ||
| case SemVer(core, None, Some(build)) => Some((core, build)) | ||
| case _ => None | ||
| } | ||
|
|
||
| /** | ||
| * Extracts the pre-release identifiers and build identifiers from | ||
| * a partially extracted SemVer version. | ||
| */ | ||
| def unapply(arg: (PreRelease, Option[Build])): Option[(PreRelease, Build)] = | ||
| arg match { | ||
| case (preRelease, Some(build)) => Some((preRelease, build)) | ||
| case _ => None | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * The core and pre-release identifiers of a SemVer version, | ||
| * without build identifiers. | ||
| */ | ||
| final class SemVerPreReleaseIntermediate private[semver] (private val self: SemVer) extends AnyVal { | ||
|
|
||
| /** @return a pre-release SemVer version with the given build identifiers. */ | ||
| def +(build: Build): SemVer = self.copy(build = Some(build)) | ||
|
|
||
| /** @return this pre-release SemVer version with no build identifiers. */ | ||
| @inline def toSemVer: SemVer = self | ||
|
|
||
| /** @return this pre-release SemVer version with no build identifiers. */ | ||
| @inline def withoutMetadata: SemVer = toSemVer | ||
| } | ||
|
|
||
| object SemVerPreReleaseIntermediate { | ||
| implicit def intermediateToSemVer(intermediate: SemVerPreReleaseIntermediate): SemVer = | ||
| intermediate.toSemVer | ||
| } | ||
| } | ||
| package object semver |
Oops, something went wrong.