pub_grub 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 642375a06f7dfaeb135540d21df24c7ce5f88cd531129207fd0fcfbc83959f6d
-  data.tar.gz: ba4089a2a03066e6d870bf59a8db5f946faf6021b80185f12a19de5909ef0089
+  metadata.gz: 312b4d6ab0235f22ead56c025d6ae557043af8f4e4b0ac7bbed1e0a219151a29
+  data.tar.gz: 7b9de23d87e9918d4a97b24ded5d1db9573e7693af34b737c2b66b46f93a9e76
 SHA512:
-  metadata.gz: 78e1a7ebc65582bcce5665b601d11850183b25eb4634cb3cf1c81057a7e1b8c52ca7e229ada3ca48e368bc5f1152d7572dedaf46d1eda2a0c9738e14174583c4
-  data.tar.gz: 0053dd74681d77f8936db09ba631b3aed9676f45bb12bd8f9555667ca7f450c2780c469294f9e03922c042f6b42979bc18a644df31bd595bffdaa0e549fc6c1c
+  metadata.gz: 2ceeb01137803054fb77b1fba533e21880c49b4ae3e4cbaed52887543137a641f9e4527a86e5840df725e96c9ed021b14f1dcf10233a8608f8eb1f84eb7c4e97
+  data.tar.gz: ce803cc3420bef9d78bd4745ad2e3829272dabb2b1083659e4de712f3a8ab1db4a9f990589a9405e251d0ed2f24d4e466fd035bea6d429ee366d05735cc1777c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_grub (0.3.1)
+    pub_grub (0.3.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/pub_grub/version_range.rb

@@ -79,27 +79,45 @@ module PubGrub
       compare_version(version) == 0
     end
 
-    # Returns verisons which are included by this range.
+    # Partitions passed versions into [lower, within, higher]
     #
     # versions must be sorted
-    def select_versions(versions)
-      if min
-        if include_min?
-          versions = versions.drop_while { |v| v < min }
+    def partition_versions(versions)
+      min_index =
+        if !min || versions.empty?
+          0
+        elsif include_min?
+          (0..versions.size).bsearch { |i| versions[i].nil? || versions[i] >= min }
         else
-          versions = versions.drop_while { |v| v <= min }
+          (0..versions.size).bsearch { |i| versions[i].nil? || versions[i] > min }
         end
-      end
 
-      if max
-        if include_max?
-          versions = versions.take_while { |v| v <= max }
+      lower = versions.slice(0, min_index)
+      versions = versions.slice(min_index, versions.size)
+
+      max_index =
+        if !max || versions.empty?
+          versions.size
+        elsif include_max?
+          (0..versions.size).bsearch { |i| versions[i].nil? || versions[i] > max }
         else
-          versions = versions.take_while { |v| v < max }
+          (0..versions.size).bsearch { |i| versions[i].nil? || versions[i] >= max }
         end
-      end
 
-      versions
+      [
+        lower,
+        versions.slice(0, max_index),
+        versions.slice(max_index, versions.size)
+      ]
+    end
+
+    # Returns verisons which are included by this range.
+    #
+    # versions must be sorted
+    def select_versions(versions)
+      return versions if any?
+
+      partition_versions(versions)[1]
     end
 
     def compare_version(version)

data/lib/pub_grub/version_union.rb

@@ -52,10 +52,14 @@ module PubGrub
       !!ranges.bsearch {|r| r.compare_version(version) }
     end
 
-    def select_versions(versions)
-      ranges.flat_map do |range|
-        range.select_versions(versions)
+    def select_versions(all_versions)
+      versions = []
+      ranges.inject(all_versions) do |acc, range|
+        lower, matching, higher = range.partition_versions(acc)
+        versions.concat matching
+        higher
       end
+      versions
     end
 
     def intersects?(other)

data/pub_grub.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "pub_grub"
-  spec.version       = "0.3.1"
+  spec.version       = "0.3.2"
   spec.authors       = ["John Hawthorn"]
   spec.email         = ["john@hawthorn.email"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pub_grub
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler