aspelllint 0.12 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a5eefbad23a767d260a1028cb6c2fdd660fba8
-  data.tar.gz: 04b3e94da6f57be352b3304bcd463f9e4a214b83
+  metadata.gz: a16d4d81e4c5531ccb781951bbdd71723fc6abc0
+  data.tar.gz: 6f7a0e906693a0ca63abac127649eb795adfb754
 SHA512:
-  metadata.gz: 79c31b6a2910b9580c34055157b9f5f507dc4342a3b3e4014f972a5a835e6c9ccce9f395d71029b5f5cb77ce862796544f93433ac5164ff1fb27c2c70d330f5d
-  data.tar.gz: 7d0184edc37425244d60f783bf38b3a378849325b38b357c468a262985ab54674ea9a2eeb6baee515c217008cbe815cc593d33150f110d2bdda268b19cf3f6af
+  metadata.gz: fc743aa0747bc4db0389e1e52a62880cbd58459daf4912c5d54ae2e766ad63c5a3fcd9fa8eb9e65fae504479f7ede124944a7885dd806627fd01e3f966a6f71b
+  data.tar.gz: 8b60a55f02e8d67c19597c7d3eb6378098213a49918927e08ef0550590878365118a269e08019bd3d9cf08c55a4b5643f3d18aad82f67da53413b8561f7bede7

data/bin/aspelllint

@@ -3,11 +3,9 @@
 require 'rubygems'
 require 'find'
 require 'optparse'
-require 'yaml'
+require 'dotsmack'
 require 'aspelllint'
 
-IGNORE_FILENAME = '.aspelllintignore'
-
 def main
   ignores = DEFAULT_IGNORES
 
@@ -16,7 +14,7 @@ def main
   option = OptionParser.new do |option|
     option.banner = 'Usage: aspelllint [options] [<files>|-]'
 
-    option.on('-i', '--ignore pattern', 'Ignore file names matching Ruby regex pattern') do |pattern|
+    option.on('-i', '--ignore pattern', 'Ignore file pattern (fnmatch)') do |pattern|
       ignores << pattern
     end
 
@@ -33,39 +31,23 @@ def main
 
   option.parse!
 
-  filenames = ARGV unless ARGV.empty?
-
-  if filenames.empty? || filenames == ['-'] then
-    check_stdin
-  else
-    recursive_filenames = []
-
-    filenames.each do |f|
-      if File.directory? f
-        recursive_filenames = recursive_filenames.concat(recursive_list(f, ignores))
-      else
-        recursive_filenames << f
-      end
+  filenames =
+    if ARGV == []
+      ['-']
+    else
+      ARGV
     end
 
-    recursive_filenames.each do |f|
-      dir = File.expand_path("..", f)
-
-      parent_of_home = File.expand_path("..", ENV["HOME"])
-
-      while dir != parent_of_home
-        ignore_file = dir + File::SEPARATOR + IGNORE_FILENAME
-
-        if File.exist?(ignore_file) then
-          ignores.concat(open(ignore_file).read.split("\n"))
-        end
-
-        dir = File.expand_path("..", dir)
-      end
+  dotsmack = Dotsmack::Smacker.new(
+    dotignore = '.aspelllintignore',
+    additional_ignores = ignores
+  )
 
-      if ignores.none? { |ignore| f =~ %r(#{ignore}) } then
-        check(f)
-      end
+  dotsmack.enumerate(filenames).each do |filename, _|
+    if filename == '-'
+      check_stdin
+    else
+      check(filename)
     end
   end
 end

data/lib/aspelllint.rb

@@ -1,56 +1,52 @@
-require 'rubygems'
 require 'ptools'
 require 'tempfile'
 
-require 'version'
-
-$stdout.sync = true
+require_relative 'version'
 
 DEFAULT_IGNORES = %w(
-  \.hg/
-  \.svn/
-  \.git/
-  \.aspelllintignore
-  \.gtdlintignore
-  \.gtdlintrc\.yml
-  node_modules/
-  bower_components/
-  target/
-  dist/
-  \.vagrant/
+  .hg
+  .svn
+  .git
+  .aspelllintignore
+  .gtdlintignore
+  .gtdlintrc.yml
+  node_modules
+  bower_components
+  target
+  dist
+  .vagrant
   Gemfile.lock
-  \.exe
-  \.bin
-  \.apk
-  \.ap_
-  res/
-  \.class
-  \.zip
-  \.jar
-  \.war
-  \.xpi
-  \.dmg
-  \.pkg
-  \.app
-  \.xcodeproj/
-  \.lproj/
-  \.xcassets/
-  \.pmdoc/
-  \.dSYM/
-  \.jad
-  \.cmo
-  \.cmi
-  \.png
-  \.gif
-  \.jpg
-  \.jpeg
-  \.tiff
-  \.ico
-  \.svg
-  \.dot
-  \.wav
-  \.min.js
-  -min\.js
+  *.exe
+  *.bin
+  *.apk
+  *.ap_
+  res
+  *.class
+  *.zip
+  *.jar
+  *.war
+  *.xpi
+  *.dmg
+  *.pkg
+  *.app
+  *.xcodeproj
+  *.lproj
+  *.xcassets
+  *.pmdoc
+  *.dSYM
+  *.jad
+  *.cmo
+  *.cmi
+  *.png
+  *.gif
+  *.jpg
+  *.jpeg
+  *.tiff
+  *.ico
+  *.svg
+  *.dot
+  *.wav
+  *[.-]min.*
 )
 
 #
@@ -83,14 +79,6 @@ class Misspelling
   end
 end
 
-def self.recursive_list(directory, ignores = DEFAULT_IGNORES)
-  Find.find(directory).reject do |f|
-    File.directory?(f) ||
-    ignores.any? { |ignore| f =~ /#{ignore}/ } ||
-    File.binary?(f)
-  end
-end
-
 def self.check_stdin
   contents = $stdin.read
 

data/lib/version.rb

@@ -2,5 +2,5 @@
 # Aspelllint
 #
 module Aspelllint
-  VERSION = '0.12'
+  VERSION = '0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspelllint
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: dotsmack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -279,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: spell check for large projects