goodcheck 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 93e66b881fded69a52ecf1d3c718ab3c8ae6856c45790d44fb1673b4c067a5ff
-  data.tar.gz: b7201e56bcf8256d911d3f8e58ba533b00e3d5f1ef34c7e13b45b12d90593dfb
+SHA1:
+  metadata.gz: 95c2a7244c21b8436b9b3069df313871905d2544
+  data.tar.gz: e2137ec229279936f5abed87dabff5a8dcd083ad
 SHA512:
-  metadata.gz: 86112f72e2fe74a4c26f14fd919b515538e2d3f671586cb8f21139b489df5beeafa4363f1424e603d4c8946c09e6f6848157aeb4676feb15d79228e26be947b4
-  data.tar.gz: c7f7023ccfda443654230c9762fa5f307b842e4c5596ad6833551159766272823310ef7b623677dae558c336773b3824df41b562a5720450613dae37cf0cbf6e
+  metadata.gz: 77025fef5bebc19bf8638f3aee6f9777e4bc6cfbb1b41ab0dd0e04b60190c33947d0b6a06ed053e136e80573bb05f71c240e0d036699544c53ab65e323fa5b7e
+  data.tar.gz: 93d155f4a8cbd50ec80412713c80ec7093a00de0635cad25db8451a37970ab20609ffc0b14d851e523d8a7a6480d30f71628873fd152c7968738ed4fc3c75473

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.4.5
+  - 2.4.6
   - 2.5.5
-  - 2.6.2
+  - 2.6.3

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## 1.5.1 (2019-05-08)
+
+* Regexp matching improvements
+* Performance improvements
+
 ## 1.5.0 (2019-03-18)
 
 * Add `exclude` option #43

data/README.md

@@ -22,7 +22,7 @@ $ gem install goodcheck
 
 Or you can use `bundler`!
 
-If you would not like to install Goodcheck to system (e.g. you would not like to install Ruby 2.4 or higher), you can use a docker image. [See below](#docker-image).
+If you would not like to install Goodcheck to system (e.g. you would not like to install Ruby 2.4 or higher), you can use a docker image. [See below](#docker-images).
 
 ## Quickstart
 

data/lib/goodcheck/analyzer.rb

@@ -12,34 +12,23 @@ module Goodcheck
       if block_given?
         issues = []
 
-        rule.patterns.each do |pattern|
-          scanner = StringScanner.new(buffer.content)
+        regexp = Regexp.union(*rule.patterns.map(&:regexp))
+        scanner = StringScanner.new(buffer.content)
 
-          break_head = pattern.regexp.source.start_with?("\\b")
-          after_break = true
-
-          until scanner.eos?
-            case
-            when scanner.scan(pattern.regexp)
-              next if break_head && !after_break
-
-              text = scanner.matched
-              range = (scanner.pos - text.bytesize) .. scanner.pos
-              unless issues.any? {|issue| issue.range == range }
-                issues << Issue.new(buffer: buffer, range: range, rule: rule, text: text)
-              end
-            when scanner.scan(/.\b/m)
-              after_break = true
-            else
-              scanner.scan(/./m)
-              after_break = false
-            end
+        while true
+          case
+          when scanner.scan_until(regexp)
+            text = scanner.matched
+            range = (scanner.pos - text.bytesize) .. scanner.pos
+            issues << Issue.new(buffer: buffer, range: range, rule: rule, text: text)
+          else
+            break
           end
         end
 
         issues.each(&block)
       else
-        enum_for(:scan, &block)
+        enum_for(:scan)
       end
     end
   end

data/lib/goodcheck/config_loader.rb

@@ -109,41 +109,10 @@ module Goodcheck
       Rule.new(id: id, patterns: patterns, justifications: justifications, globs: globs, message: message, passes: passes, fails: fails)
     end
 
-    def combine_literal_patterns(patterns, case_sensitive:)
-      return nil if patterns.empty?
-      literals = patterns.map do |pat|
-        str = pat.is_a?(String) ? pat : pat[:literal].to_s
-        Regexp.escape(str)
-      end
-      Pattern.regexp(literals.join('|'),
-                     case_sensitive: case_sensitive,
-                     multiline: false)
-    end
-
-    def literal_pattern?(pattern)
-      pattern.is_a?(String) || pattern[:literal]
-    end
-
-    def select_literal_pattern(patterns, case_sensitive:)
-      patterns.select do |pat|
-        if case_sensitive
-          literal_pattern?(pat) && case_sensitive?(pat)
-        else
-          literal_pattern?(pat) && !case_sensitive?(pat)
-        end
-      end
-    end
-
     def retrieve_patterns(hash)
-      pat_array = array(hash[:pattern])
-      non_literal = pat_array.reject { |pat| literal_pattern?(pat) }
-      patterns = non_literal.map { |pat| load_pattern(pat) }
-      [true, false].each do |boolean|
-        literal = select_literal_pattern(pat_array, case_sensitive: boolean)
-        comb_pat = combine_literal_patterns(literal, case_sensitive: boolean)
-        patterns << comb_pat if comb_pat
+      array(hash[:pattern]).map do |pat|
+        load_pattern(pat)
       end
-      patterns
     end
 
     def load_globs(globs)

data/lib/goodcheck/version.rb

@@ -1,3 +1,3 @@
 module Goodcheck
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goodcheck
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Regexp based customizable linter