Merge pull request #2050 from jwarwick/version_spec

Updated specs in Version

Author: ericmj

lib/elixir/lib/version.ex

@@ -68,7 +68,7 @@ defmodule Version do
   Returns `true` if `version` satisfies `requirement`, `false` otherwise.
   Raises a `Version.InvalidRequirement` exception if `requirement` is not
   parseable, or `Version.InvalidVersion` if `version` is not parseable.
-  If given an already parsed version and requirement this function wont
+  If given an already parsed version and requirement this function won't
   raise.
 
   ## Examples
@@ -107,7 +107,7 @@ defmodule Version do
   is returned
 
   Raises a `Version.InvalidVersion` exception if `version` is not parseable.
-  If given an already parsed version this function wont raise.
+  If given an already parsed version this function won't raise.
 
   ## Examples
 
@@ -280,7 +280,7 @@ defmodule Version do
       (?:\+([\d\w\-]+))?    # build
       $/x
 
-    @spec parse_requirement(String.t) :: Version.Requirement.t
+    @spec parse_requirement(String.t) :: {:ok, Version.Requirement.t} | :error
     def parse_requirement(source) do
       lexed = lexer(source, [])
       to_matchspec(lexed)
@@ -289,7 +289,7 @@ defmodule Version do
     defp nillify(""), do: nil
     defp nillify(o),  do: o
 
-    @spec parse_version(String.t) :: Version.matchable
+    @spec parse_version(String.t) :: {:ok, Version.matchable} | :error
     def parse_version(string, approximate? \\ false) when is_binary(string) do
       if parsed = Regex.run(@version_regex, string) do
         destructure [_, major, minor, patch, pre], parsed
@@ -473,7 +473,6 @@ defmodule Version do
     end
 
     defp matchable_to_string({ major, minor, patch, pre }) do
-      minor = if minor, do: "#{minor}", else: "0"
       patch = if patch, do: "#{patch}", else: "0"
       pre   = if pre != [], do: "-#{Enum.join(pre, ".")}"
       "#{major}.#{minor}.#{patch}#{pre}"