semantic_range 2.0.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a72dfb5f4daf51c6e6d88874e8841c320d27dfaf
-  data.tar.gz: 90a11311eb49a841ca6a6d811dfd6e9e459e3064
+SHA256:
+  metadata.gz: ccde626c1a653687b8994fa8f79db2862c424e785e5f9947081481eadce45a21
+  data.tar.gz: d73b3387a5955017d9133f41a9ab844fb647805d206f1b5221e82ace813c68fb
 SHA512:
-  metadata.gz: 64ec8be0833eb08994a285705502f29973447291e91fb34655f38734d64bb3e00a3f9297c782fe6b856aa75800b4687a58edfe36036f6d7f1ef824881581be12
-  data.tar.gz: 355e05563a46f6258e0c3783dff2f9fa9dade4e00ce86af3d8f79643b9b64f82595aaee3e30154a629a67b7fbb2073c036c3801f7e06dba047008b4b98b4f142
+  metadata.gz: df892019675f0bd4c9b0d9e38dbc373201de7b7ee1a5e40f0aa0f6339d7915021476b01569aaa6e2ab4a903fa45c5fc6fa31449877a221be90bf155b6b2e7527
+  data.tar.gz: ca56913a665bc5b9adca0f5497331c11c190149ca1f6349fdc370f4fe4405cced341a19c95b991ded906fc6edd123022dbfd88aabbfef94f2637bde85c49410b

data/README.md

@@ -24,9 +24,10 @@ Or install it yourself as:
 SemanticRange.valid('1.2.3') # '1.2.3'
 SemanticRange.valid('a.b.c') # nil
 SemanticRange.clean('  =v1.2.3   ') # '1.2.3'
-SemanticRange.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') # true
-SemanticRange.gt('1.2.3', '9.8.7') # false
-SemanticRange.lt('1.2.3', '9.8.7') # true
+SemanticRange.filter(['0.9.0', '1.3.0', '1.5.0', '2.0.5'], '1.3.0 || <1.0.0 || >2.0.0') # ['0.9.0', '1.3.0', '2.0.5']
+SemanticRange.satisfies?('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') # true
+SemanticRange.gt?('1.2.3', '9.8.7') # false
+SemanticRange.lt?('1.2.3', '9.8.7') # true
 ```
 
 ## Development

data/lib/semantic_range.rb

@@ -50,12 +50,12 @@ module SemanticRange
   class InvalidComparator < StandardError; end
   class InvalidRange < StandardError; end
 
-  def self.ltr(version, range, loose = false, platform = nil)
-    outside(version, range, '<', loose, platform)
+  def self.ltr?(version, range, loose = false, platform = nil)
+    outside?(version, range, '<', loose, platform)
   end
 
-  def self.gtr(version, range, loose = false, platform = nil)
-    outside(version, range, '>', loose, platform)
+  def self.gtr?(version, range, loose = false, platform = nil)
+    outside?(version, range, '>', loose, platform)
   end
 
   def self.cmp(a, op, b, loose = false)
@@ -69,27 +69,27 @@ module SemanticRange
       b = b.version if !b.is_a?(String)
       a != b
     when '', '=', '=='
-      eq(a, b, loose)
+      eq?(a, b, loose)
     when '!='
-      neq(a, b, loose)
+      neq?(a, b, loose)
     when '>'
-      gt(a, b, loose)
+      gt?(a, b, loose)
     when '>='
-      gte(a, b, loose)
+      gte?(a, b, loose)
     when '<'
-      lt(a, b, loose)
+      lt?(a, b, loose)
     when '<='
-      lte(a, b, loose)
+      lte?(a, b, loose)
     else
       raise 'Invalid operator: ' + op
     end
   end
 
-  def self.outside(version, range, hilo, loose = false, platform = nil)
+  def self.outside?(version, range, hilo, loose = false, platform = nil)
     version = Version.new(version, loose)
     range = Range.new(range, loose, platform)
 
-    return false if satisfies(version, range, loose, platform)
+    return false if satisfies?(version, range, loose, platform)
 
     case hilo
     when '>'
@@ -114,15 +114,15 @@ module SemanticRange
 
         case hilo
         when '>'
-          if gt(comparator.semver, high.semver, loose)
+          if gt?(comparator.semver, high.semver, loose)
             high = comparator
-          elsif lt(comparator.semver, low.semver, loose)
+          elsif lt?(comparator.semver, low.semver, loose)
             low = comparator
           end
         when '<'
-          if lt(comparator.semver, high.semver, loose)
+          if lt?(comparator.semver, high.semver, loose)
             high = comparator
-          elsif gt(comparator.semver, low.semver, loose)
+          elsif gt?(comparator.semver, low.semver, loose)
             low = comparator
           end
         end
@@ -132,15 +132,15 @@ module SemanticRange
 
       case hilo
       when '>'
-        if (low.operator.empty? || low.operator == comp) && lte(version, low.semver, loose)
+        if (low.operator.empty? || low.operator == comp) && lte?(version, low.semver, loose)
           return false;
-        elsif (low.operator == ecomp && lt(version, low.semver, loose))
+        elsif (low.operator == ecomp && lt?(version, low.semver, loose))
           return false;
         end
       when '<'
-        if (low.operator.empty? || low.operator == comp) && gte(version, low.semver, loose)
+        if (low.operator.empty? || low.operator == comp) && gte?(version, low.semver, loose)
           return false;
-        elsif low.operator == ecomp && gt(version, low.semver, loose)
+        elsif low.operator == ecomp && gt?(version, low.semver, loose)
           return false;
         end
       end
@@ -148,14 +148,20 @@ module SemanticRange
     true
   end
 
-  def self.satisfies(version, range, loose = false, platform = nil)
+  def self.satisfies?(version, range, loose = false, platform = nil)
     return false if !valid_range(range, loose, platform)
     Range.new(range, loose, platform).test(version)
   end
 
+  def self.filter(versions, range, loose = false, platform = nil)
+    return [] if !valid_range(range, loose, platform)
+
+    versions.filter { |v| SemanticRange.satisfies?(v, range, loose, platform) }
+  end
+
   def self.max_satisfying(versions, range, loose = false, platform = nil)
     versions.select { |version|
-      satisfies(version, range, loose, platform)
+      satisfies?(version, range, loose, platform)
     }.sort { |a, b|
       rcompare(a, b, loose)
     }[0] || nil
@@ -191,27 +197,27 @@ module SemanticRange
     # TODO
   end
 
-  def self.lt(a, b, loose = false)
+  def self.lt?(a, b, loose = false)
     compare(a, b, loose) < 0
   end
 
-  def self.gt(a, b, loose = false)
+  def self.gt?(a, b, loose = false)
     compare(a, b, loose) > 0
   end
 
-  def self.eq(a, b, loose = false)
+  def self.eq?(a, b, loose = false)
     compare(a, b, loose) == 0
   end
 
-  def self.neq(a, b, loose = false)
+  def self.neq?(a, b, loose = false)
     compare(a, b, loose) != 0
   end
 
-  def self.gte(a, b, loose = false)
+  def self.gte?(a, b, loose = false)
     compare(a, b, loose) >= 0
   end
 
-  def self.lte(a, b, loose = false)
+  def self.lte?(a, b, loose = false)
     compare(a, b, loose) <= 0
   end
 
@@ -230,14 +236,14 @@ module SemanticRange
 
     return nil unless version.is_a?(String)
 
-    version.strip!
+    stripped_version = version.strip
 
-    return nil if version.length > MAX_LENGTH
+    return nil if stripped_version.length > MAX_LENGTH
 
     rxp = loose ? LOOSE : FULL
-    return nil if !rxp.match(version)
+    return nil if !rxp.match(stripped_version)
 
-    Version.new(version, loose)
+    Version.new(stripped_version, loose)
   end
 
   def self.increment!(version, release, loose, identifier)
@@ -267,4 +273,18 @@ module SemanticRange
       comp.map(&:to_s)
     end
   end
+
+  class << self
+    # Support for older non-inquisitive method versions
+    alias_method :gt, :gt?
+    alias_method :gtr, :gtr?
+    alias_method :gte, :gte?
+    alias_method :lt, :lt?
+    alias_method :ltr, :ltr?
+    alias_method :lte, :lte?
+    alias_method :eq, :eq?
+    alias_method :neq, :neq?
+    alias_method :outside, :outside?
+    alias_method :satisfies, :satisfies?
+  end
 end

data/lib/semantic_range/comparator.rb

@@ -2,12 +2,9 @@ module SemanticRange
   class Comparator
     attr_reader :semver, :operator, :value
     def initialize(comp, loose)
-      if comp.is_a?(Comparator)
-        return comp if comp.loose == loose
-        @comp = comp.value
-      end
-
+      comp = comp.value if comp.is_a?(Comparator)
       @loose = loose
+
       parse(comp)
 
       @value = @semver == ANY ? '' : @operator + @semver.version
@@ -32,5 +29,43 @@ module SemanticRange
 
       @semver = !m[2] ? ANY : Version.new(m[2], @loose)
     end
+
+    def intersects?(comp, loose = false, platform = nil)
+      comp = Comparator.new(comp, loose)
+
+      if @operator == ''
+        range_b = Range.new(comp.value, loose, platform)
+        SemanticRange.satisfies?(@value, range_b, loose, platform)
+      elsif comp.operator == ''
+        range_a = Range.new(@value, loose, platform)
+        SemanticRange.satisfies?(comp.semver, range_a, loose, platform)
+      else
+        same_direction_increasing      = (@operator == '>=' || @operator == '>') && (comp.operator == '>=' || comp.operator == '>')
+        same_direction_decreasing      = (@operator == '<=' || @operator == '<') && (comp.operator == '<=' || comp.operator == '<')
+        same_version                   = @semver.raw == comp.semver.raw
+        different_directions_inclusive = (@operator == '>=' || @operator == '<=') && (comp.operator == '>=' || comp.operator == '<=')
+        opposite_directions_lte        = SemanticRange.cmp(@semver, '<', comp.semver, loose) &&
+            ((@operator == '>=' || @operator == '>') && (comp.operator == '<=' || comp.operator == '<'))
+        opposite_directions_gte        = SemanticRange.cmp(@semver, '>', comp.semver, loose) &&
+            ((@operator == '<=' || @operator == '<') && (comp.operator == '>=' || comp.operator == '>'))
+
+        same_direction_increasing || same_direction_decreasing || (same_version && different_directions_inclusive) ||
+            opposite_directions_lte || opposite_directions_gte
+      end
+    end
+
+    def satisfies_range?(range, loose = false, platform = nil)
+      range = Range.new(range, loose, platform)
+
+      range.set.any? do |comparators|
+        comparators.all? do |comparator|
+          intersects?(comparator, loose, platform)
+        end
+      end
+    end
+
+    # Support for older non-inquisitive method versions
+    alias_method :intersects, :intersects?
+    alias_method :satisfies_range, :satisfies_range?
   end
 end

data/lib/semantic_range/range.rb

@@ -64,6 +64,9 @@ module SemanticRange
       # caret trim
       range = range.gsub(CARETTRIM, '\1^')
 
+      # comma trim
+      range = range.gsub(',', ' ')
+
       # normalise spaces
       range = range.split(/\s+/).join(' ')
 
@@ -279,5 +282,15 @@ module SemanticRange
 
       "#{from} #{to}".strip
     end
+
+    def intersects(range, loose = false, platform = nil)
+      range = Range.new(range, loose, platform)
+
+      @set.any? do |comparators|
+        comparators.all? do |comparator|
+          comparator.satisfies_range(range, loose, platform)
+        end
+      end
+    end
   end
 end

data/lib/semantic_range/version.rb

@@ -1,5 +1,5 @@
 module SemanticRange
-  VERSION = "2.0.0"
+  VERSION = "2.3.1"
 
   class Version
     attr_reader :major, :minor, :patch, :prerelease

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_range
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Andrew Nesbitt
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,36 +52,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: 
+description:
 email:
 - andrewnez@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - lib/semantic_range.rb
 - lib/semantic_range/comparator.rb
 - lib/semantic_range/pre_release.rb
 - lib/semantic_range/range.rb
 - lib/semantic_range/version.rb
-- semantic_range.gemspec
 homepage: https://libraries.io/github/librariesio/semantic_range
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.0.4
+signing_key:
 specification_version: 4
 summary: node-semver rewritten in ruby, for comparison and inclusion of semantic versions
   and ranges

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.4
-before_install: gem install bundler -v 1.11
-cache: bundler
-sudo: false

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at andrew@libraries.io. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/CONTRIBUTING.md

@@ -1,10 +0,0 @@
-# Contributing
-
- * Fork the project.
- * Make your feature addition or bug fix.
- * Add tests for it. This is important so I don't break it in a future version unintentionally.
- * Send a pull request. Bonus points for topic branches.
-
-## Code of Conduct
-
-Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.

data/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in semantic_range.gemspec
-gemspec
-gem 'guard-rspec'

data/Guardfile

@@ -1,87 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
-
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
-
-guard :bundler do
-  require 'guard/bundler'
-  require 'guard/bundler/verify'
-  helper = Guard::Bundler::Verify.new
-
-  files = ['Gemfile']
-  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
-
-  # Assume files are symlinked from somewhere
-  files.each { |file| watch(helper.real_path(file)) }
-end
-
-guard 'migrate' do
-  watch(%r{^db/migrate/(\d+).+\.rb})
-  watch('db/seeds.rb')
-end
-
-# Note: The cmd option is now required due to the increasing number of ways
-#       rspec may be run, below are examples of the most common uses.
-#  * bundler: 'bundle exec rspec'
-#  * bundler binstubs: 'bin/rspec'
-#  * spring: 'bin/rspec' (This will use spring if running and you have
-#                          installed the spring binstubs per the docs)
-#  * zeus: 'zeus rspec' (requires the server to be started separately)
-#  * 'just' rspec: 'rspec'
-
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # Feel free to open issues for suggestions and improvements
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-
-  # Rails files
-  rails = dsl.rails(view_extensions: %w(erb haml slim))
-  dsl.watch_spec_files_for(rails.app_files)
-  dsl.watch_spec_files_for(rails.views)
-
-  watch(rails.controllers) do |m|
-    [
-      rspec.spec.("routing/#{m[1]}_routing"),
-      rspec.spec.("controllers/#{m[1]}_controller"),
-      rspec.spec.("acceptance/#{m[1]}")
-    ]
-  end
-
-  # Rails config changes
-  watch(rails.spec_helper)     { rspec.spec_dir }
-  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
-  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
-
-  # Capybara features specs
-  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
-  watch(rails.layouts)       { |m| rspec.spec.("features/#{m[1]}") }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
-    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
-  end
-end

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "semantic_range"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/semantic_range.gemspec

@@ -1,24 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'semantic_range/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "semantic_range"
-  spec.version       = SemanticRange::VERSION
-  spec.authors       = ["Andrew Nesbitt"]
-  spec.email         = ["andrewnez@gmail.com"]
-
-  spec.summary       = %q{node-semver rewritten in ruby, for comparison and inclusion of semantic versions and ranges}
-  spec.homepage      = "https://libraries.io/github/librariesio/semantic_range"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 11.0"
-  spec.add_development_dependency "rspec", "~> 3.4"
-end