spellr 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c33e39f748febedd7e1ea79110660774025c46bd8a0a3a2dfbfe9b412ee851
-  data.tar.gz: be3e631046aae5ba275e6c38e1e07d7d5d2c08de507d971fd4ef270a7520f4a6
+  metadata.gz: 52262546809e049a6c04f71c067d895e2cd83b865bc1371a4c9c489ca8b8b5b7
+  data.tar.gz: c75f1e3037419fb9e917cac1d808fa3f32a882f0c76bb2a871ddca8ac8b33ea3
 SHA512:
-  metadata.gz: 80499ae58b56c094a94722a34bf4e71d1ff5f5d38338d67ddc26f35759d30182e27580bea0e915b7402019438efb7d52e78f0146663185b5cf58c2f9dc4676d1
-  data.tar.gz: 9b99f2a650177b26e040c3e54aa6586d80175607e731564249edaa735ab23fa76867e86d1cdf9be869e22d375d694f2b0455e7f2a0a293ab3acb81ba99d2a1e4
+  metadata.gz: 12771b2588b7b8e2bfdfadec6c78cf4dd5f90000730451f8f8f7f066de77aba171a6227fa9c3a0ea914fb3dd7f33cd975b9dcfb2d73d0fb11a03898e460ed489
+  data.tar.gz: bfa05561e73da2b21fe6d2e7a138c8dfae8eda29dcadb83dd5c10e31b5d7b525b18161f8f9cd944b1d58ae1b46022ca2a4e4d05c7efad68d3363540714ca6b16

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.8.4
+- Update fast_ignore dependency, it's faster now (about 0.5s faster on rails codebase)
+
 # v0.8.3
 - Update fast_ignore dependency fixing symlinks to directories handling.
 

data/lib/.spellr.yml

@@ -44,6 +44,7 @@ languages:
       - Rakefile
       - config.ru
       - Capfile
+      - .simplecov
     hashbangs:
       - ruby
 

data/lib/spellr/file.rb

@@ -4,25 +4,6 @@ require 'pathname'
 
 module Spellr
   class File < Pathname
-    def self.wrap(file)
-      file.is_a?(Spellr::File) ? file : Spellr::File.new(file)
-    end
-
-    # don't use FastIgnore shebang handling
-    # because i use lots of different FastIgnore instances and each would to open the files.
-    def hashbang
-      @hashbang ||= begin
-        return if extname != ''
-        return unless first_line&.start_with?('#!')
-
-        first_line
-      end
-    end
-
-    def first_line
-      @first_line ||= each_line.first
-    end
-
     def relative_path
       @relative_path ||= relative_path_from(Spellr.pwd)
     end
@@ -34,6 +15,24 @@ module Spellr
       end
     end
 
+    # the bulk of this method is copied from fast_ignore
+    def first_line # rubocop:disable Metrics/MethodLength
+      return @first_line if defined?(@first_line)
+
+      @first_line = nil
+
+      file = ::File.new(to_s)
+      @first_line = file.sysread(25)
+      @first_line += file.sysread(50) until @first_line.include?("\n")
+      file.close
+      @first_line
+    rescue ::EOFError, ::SystemCallError
+      # :nocov:
+      file&.close
+      # :nocov:
+      @first_line
+    end
+
     def read_write
       write(yield read)
     end

data/lib/spellr/interactive_add.rb

@@ -18,7 +18,7 @@ module Spellr
     end
 
     def languages
-      @languages ||= Spellr.config.languages_for(token.location.file.to_path)
+      @languages ||= Spellr.config.languages_for(token.location.file)
     end
 
     def addable_languages

data/lib/spellr/language.rb

@@ -10,14 +10,10 @@ module Spellr
     attr_reader :name
     attr_reader :key
 
-    def initialize(name, key: name[0], includes: [], hashbangs: [], locale: [], addable: true) # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
+    def initialize(name, key: name[0], includes: [], hashbangs: [], locale: [], addable: true) # rubocop:disable Metrics/ParameterLists
       @name = name
       @key = key
-      @includes = includes
-      @hashbangs = hashbangs
-      @hashbang_pattern = unless hashbangs.empty?
-        /\A#!.*\b(?:#{hashbangs.map { |s| Regexp.escape(s) }.join('|')})\b/
-      end
+      @includes = includes + hashbangs.map { |h| "#!:#{h}" }
       @locales = Array(locale)
       @addable = addable
     end
@@ -26,10 +22,6 @@ module Spellr
       @addable
     end
 
-    def matches?(file)
-      matches_includes?(file) || matches_hashbangs?(file)
-    end
-
     def wordlists
       default_wordlists.select(&:exist?)
     end
@@ -41,24 +33,18 @@ module Spellr
       )
     end
 
-    private
-
-    def matches_hashbangs?(file)
-      return @includes.empty? unless @hashbang_pattern
-
-      file = Spellr::File.wrap(file)
-      return unless file.hashbang
+    def matches?(file)
+      return true if @includes.empty?
 
-      @hashbang_pattern.match?(file.hashbang)
+      fast_ignore.allowed?(file.to_s, directory: false, content: file.first_line)
     end
 
-    def matches_includes?(file)
-      return @hashbangs.empty? if @includes.empty?
+    private
 
+    def fast_ignore
       @fast_ignore ||= FastIgnore.new(
         include_rules: @includes, gitignore: false, root: Spellr.pwd_s
       )
-      @fast_ignore.allowed?(file.to_s)
     end
 
     def gem_wordlist

data/lib/spellr/line_location.rb

@@ -7,24 +7,22 @@ module Spellr
     attr_reader :line_number
     attr_reader :char_offset
     attr_reader :byte_offset
+    attr_reader :file
 
-    def initialize(file = '[String]', line_number = 1, char_offset: 0, byte_offset: 0)
-      @filename = file
+    def initialize(
+      file = ::Spellr::File.new('[string]'),
+      line_number = 1,
+      char_offset: 0,
+      byte_offset: 0
+    )
+      @file = file
       @line_number = line_number
       @char_offset = char_offset
       @byte_offset = byte_offset
     end
 
     def to_s
-      "#{file_relative_path}:#{line_number}"
-    end
-
-    def file_relative_path
-      file.relative_path
-    end
-
-    def file
-      @file ||= Spellr::File.wrap(@filename)
+      "#{file.relative_path}:#{line_number}"
     end
   end
 end

data/lib/spellr/tokenizer.rb

@@ -7,9 +7,10 @@ require_relative 'line_tokenizer'
 
 module Spellr
   class Tokenizer
-    attr_reader :file
+    attr_reader :file, :filename
 
     def initialize(file, start_at: nil, skip_key: true)
+      @filename = file
       @start_at = start_at || ColumnLocation.new(line_location: LineLocation.new(file))
       @file = file.is_a?(StringIO) || file.is_a?(IO) ? file : ::File.new(file)
       @file.pos = @start_at.line_location.byte_offset
@@ -45,7 +46,7 @@ module Spellr
 
     def prepare_line(line, line_number, char_offset, byte_offset)
       line_location = LineLocation.new(
-        file, line_number, char_offset: char_offset, byte_offset: byte_offset
+        filename, line_number, char_offset: char_offset, byte_offset: byte_offset
       )
       column_location = ColumnLocation.new(line_location: line_location)
       Token.new(line, location: column_location)

data/lib/spellr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spellr
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/spellr.gemspec

@@ -41,6 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'tty_string', '>= 0.2.1'
   spec.add_development_dependency 'webmock', '~> 3.8'
 
-  spec.add_dependency 'fast_ignore', '>= 0.10.1'
+  spec.add_dependency 'fast_ignore', '>= 0.11.0'
   spec.add_dependency 'parallel', '~> 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spellr
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Dana Sherson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -315,7 +315,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Spell check your source code