relaton-iso 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23cfcc3b3c94cf0988d6087a1afacb4bcc6065249b4f6785879e8242384bf00d
-  data.tar.gz: f973dc6ba692b89acd1c6b4f9f75b9261ca7aff09557ed58605a7b1b8e499719
+  metadata.gz: d9fb58ee6922939bd980b5ad1be1303c40a9e95639716dfd216f2c20233bf5cf
+  data.tar.gz: 5fabdb83385bbec3d0f0ff8177a2a3f2b1c2057767cee43ff43e112808f75c73
 SHA512:
-  metadata.gz: 8d88890b35c169076ceb3350eedb036116a4fe30403ae23e6e9300718d5cfd8d6d37f49a6724bdb2c4b459a7782bd429cab660d4a195bcef92ac0dc347021c6f
-  data.tar.gz: e68d82ea105bba5dc0ab989a35eb02062adefdb45302c17065f9b47b3bf3f3b6eb9ea4e3caa43177782235013f984ea6fe574cad8e95fe1a535319d63c8b573e
+  metadata.gz: '0747095c51e13eeefa343f5f1c7e46061f44599433efd96b45a5f8b244de8503d36c8b28bc7bcfa1bdb8b288af2fbac113d877042a3184dc5829df9ec81418fe'
+  data.tar.gz: 42030ceefefea56a5fa601a18c9906edfcb09068cc3d3e4b7880da6979baa5721158e900ea5eb7c7779e1e1f9d5aec95f1834c960b2bf4f9bc71aeb2719aeefa

data/bin/bundle

@@ -31,7 +31,7 @@ m = Module.new do
         bundler_version = a
       end
       next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
+      bundler_version = $1
       update_index = i
     end
     bundler_version
@@ -61,32 +61,41 @@ m = Module.new do
   end
 
   def bundler_version
-    @bundler_version ||= begin
+    @bundler_version ||=
       env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
   end
 
   def load_bundler!
     ENV["BUNDLE_GEMFILE"] ||= gemfile
 
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
+    activate_bundler
   end
 
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
+  def activate_bundler
     gem_error = activation_error_handling do
-      gem "bundler", bundler_version
+      gem "bundler", bundler_requirement
     end
     return if gem_error.nil?
     require_error = activation_error_handling do
       require "bundler/version"
     end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
     exit 42
   end
 

data/lib/relaton_iso/scrapper.rb

@@ -211,9 +211,12 @@ module RelatonIso
           type = case r_type
                  when "Previously", "Will be replaced by" then "obsoletes"
                  when "Corrigenda/Amendments", "Revised by", "Now confirmed"
-                   date << { type: "circulated",
-                     on: doc.xpath('//span[@class="stage-date"]').last.text }
-                   "updates"
+                   on = doc.xpath('//span[@class="stage-date"][contains(., "-")]').last
+                   if on
+                     date << { type: "circulated",
+                       on: on.text }
+                     "updates"
+                   end
                  else r_type
                  end
           if ["Now", "Now under review"].include?(type) then a

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug