spellr 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 90aae5e24ba00624fea110acb2efb0a796cbf154
-  data.tar.gz: f46b4df50970c2043937aab35e2771a96ee6a3f9
+SHA256:
+  metadata.gz: caf392b95976c2f8908a578a8d192e7869ef25686bc2b86a9bf8a05c61459d29
+  data.tar.gz: 9a8639a5ce3fe9850399168025e82ca63e16df3456f9b877c4331983f7b204bc
 SHA512:
-  metadata.gz: cc31f2cbe8f1870a4eae00d4fcf1dc88eaf905a5fc477605650c67a50768950da5cd3e6e845405c713be073104c778a4c2d50a1d377a2efb5da0329311c4ce09
-  data.tar.gz: 58763f377f33faa8465fe69e06558da8ed97eb783d3c814dcb642920aa7ecfa99d6ce6488df8e3acace87a9a8a77875ad278919e475246984354260a79ae69f5
+  metadata.gz: 397d2ac127b392658571003b2507393e373b3d0dc32854c5d7f6f12855ec3468d31e3014a01a0a4f17c2e8bc667c38470ce88e9efd6e98f8225584c6f4782637
+  data.tar.gz: 1dace40995b4ba4950c363c7ea80cbf211034e5069019a9449adc8ddf4a6ed704e8fb35d257ecbc23fb4c8403e42389136b3e4e0db0ed415eab5c21ba5e5f3d5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.1
+- remove unnecessary files
+
 # v0.3.0
 - interactive add to wordlist uses consistent letters rather than random numbers as keys
 - additional wordlists per language can no longer be defined

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    spellr (0.3.0)
+    spellr (0.3.1)
       fast_ignore
-      parallel
 
 GEM
   remote: https://rubygems.org/
@@ -46,6 +45,7 @@ GEM
     rubocop-rspec (1.35.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.1)
+    tty_string (0.1.0)
     unicode-display_width (1.6.0)
 
 PLATFORMS
@@ -60,6 +60,7 @@ DEPENDENCIES
   rubocop
   rubocop-rspec
   spellr!
+  tty_string
 
 BUNDLED WITH
    2.0.2

data/lib/spellr/line_tokenizer.rb

@@ -89,12 +89,12 @@ module Spellr
 
     def skip_nonwords # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       skip(NOT_EVEN_NON_WORDS_RE) ||
-        skip_uri_heuristically ||
-        skip_key_heuristically ||
-        skip(HEX_RE) ||
-        skip(URL_ENCODED_ENTITIES_RE) ||
         skip(SHELL_COLOR_ESCAPE_RE) ||
         skip(BACKSLASH_ESCAPE_RE) ||
+        skip(URL_ENCODED_ENTITIES_RE) ||
+        skip(HEX_RE) ||
+        skip_key_heuristically ||
+        skip_uri_heuristically ||
         skip(LEFTOVER_NON_WORD_BITS_RE) ||
         skip(REPEATED_SINGLE_LETTERS_RE) ||
         skip(SEQUENTIAL_LETTERS_RE)
@@ -102,21 +102,26 @@ module Spellr
 
     # I didn't want to do this myself. BUT i need something to heuristically match on, and it's difficult
     URL_RE = %r{
-      (?<scheme>//|https?://|s?ftp://|mailto:)?
-      (?<userinfo>[[:alnum:]]+(?::[[:alnum:]]+)?@)?
-      (?<hostname>(?:[[:alnum:]-]+(?:\\?\.[[:alnum:]-]+)+|localhost|\d{1,3}(?:.\d{1,3}){3}))
-      (?<port>:\d+)?
-      (?<path>/(?:[[:alnum:]=!$&\-/._\\]|%\h{2})+)?
-      (?<query>\?(?:[[:alnum:]=!$\-/.\\]|%\h{2})+(?:&(?:[[:alnum:]=!$\-/.\\]|%\h{2})+)*)?
-      (?<fragment>\#(?:[[:alnum:]=!$&\-/.\\]|%\h{2})+)?
+      (//|https?://|s?ftp://|mailto:)? # 0 scheme
+      ([[:alnum:]]+(?::[[:alnum:]]+)?@)? # 1 userinfo
+      (?:(?:[[:alnum:]-]+(?:\\?\.[[:alnum:]-]+)+|localhost|\d{1,3}(?:.\d{1,3}){3})) # 2 hostname
+      (?::\d+)? # 3 port
+      (/(?:[[:alnum:]=!$&\-/._\\]|%\h{2})+)? # 4 path
+      (?:\?(?:[[:alnum:]=!$\-/.\\]|%\h{2})+(?:&(?:[[:alnum:]=!$\-/.\\]|%\h{2})+)*)? # 5 query
+      (?:\#(?:[[:alnum:]=!$&\-/.\\]|%\h{2})+)? # 6 fragment
     }x.freeze
-    # unfortunately i have to match this regex a couple times because stringscanner doesn't give me matchdata
     def skip_uri_heuristically
       return unless skip_uri?
-      return unless match?(URL_RE)
+      return unless scan(URL_RE)
+
+      heuristic_failed = if RUBY_VERSION >= '2.5'
+        captures.all?(&:empty?)
+      else
+        # unfortunately i have to match this regex again because stringscanner doesn't give me matchdata
+        matched.match(URL_RE).captures.compact.all?(&:empty?)
+      end
 
-      captures = URL_RE.match(matched)
-      skip(URL_RE) if captures['scheme'] || captures['userinfo'] || captures['path']
+      unscan && false if heuristic_failed
     end
 
     # url unsafe base64 or url safe base64

data/lib/spellr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spellr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dana Sherson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,13 +109,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fast_ignore
+  name: tty_string
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: fast_ignore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,25 +144,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".spellr.yml"
-- ".spellr_wordlists/english.txt"
-- ".spellr_wordlists/lorem.txt"
-- ".spellr_wordlists/ruby.txt"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
 - bin/fetch_wordlist/english
 - bin/fetch_wordlist/ruby
-- bin/setup
 - exe/spellr
 - lib/.spellr.yml
 - lib/spellr.rb
@@ -184,8 +172,6 @@ files:
 - lib/spellr/version.rb
 - lib/spellr/wordlist.rb
 - lib/spellr/wordlist_reporter.rb
-- spellr.gemspec
-- wordlist
 - wordlists/dockerfile.txt
 - wordlists/html.txt
 - wordlists/javascript.txt
@@ -210,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Spell check your source code

data/.gitignore

@@ -1,3 +0,0 @@
-/.spellr_wordlists/generated/*
-.rspec_status
-pkg

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,186 +0,0 @@
-require: rubocop-rspec
-
-# Reference:
-# https://rubocop.readthedocs.io/en/latest/
-
-# Keep this in alphabetical order.
-# Each override should have a comment (even if it's just "default is bad")
-
-AllCops:
-  Exclude:
-    - db/schema*
-    - .bundle/**/*
-    - tmp/**/*
-  DisplayCopNames: true
-  DisplayStyleGuide: true
-  TargetRubyVersion: 2.5
-
-# all of our layout customisations are because we prefer indentation to be
-# always consistently 2 spaces, for blocks, scopes, multiline expressions, etc
-# e.g.
-# class Klass
-#   def method(arg1,
-#     arg2)
-#     value = if arg1 == 'value' && arg2 == 'value'
-#       method2
-#         .method(arg_a, arg_b,
-#           arg_c, arg_d, keyword1: true,
-#           keyword2: true) do
-#             @last = [
-#               arg_a, arg_b,
-#               arg_c, arg_d
-#             ]
-#           end
-#     end
-#     value
-#   end
-# end
-
-# to match our preference for consistent indentation
-Layout/AlignHash:
-  EnforcedLastArgumentHashStyle: always_ignore
-
-# to match our preference for consistent indentation
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-# to match our preference for consistent indentation
-Layout/BlockAlignment:
-  EnforcedStyleAlignWith: start_of_block
-
-# to match our preference for consistent indentation
-Layout/CaseIndentation:
-  EnforcedStyle: end
-
-# to match our preference for consistent indentation
-Layout/EndAlignment:
-  EnforcedStyleAlignWith: start_of_line
-
-# Aligning Assignments, etc makes diffs noisy
-Layout/ExtraSpacing:
-  AllowForAlignment: false
-
-# to match our preference for consistent indentation
-Layout/FirstArrayElementLineBreak:
-  Enabled: true
-
-# to match our preference for consistent indentation
-Layout/FirstHashElementLineBreak:
-  Enabled: true
-
-# to match our preference for consistent indentation
-Layout/IndentFirstArgument:
-  EnforcedStyle: consistent
-
-# to match our preference for consistent indentation
-Layout/IndentFirstArrayElement:
-  EnforcedStyle: consistent
-
-# to match our preference for consistent indentation
-Layout/IndentFirstHashElement:
-  EnforcedStyle: consistent
-
-# to match our preference for consistent indentation
-# and hanging assignment looks lost
-Layout/MultilineAssignmentLayout:
-  EnforcedStyle: same_line
-
-# this changes our preferred:
-#   value = if thing1 &&
-#     thing2
-# to:
-#   value = if thing1 &&
-#       thing2
-# even though the IndentationWidth is 2
-# but it's right most of the time so I put up with it
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-# Temporarily disable this spec as a recent change has broken it for us:
-# https://github.com/rubocop-hq/rubocop/issues/6254
-Layout/RescueEnsureAlignment:
-  Enabled: false
-
-Metrics:
-  CountComments: false
-
-Metrics/BlockLength:
-  ExcludedMethods:
-    - configure
-    - describe
-    - context
-    - it
-
-Metrics/LineLength:
-  Max: 120
-
-Naming/UncommunicativeMethodParamName:
-  AllowedNames: [_, io, id, to, by, 'on', in, at, ip, db]
-
-RSpec:
-  Enabled: true
-  Include:
-    - 'spec/**/*.rb'
-
-RSpec/DescribeClass:
-  Enabled: false
-
-# I misuse matchers often
-RSpec/ExpectActual:
-  Enabled: false
-
-RSpec/FilePath:
-  Enabled: false
-
-# Multiple expectations are useful
-# checking you've partially achieved something on the way to completely achieving it is useful for debugging failures
-RSpec/MultipleExpectations:
-  Enabled: false
-
-# It should be obvious from context. Chill out rubocop
-RSpec/NamedSubject:
-  Enabled: false
-
-
-# This matches the style we've been using all along (ever so slightly more frequently)
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-Style/CollectionMethods:
-  Enabled: true
-
-# we don't rdoc
-Style/Documentation:
-  Enabled: false
-
-# [a, b].include?(x) is more unclear than a == x || b == x
-Style/MultipleComparison:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false
-
-# we use %w{} pretty frequently
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    default: '{}'
-    '%w': '{}'
-    '%W': '{}'
-    '%i': '{}'
-    '%I': '{}'
-    '%r': '{}'
-
-# We want this to warn to force consistency within the codebase.
-Style/SafeNavigation:
-  Enabled: true
-
-# different methods calls that do exactly the same thing are a smell, regardless of semantics
-Style/SignalException:
-  EnforcedStyle: only_raise
-
-# this wants less descriptive names
-Style/SingleLineBlockParams:
-  Enabled: false

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.5.1

data/.spellr.yml

@@ -1,19 +0,0 @@
----
-ignore:
-  - wordlists/*
-only:
-  - '*.rb'
-  - '*.yml'
-  - '*.txt'
-  - Rakefile
-  - '*.md'
-  - '*.gemspec'
-  - Gemfile
-languages:
-  ruby:
-    only:
-      - README.md
-  lorem:
-    only:
-      - spec/*
-      - .spellr.yml

data/.spellr_wordlists/english.txt

@@ -1,123 +0,0 @@
-abc
-addable
-arg
-args
-baz
-bundler
-changelog
-charpos
-cli
-cmd
-codebase
-colours
-config
-configs
-css
-customisations
-cyclomatic
-def
-dict
-diffable
-diffs
-dockerfile
-downloader
-env
-eos
-eot
-erb
-exclusions
-exe
-executables
-exitstatus
-ext
-filename
-filenames
-foo
-gemfile
-gemspec
-getch
-git
-github
-gitignore
-gitignored
-gitkeep
-haml
-hashbang
-hashbangs
-hashbangs
-heuristically
-hml
-hostnames
-href
-htt
-ico
-inclusions
-jbuilder
-jpg
-json
-jsx
-klass
-localhost
-lstripped
-mailto
-marketplacer
-matcher
-matchers
-maths
-merchantability
-multiline
-newlines
-noninfringement
-nonwords
-optparse
-org
-param
-params
-png
-pwd
-rakefile
-rdoc
-readme
-redisplay
-repo
-rspec
-rubocop
-rvm
-scss
-shelljoin
-shellsplit
-shellwords
-sherson
-spellr
-stderr
-stdlib
-stdout
-str
-stringscanner
-strscan
-sublicense
-subwords
-sudo
-svg
-thu
-tlds
-tmp
-todo
-tokenize
-tokenizes
-tsx
-ttf
-txt
-uploader
-uri
-usr
-utf
-woff
-wordlist
-wordlists
-wordn't
-xdescribe
-xit
-xlsx
-yardoc
-yml

data/.spellr_wordlists/lorem.txt

@@ -1,4 +0,0 @@
-amet
-dolor
-ipsum
-lorem

data/.spellr_wordlists/ruby.txt

@@ -1,2 +0,0 @@
-matchdata
-pty

data/.travis.yml

@@ -1,10 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-before_install: gem install bundler

data/Rakefile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/console

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'spellr'
-require 'pry'
-
-Pry.start

data/bin/setup

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-bundle install

data/spellr.gemspec

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-lib = ::File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'spellr/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'spellr'
-  spec.version = Spellr::VERSION
-  spec.authors = ['Dana Sherson']
-  spec.email = ['robot@dana.sh']
-
-  spec.summary = 'Spell check your source code'
-  spec.homepage = 'http://github.com/robotdana/spellr'
-  spec.license = 'MIT'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(::File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec-eventually'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_dependency 'fast_ignore'
-  spec.add_dependency 'parallel'
-end

data/wordlist

@@ -1,2 +0,0 @@
-bar
-foo