sem_version 1.3.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTBhNmE0MGMxY2ExYzg2NzFiMjIxYjE4ODJjOTNjMGVmZDM4MzNiMw==
+  data.tar.gz: !binary |-
+    OTcxOTA2ZWNmZTU3NzYxYzM5MzY4ODBhNzM0ZDIzMmRhZDkwYzk1ZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MmIxMGM1ODRkNTUxM2Q2MDAxNGUwOGEwMDlhNWU0MmQ1ODM5NGQ3YjU4ZmVm
+    ZDJmNDVkN2JkNzc1ZDdlZGYyN2U5MjI2YzVlODU5MzU3YmYxY2YwZDgwZDcw
+    ZTUwNDkwODc0OTRiMDMxNDdlNWU2YjMyNjc4NGU2MDk3YTY3NmM=
+  data.tar.gz: !binary |-
+    ZjI3ZGUxZDc5Y2NiNzBmNjkxNTRiN2JlZWYyYTI5NGRmOGI1OTMxYzVkYWYz
+    YTA4MjZhYTY4MjIxMzIwZjc2NGZhNjhiNTNmYzJmNWEzZTNkNWM2NDU5ZGQ2
+    MWM4NDA3NzRmMzM1MzJkNzI0MWUwMDIwYzc0NDc3YzNhYTJkZWQ=

data/README.md

@@ -3,13 +3,16 @@ SemVersion
 
 SemVersion is a gem to help parse, validate, modify, and compare [Semantic Versions](http://semver.org).
 
+Note that this version of the gem adheres to SemVer v2.0.0.
+If you want v1.0.0 behaviour, use the `semver-v1.0.0` branch.
+
 Parsing
 -------
 
 Parsing is easy:
 
 ```ruby
-v = SemVersion.new('1.2.3-pre.4+build.5')
+v = SemVersion.new('1.2.3-pre.4+metadata.5')
 
 v.major         # => 1
 v.minor         # => 2
@@ -17,9 +20,9 @@ v.patch         # => 3
 
 v.pre           # => 'pre.4'
 v.prerelease    # => 'pre.4'
-v.build         # => 'build.5'
+v.metadata      # => 'metadata.5'
 
-v.to_s          # => '1.2.3-pre.4+build.5'
+v.to_s          # => '1.2.3-pre.4+metadata.5'
 ```
 
 You can pass any valid semantic version string, as specified by [Semantic Versions](http://semver.org).
@@ -28,20 +31,20 @@ Invalid versions will raise an ArgumentError.
 You can also create a new SemVersion from an array or a hash, and serialise back to arrays and hashes.
 
 ```ruby
-v1 = SemVersion.new([1, 2, 3, 'pre.4', 'build.5'])
-v1.to_s          # => '1.2.3-pre.4+build.5'
-v1.to_a          # => [1, 2, 3, 'pre.4', 'build.5']
+v1 = SemVersion.new([1, 2, 3, 'pre.4', 'metadata.5'])
+v1.to_s          # => '1.2.3-pre.4+metadata.5'
+v1.to_a          # => [1, 2, 3, 'pre.4', 'metadata.5']
 
-v2 = SemVersion.new(1, 2, 3, nil, 'build.5')
-v2.to_s          # => '1.2.3+build.5'
-v2.to_a          # => [1, 2, 3, nil, 'build.5']
+v2 = SemVersion.new(1, 2, 3, nil, 'metadata.5')
+v2.to_s          # => '1.2.3+metadata.5'
+v2.to_a          # => [1, 2, 3, nil, 'metadata.5']
 
-v3 = SemVersion.new(:major => 1, :minor => 2, :patch => 3, :pre => 'pre.4', :build => 'build.5')
-v.to_s           # => '1.2.3-pre.4+build.5'
-v.to_h           # => {:major => 1, :minor => 2, :patch => 3, :pre => 'pre.4', :build => 'build.5'}
+v3 = SemVersion.new(:major => 1, :minor => 2, :patch => 3, :pre => 'pre.4', :metadata => 'metadata.5')
+v.to_s           # => '1.2.3-pre.4+metadata.5'
+v.to_h           # => {:major => 1, :minor => 2, :patch => 3, :pre => 'pre.4', :metadata => 'metadata.5'}
 
-v4 = SemVersion.new(:major => 1, :minor => 2, :patch => 3, :build => 'build.6')
-v4.to_h          # => {:major => 1, :minor => 2, :patch => 3, :build => 'build.6'}
+v4 = SemVersion.new(:major => 1, :minor => 2, :patch => 3, :metadata => 'metadata.6')
+v4.to_h          # => {:major => 1, :minor => 2, :patch => 3, :metadata => 'metadata.6'}
 ```
 
 You can also use `SemVersion()` as an alias for `SemVersion.new()`.
@@ -72,9 +75,9 @@ v = SemVersion.new('1.2.3')
 v.major = 3
 v.minor = 5
 v.pre = 'pre.2'
-v.build = 'build.x.7'
+v.metadata = 'metadata.x.7'
 
-v.to_s                           # => '3.5.1-pre.2+build.x.7'
+v.to_s                           # => '3.5.1-pre.2+metadata.x.7'
 
 v.major = -1                     # => ArgumentError
 v.major = 'a'                    # => ArgumentError
@@ -88,9 +91,9 @@ Comparing
 You can compare semantic versions using `<`, `>`, `<=`, `>=`, `==`, and `<=>`
 
 ```ruby
-SemVersion.new('1.2.3') < SemVersion.new('1.2.2')                  # => true
-SemVersion.new('1.2.3-pre.1') <= SemVersion.new('1.2.3-pre')       # => false
-SemVersion.new('1.2.3+build.11') > SemVersion.new('1.2.3+build.2') # => true
+SemVersion.new('1.2.3') < SemVersion.new('1.2.2')                        # => true
+SemVersion.new('1.2.3-pre.1') <= SemVersion.new('1.2.3-pre')             # => false
+SemVersion.new('1.2.3+metadata.11') > SemVersion.new('1.2.3+metadata.2') # => false
 ```
 
 Satisfying constraints
@@ -101,8 +104,8 @@ Constraints are in the form `"<comparison> <version>"`, e.g. ">= 1.2.2", "= 1.3"
 
 When using the pessimistic operation, `~>`, versions may be specified in the form `"x.y"` or `"x.y.z"` (with `"~> x.y"` meaning `">= x.y.0" && "< x+1.0.0"`, and `"~> x.y.z"` meaning `">= x.y.z" && "< x.y+1.0"`).
 
-When using the other operations, versions may be in the form `"x"`, `"x.y"`, or a full semantic version (including optional pre-release and build).
-In the former two cases, the missing versions out of minor and patch will be filled in with 0's, and the pre-release and build ignored.
+When using the other operations, versions may be in the form `"x"`, `"x.y"`, or a full semantic version (including optional pre-release and metadata).
+In the former two cases, the missing versions out of minor and patch will be filled in with 0's, and the pre-release and metadata ignored.
 
 ```ruby
 SemVersion.new('1.2.3').satisfies?('>= 1.2')         # => true
@@ -142,5 +145,5 @@ You can also load a set of core extensions using an optional require.
 require 'sem_version'
 require 'sem_version/core_ext'
 
-"1.2.3+pre.4-build.5".to_version
-```
+"1.2.3+pre.4-metadata.5".to_version
+```

data/lib/sem_version.rb

@@ -1,31 +1,31 @@
 class SemVersion
   include Comparable
 
-  VERSION = '1.3.0'
+  VERSION = '2.0.0'
 
   # Pattern allows min and patch to be skipped. We have to do extra checking if we want them
   SEMVER_REGEX = /^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([\dA-Za-z\-]+(?:\.[\dA-Za-z\-]+)*))?(?:\+([\dA-Za-z\-]+(?:\.[\dA-Za-z\-]+)*))?)?)?$/
-  PRE_BUILD_REGEX = /^[\dA-Za-z\-]+(\.[\dA-Za-z\-]+)*$/
+  PRE_METADATA_REGEX = /^[\dA-Za-z\-]+(\.[\dA-Za-z\-]+)*$/
 
-  attr_reader :major, :minor, :patch, :pre, :build
+  attr_reader :major, :minor, :patch, :pre, :metadata
   alias_method :prerelease, :pre
 
   # Format were raw bits are passed in is undocumented, and not validity checked
   def initialize(*args)
     if args.first.is_a?(String)
-      @major, @minor, @patch, @pre, @build = self.class.parse(args.first)
+      @major, @minor, @patch, @pre, @metadata = self.class.parse(args.first)
       # Validation should be handled at a string level by self.parse, but validate anyway
       validate
     elsif args.first.is_a?(Hash)
-      @major, @minor, @patch, @pre, @build = args.first.values_at(:major, :minor, :patch, :pre, :build)
+      @major, @minor, @patch, @pre, @metadata = args.first.values_at(:major, :minor, :patch, :pre, :metadata)
       # Allow :prerelease as well
       @pre ||= args.first[:prerelease]
       validate
     elsif args.first.is_a?(Array)
-      @major, @minor, @patch, @pre, @build = *args.first
+      @major, @minor, @patch, @pre, @metadata = *args.first
       validate
     else
-      @major, @minor, @patch, @pre, @build = *args
+      @major, @minor, @patch, @pre, @metadata = *args
       validate
     end
   end
@@ -65,10 +65,7 @@ class SemVersion
     pre = compare_sep(@pre, other.pre, true)
     return pre unless pre == 0
 
-    bui = compare_sep(@build, other.build, false)
-    return bui unless bui == 0
-
-    0
+    return 0
   end
 
   def satisfies?(constraint)
@@ -122,33 +119,33 @@ class SemVersion
   end
 
   def pre=(val)
-    unless val.nil? || (val.is_a?(String) && val =~ PRE_BUILD_REGEX)
+    unless val.nil? || (val.is_a?(String) && val =~ PRE_METADATA_REGEX)
       raise ArgumentError, "#{val} is not a valid pre-release version (must be nil, or a string following http://semver.org constraints)"
     end
     @pre = val
   end
   alias_method :prerelease=, :pre=
 
-  def build=(val)
-    unless val.nil? || (val.is_a?(String) && val =~ PRE_BUILD_REGEX)
-      raise ArgumentError, "#{val} is not a valid build version (must be nil, or a string following http://semver.org constraints)"
+  def metadata=(val)
+    unless val.nil? || (val.is_a?(String) && val =~ PRE_METADATA_REGEX)
+      raise ArgumentError, "#{val} is not a valid metadata string (must be nil, or a string following http://semver.org constraints)"
     end
-    @build = val
+    @metadata = val
   end
 
   def to_s
     r = "#{@major}.#{@minor}.#{@patch}"
     r << "-#{@pre}" if @pre
-    r << "+#{@build}" if @build
+    r << "+#{@metadata}" if @metadata
     r
   end
 
   def to_a
-    [@major, @minor, @patch, @pre, @build]
+    [@major, @minor, @patch, @pre, @metadata]
   end
 
   def to_h
-    h = [:major, :minor, :patch, :pre, :build].zip(to_a)
+    h = [:major, :minor, :patch, :pre, :metadata].zip(to_a)
     Hash[h.reject{ |k,v| v.nil? }]
   end
 
@@ -188,15 +185,15 @@ class SemVersion
     raise ArgumentError, "Invalid version (major is not an int >= 0)" unless @major.is_a?(Fixnum) && @major >= 0
     raise ArgumentError, "Invalid version (minor is not an int >= 0)" unless @minor.is_a?(Fixnum) && @minor >= 0
     raise ArgumentError, "Invalid version (patch is not an int >= 0)" unless @patch.is_a?(Fixnum) && @patch >= 0
-    unless @pre.nil? || (@pre.is_a?(String) && @pre =~ PRE_BUILD_REGEX)
+    unless @pre.nil? || (@pre.is_a?(String) && @pre =~ PRE_METADATA_REGEX)
       raise ArgumentError, "Invalid version (pre must be nil, or a string following http://semver.org contraints)"
     end
-    unless @build.nil? || (@build.is_a?(String) && @build =~ PRE_BUILD_REGEX)
-      raise ArgumentError, "Invalid version (build must be nil, or a string following http://semver.org contraints)"
+    unless @metadata.nil? || (@metadata.is_a?(String) && @metadata =~ PRE_METADATA_REGEX)
+      raise ArgumentError, "Invalid version (metadata must be nil, or a string following http://semver.org contraints)"
     end
   end
 end
 
 def SemVersion(*args)
   SemVersion.new(*args)
-end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sem_version
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Antony Male
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Semantic Version parsing, comparison, and constraint checking utility
   (e.g. ~> 1.2), as specified by http://semver.org/
@@ -25,27 +24,26 @@ files:
 homepage: https://github.com/canton7/sem_version
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ! 'SemVersion: Semantic version parsing and comparison, and constraint checking.
   See http://semver.org/'
 test_files: []