From 5ca781f439e8d402ada7f51c31d21ba211f673b6 Mon Sep 17 00:00:00 2001
From: Dave Hall <dave.hall@skwashd.com>
Date: Thu, 15 Oct 2015 11:41:19 +1100
Subject: Add support for npm/composer caret and tilde condition extensions

---
 CREDITS                  |  1 +
 semantic_version/base.py | 17 ++++++++++++++++-
 tests/test_match.py      | 13 +++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index c700c77..619b6cc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -20,6 +20,7 @@ The project has received contributions from (in alphabetical order):
 * Raphaël Barrois <raphael.barrois+semver@polytechnique.org> (https://github.com/rbarrois)
 * Michael Hrivnak <mhrivnak@hrivnak.org> (https://github.com/mhrivnak)
 * Rick Eyre <rick.eyre@outlook.com> (https://github.com/rickeyre)
+* Dave Hall <skwadhd@gmail.com> (https://github.com/skwashd)
 
 
 Contributor license agreement
diff --git a/semantic_version/base.py b/semantic_version/base.py
index 982fcc8..e001005 100644
--- a/semantic_version/base.py
+++ b/semantic_version/base.py
@@ -392,8 +392,11 @@ class SpecItem(object):
     KIND_GTE = '>='
     KIND_GT = '>'
     KIND_NEQ = '!='
+    KIND_CARET = '^'
+    KIND_TILDE = '~'
 
-    re_spec = re.compile(r'^(<|<=|==|>=|>|!=)(\d.*)$')
+    caret = re.escape('^')
+    re_spec = re.compile(r'^(<|<=|==|>=|>|!=|{}|~)(\d.*)$'.format(caret))
 
     def __init__(self, requirement_string):
         kind, spec = self.parse(requirement_string)
@@ -436,9 +439,21 @@ class SpecItem(object):
             return version > self.spec
         elif self.kind == self.KIND_NEQ:
             return version != self.spec
+        elif self.kind == self.KIND_CARET:
+            return self.caretCompare(version)
+        elif self.kind == self.KIND_TILDE:
+            return self.tildeCompare(version)
         else:  # pragma: no cover
             raise ValueError('Unexpected match kind: %r' % self.kind)
 
+    def caretCompare(self, version):
+        max_version = version.next_major()
+        return version >= self.spec and version < max_version
+
+    def tildeCompare(self, version):
+        max_version = version.next_minor()
+        return version >= self.spec and version < max_version
+
     def __str__(self):
         return '%s%s' % (self.kind, self.spec)
 
diff --git a/tests/test_match.py b/tests/test_match.py
index 6926e0a..73a2588 100755
--- a/tests/test_match.py
+++ b/tests/test_match.py
@@ -27,6 +27,8 @@ class MatchTestCase(unittest.TestCase):
         '>=0.1.2-rc1.3.4',
         '==0.1.2+build42-12.2012-01-01.12h23',
         '!=0.1.2-rc1.3-14.15+build.2012-01-01.11h34',
+        '^0.1.2',
+        '~0.1.2',
     ]
 
     matches = {
@@ -86,6 +88,17 @@ class MatchTestCase(unittest.TestCase):
             '0.1.1-rc4',
             '0.1.0+12.3',
         ],
+        '^0.1.2': [
+            '0.1.2',
+            '0.1.2+build4.5',
+            '0.1.3-rc1.3',
+            '0.2.0',
+        ],
+        '~0.1.2': [
+            '0.1.2',
+            '0.1.2+build4.5',
+            '0.1.3-rc1.3',
+        ],
     }
 
     def test_invalid(self):
-- 
cgit v1.2.1