From bad9d5364e36387a8dc78604ddba1d9e5af9c716 Mon Sep 17 00:00:00 2001 From: Takayuki Kamiyama Date: Tue, 24 Sep 2019 12:42:27 +0900 Subject: [PATCH 1/2] Change, =~ < match change. --- lib/prop/all.rb | 2 +- lib/prop/and.rb | 2 +- lib/prop/mail.rb | 2 +- lib/prop/not.rb | 2 +- lib/prop/or.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/prop/all.rb b/lib/prop/all.rb index 4c7ac5a..79f4ff5 100644 --- a/lib/prop/all.rb +++ b/lib/prop/all.rb @@ -20,7 +20,7 @@ def search three_act = /#{twice}/o begin - if str.match(three_act) || {}[:match] + if str =~ three_act printf('%2d : %s', f.lineno, str) puts '' end diff --git a/lib/prop/and.rb b/lib/prop/and.rb index d2a9d0a..eadb695 100644 --- a/lib/prop/and.rb +++ b/lib/prop/and.rb @@ -20,7 +20,7 @@ def search three_act2 = /^(?=.*#{twice})/o begin - if str.match(three_act2) || {}[:match] + if str =~ three_act2 printf('%2d : %s', f.lineno, str) puts '' end diff --git a/lib/prop/mail.rb b/lib/prop/mail.rb index 1cd1f09..ab8bf69 100644 --- a/lib/prop/mail.rb +++ b/lib/prop/mail.rb @@ -17,7 +17,7 @@ def search three_act = /^[^0-9][a-zA-Z0-9_]+([.][a-zA-Z0-9_]+)*[@][a-zA-Z0-9_]+([.][a-zA-Z0-9_]+)*[.][a-zA-Z]{2,4}$/o begin - if str.match(three_act) || {}[:match] + if str =~ three_act printf('%2d : %s', f.lineno, str) puts '' end diff --git a/lib/prop/not.rb b/lib/prop/not.rb index 9df3b09..1be6abb 100644 --- a/lib/prop/not.rb +++ b/lib/prop/not.rb @@ -20,7 +20,7 @@ def search three_act3 = /^(?!.*#{twice})/o begin - if str.match(three_act3) || {}[:match] + if str =~ three_act3 printf('%2d : %s', f.lineno, str) puts '' end diff --git a/lib/prop/or.rb b/lib/prop/or.rb index fea1c81..93b88e6 100644 --- a/lib/prop/or.rb +++ b/lib/prop/or.rb @@ -21,7 +21,7 @@ def search three_act4 = /(#{twice}|#{drive})/o begin - if str.match(three_act4) || {}[:match] + if str =~ three_act4 printf('%2d : %s', f.lineno, str) puts '' end From 6518e8c0741bc769290fe4a623f35d6507910837 Mon Sep 17 00:00:00 2001 From: Takayuki Kamiyama Date: Tue, 24 Sep 2019 12:48:47 +0900 Subject: [PATCH 2/2] Up, version up. --- lib/prop/version.rb | 2 +- mini_test/mini_test_version.rb | 2 +- test/test_version.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/prop/version.rb b/lib/prop/version.rb index 7a99eb6..db51a69 100644 --- a/lib/prop/version.rb +++ b/lib/prop/version.rb @@ -4,7 +4,7 @@ Encoding.default_internal = 'UTF-8' module Engine - VERSION = '1.0.12'.toutf8.freeze + VERSION = '1.0.12.1'.toutf8.freeze end __END__ diff --git a/mini_test/mini_test_version.rb b/mini_test/mini_test_version.rb index ef5b1e9..143574f 100644 --- a/mini_test/mini_test_version.rb +++ b/mini_test/mini_test_version.rb @@ -7,7 +7,7 @@ # Mini_test file load. class VersionTest < Minitest::Test def test_version - assert_equal Engine::VERSION, '1.0.12' + assert_equal Engine::VERSION, '1.0.12.1' end end diff --git a/test/test_version.rb b/test/test_version.rb index f47e6c6..a77a661 100644 --- a/test/test_version.rb +++ b/test/test_version.rb @@ -9,7 +9,7 @@ class TestVersion < Test::Unit::TestCase def setup @versions = Engine::VERSION - @version = '1.0.12' + @version = '1.0.12.1' end def test_new