semverse 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21b3c8db30c7ee7ea033ee1094f4d083c05d91b5
-  data.tar.gz: 32ebe9aea06834661b8c4c1600d80774df84edbd
+  metadata.gz: 73fe502f1b8e6b562437526465d0b8edf3d4b824
+  data.tar.gz: 15677e221b985d6a8d49c704158b5210a0762992
 SHA512:
-  metadata.gz: 8facb48c8c03629279d0d76582f0749d791e593aa80f1ba23f082385dfcd6d41a93d3608f762a5e50ec99c256c95ea7fce80d7b8d00f504bd28a7cedf5793a1c
-  data.tar.gz: 8b725358bc2fcbedd9f22fd26d77183042f0d18e811401e7bd6b715c7248e4ec2c3e20bd5bc8a6b04eda9de1fb2b6fb492d7275a2314ce8ca73ce9cc646eb566
+  metadata.gz: b49efa1971b45408cd1f5aee123b990df9ebfeb8e6efcea8f31ee7c4787e6af544138400dfd72bab9a468fa19b7731469976e35e9f3ce16b806370ac5c09f948
+  data.tar.gz: cf8e35b148d259c155891714306d50c5ef327acdde56776fd202470aa5c5c2a747358848e7230cef359d639f9989a22b55c1a3db18955f594770c51e70c58061

data/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2014, Jamie Winsor
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/lib/semverse/constraint.rb

@@ -74,71 +74,20 @@ module Semverse
       #
       # @return [Array, nil]
       def split(constraint)
-        if constraint =~ /^[0-9]/
-          operator = "="
-          version  = constraint
-        else
-          _, operator, version = REGEXP.match(constraint).to_a
-        end
+        data = REGEX.match(constraint)
 
-        if operator.nil?
+        if data.nil?
           raise InvalidConstraintFormat.new(constraint)
-        end
-
-        split_version = case version.to_s
-        when /^(\d+)\.(\d+)\.(\d+)(-([0-9a-z\-\.]+))?(\+([0-9a-z\-\.]+))?$/i
-          [ $1.to_i, $2.to_i, $3.to_i, $5, $7 ]
-        when /^(\d+)\.(\d+)\.(\d+)?$/
-          [ $1.to_i, $2.to_i, $3.to_i, nil, nil ]
-        when /^(\d+)\.(\d+)?$/
-          [ $1.to_i, $2.to_i, nil, nil, nil ]
-        when /^(\d+)$/
-          [ $1.to_i, nil, nil, nil, nil ]
         else
-          raise InvalidConstraintFormat.new(constraint)
+          [
+            data[:operator] || DEFAULT_OPERATOR,
+            data[:major].to_i,
+            data[:minor] && data[:minor].to_i,
+            data[:patch] && data[:patch].to_i,
+            data[:pre_release],
+            data[:build],
+          ]
         end
-
-        [ operator, split_version ].flatten
-      end
-
-      # @param [Semverse::Constraint] constraint
-      # @param [Semverse::Version] target_version
-      #
-      # @return [Boolean]
-      def compare_equal(constraint, target_version)
-        target_version == constraint.version
-      end
-
-      # @param [Semverse::Constraint] constraint
-      # @param [Semverse::Version] target_version
-      #
-      # @return [Boolean]
-      def compare_gt(constraint, target_version)
-        target_version > constraint.version
-      end
-
-      # @param [Semverse::Constraint] constraint
-      # @param [Semverse::Version] target_version
-      #
-      # @return [Boolean]
-      def compare_lt(constraint, target_version)
-        target_version < constraint.version
-      end
-
-      # @param [Semverse::Constraint] constraint
-      # @param [Semverse::Version] target_version
-      #
-      # @return [Boolean]
-      def compare_gte(constraint, target_version)
-        target_version >= constraint.version
-      end
-
-      # @param [Semverse::Constraint] constraint
-      # @param [Semverse::Version] target_version
-      #
-      # @return [Boolean]
-      def compare_lte(constraint, target_version)
-        target_version <= constraint.version
       end
 
       # @param [Semverse::Constraint] constraint
@@ -164,26 +113,43 @@ module Semverse
       end
     end
 
-    OPERATOR_TYPES = {
-      "~>" => :approx,
-      "~"  => :approx,
-      ">=" => :greater_than_equal,
-      "<=" => :less_than_equal,
-      "="  => :equal,
-      ">"  => :greater_than,
-      "<"  => :less_than,
-    }.freeze
+    # The default constraint string.
+    #
+    # @return [String]
+    DEFAULT_OPERATOR = '='.freeze
 
-    COMPARE_FUNS = {
-      approx: method(:compare_approx),
-      greater_than_equal: method(:compare_gte),
-      greater_than: method(:compare_gt),
-      less_than_equal: method(:compare_lte),
-      less_than: method(:compare_lt),
-      equal: method(:compare_equal)
+    # The complete list of possible operators, paired with a proc to be used for
+    # evaluation.
+    #
+    # @example
+    #   OPERATORS['='].call(constraint, version)
+    #
+    # @return [Hash<String, Proc>]
+    OPERATORS = { #:nodoc:
+      '='  => ->(c, v) { v == c.version },
+      '!=' => ->(c, v) { v != c.version },
+      '>'  => ->(c, v) { v >  c.version },
+      '<'  => ->(c, v) { v <  c.version },
+      '>=' => ->(c, v) { v >= c.version },
+      '<=' => ->(c, v) { v <= c.version },
+      '~'  => method(:compare_approx),
+      '~>' => method(:compare_approx),
     }.freeze
 
-    REGEXP = /^(#{OPERATOR_TYPES.keys.join('|')})\s?(.+)$/
+    # This is a magical regular expression that matches the Semantic versioning
+    # specification found at http://semver.org. In addition to supporting all
+    # the possible versions, it also provides a named +match_data+ which makes
+    # it really delightful to work with.
+    #
+    # @return [Regexp]
+    REGEX = /\A
+      ((?<operator>(#{OPERATORS.keys.join('|')}))[[:space:]]*)?
+      (?<major>\d+)
+      (\.(?<minor>\d+))?
+      (\.(?<patch>\d+))?
+      (\-(?<pre_release>[0-9A-Za-z\-\.]+))?
+      (\+(?<build>[0-9A-Za-z\-\.]+))?
+    \z/x.freeze
 
     attr_reader :operator
     attr_reader :major
@@ -199,15 +165,10 @@ module Semverse
     attr_reader :version
 
     # @param [#to_s] constraint
-    def initialize(constraint = nil)
-      constraint = constraint.to_s
-      if constraint.nil? || constraint.empty?
-        constraint = '>= 0.0.0'
-      end
-
+    def initialize(constraint = '>= 0.0.0')
       @operator, @major, @minor, @patch, @pre_release, @build = self.class.split(constraint)
 
-      unless operator_type == :approx
+      unless ['~>', '~'].include?(@operator)
         @minor ||= 0
         @patch ||= 0
       end
@@ -221,15 +182,6 @@ module Semverse
       ])
     end
 
-    # @return [Symbol]
-    def operator_type
-      unless type = OPERATOR_TYPES.fetch(operator)
-        raise RuntimeError, "unknown operator type: #{operator}"
-      end
-
-      type
-    end
-
     # Returns true or false if the given version would be satisfied by
     # the version constraint.
     #
@@ -239,9 +191,11 @@ module Semverse
     def satisfies?(target)
       target = Version.coerce(target)
 
-      return false if !version.zero? && greedy_match?(target)
+      if !version.zero? && greedy_match?(target)
+        return false
+      end
 
-      compare(target)
+      OPERATORS[operator].call(self, target)
     end
 
     # dep-selector uses include? to determine if a version matches the
@@ -258,10 +212,16 @@ module Semverse
     end
     alias_method :eql?, :==
 
+    # The detailed string representation of this constraint.
+    #
+    # @return [String]
     def inspect
       "#<#{self.class.to_s} #{to_s}>"
     end
 
+    # The string representation of this constraint.
+    #
+    # @return [String]
     def to_s
       out =  "#{operator} #{major}"
       out << ".#{minor}" if minor
@@ -280,14 +240,9 @@ module Semverse
       # @param [Semverse::Version] target_version
       #
       def greedy_match?(target_version)
-        operator_type !~ /less/ && target_version.pre_release? && !version.pre_release?
-      end
-
-      # @param [Semverse::Version] target
-      #
-      # @return [Boolean]
-      def compare(target)
-        COMPARE_FUNS.fetch(operator_type).call(self, target)
+        !['<', '<='].include?(self.operator) &&
+        target_version.pre_release? &&
+        !version.pre_release?
       end
   end
 end

data/lib/semverse/gem_version.rb

@@ -1,3 +1,3 @@
 module Semverse
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semverse
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,7 +50,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Guardfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/semverse.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Jamie Winsor
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.