enlint 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22767de80b9fa973581afb14aa5443c9f6ed5f5d
-  data.tar.gz: 212a81cae4d05cebef59d4694aa99ccb37a30184
+  metadata.gz: e1f0469cab9473fbcdcc79df7e0517a04a8332e9
+  data.tar.gz: 271b8ed696b22de4b9d19d42b9170be43ee806c0
 SHA512:
-  metadata.gz: 406b8284ab6084930461a7a07cb7196a16a5319ab0e9669853e54228235fa3ba224122ec9569ddda10b49fe8dd55a4261f6d084edb649d12fb8405dddddbb753
-  data.tar.gz: 7bbd4dbd40d8a4aabd9126087e46d39ae20d278c8c21a026d748dd6809c0ad4b5a2eb1694697642ced91564cb991743184a42e9cf15709ecb149edd3b2996faf
+  metadata.gz: 02a97d6a57ac51cbfc9a254fe3925c377c6fc354aeedf7e29eedfe4d2be913045254891a57269ec55f7428d63a48fc3006ab9249a20199285ec90e2b364576b3
+  data.tar.gz: e6501d0a886ed76fd5839931475926dbf377cf5bc828ca3e67c6a861e9ea610502fac8c8de4a85e9235497a82b5d99a2f92dcb7d5509c89a0211355fe0b8bbb5

data/bin/enlint

@@ -3,23 +3,18 @@
 require 'rubygems'
 require 'find'
 require 'optparse'
-require 'yaml'
+require 'dotsmack'
 require 'enlint'
 
-IGNORE_FILENAME = '.enlintignore'
-CONFIGURATION_FILENAME = '.enlintrc.yml'
-
 def main
   ignores = DEFAULT_IGNORES
 
-  filenames = ['.']
-
   configuration_flags = {}
 
   option = OptionParser.new do |option|
     option.banner = 'Usage: enlint [options] [<files>]'
 
-    option.on('-i', '--ignore pattern', 'Ignore file names matching Ruby regex pattern') do |pattern|
+    option.on('-i', '--ignore pattern', 'Ignore file patterns (fnmatch)') do |pattern|
       ignores << pattern
     end
 
@@ -36,62 +31,21 @@ def main
 
   option.parse!
 
-  filenames = ARGV unless ARGV.empty?
-
-  recursive_filenames = []
-
-  filenames.each do |f|
-    if File.directory? f
-      recursive_filenames = recursive_filenames.concat(recursive_list(f, ignores))
+  filenames =
+    if ARGV == []
+      ['.']
     else
-      recursive_filenames << f
+      ARGV
     end
-  end
 
-  configuration_dotfile = DEFAULT_CONFIGURATION
+  dotsmack = Dotsmack::Smacker.new(
+    dotignore = '.enlintignore',
+    additional_ignores = ignores,
+    dotconfig = '.enlintrc.yml',
+  )
 
-  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
-
-    if ignores.none? { |ignore| f =~ %r(#{ignore}) } then
-      dir = File.expand_path("..", f)
-
-      parent_of_home = File.expand_path("..", ENV["HOME"])
-
-      while dir != parent_of_home
-        config_file = dir + File::SEPARATOR + CONFIGURATION_FILENAME
-
-        if File.exist?(config_file) then
-          configuration_dotfile = DEFAULT_CONFIGURATION.merge(YAML.load_file(config_file))
-          break
-        else
-          dir = File.expand_path("..", dir)
-        end
-      end
-
-      # Hack to Reset configuration when changing directories
-      configuration_dotfile = DEFAULT_CONFIGURATION unless File.exist?(dir + File::SEPARATOR + CONFIGURATION_FILENAME)
-
-      # Command line flags override dotfile settings
-      configuration = configuration_dotfile.merge(configuration_flags)
-
-      # puts "F: #{f}"
-      # puts "Configuration: #{configuration}"
-
-      check(f, configuration)
-    end
+  dotsmack.enumerate(filenames).each do |filename, config|
+    check(filename, config)
   end
 end
 

data/lib/enlint.rb

@@ -1,24 +1,51 @@
-require 'rubygems'
 require 'ptools'
+require 'yaml'
 
-require 'version'
+require_relative 'version'
 
 DEFAULT_IGNORES = %w(
-  \.hg/
-  \.svn/
-  \.git/
-  \.gitignore
-  node_modules/
-  \.vagrant/
-  Gemfile\.lock
-  \.exe
-  \.bin
-  \.pdf
-  \.png
-  \.jpg
-  \.jpeg
-  \.min.js
-  -min\.js
+  tmp
+  .hg
+  .svn
+  .git
+  .gitignore
+  node_modules
+  bower_components
+  target
+  dist
+  .vagrant
+  Gemfile.lock
+  *.exe
+  *.bin
+  *.apk
+  *.ap_
+  res
+  *.dmg
+  *.pkg
+  *.app
+  *.xcodeproj
+  *.lproj
+  *.xcassets
+  *.pmdoc
+  *.dSYM
+  *.class
+  *.zip
+  *.jar
+  *.war
+  *.xpi
+  *.jad
+  *.cmo
+  *.cmi
+  *.pdf
+  *.dot
+  *.png
+  *.gif
+  *.jpg
+  *.jpeg
+  *.tiff
+  *.ico
+  *.wav
+  *.mp3
 )
 
 #
@@ -26,10 +53,8 @@ DEFAULT_IGNORES = %w(
 # Only the earliest file pattern match's rule applies.
 #
 DEFAULT_RULES = [
-  [/\.reg$/, /(ascii|utf-16)/],
-  [/\.bat$/, /(ascii|utf-16)/],
-  [/\.ps1$/, /(ascii|utf-16)/],
-  [/.*/, /(utf-8|ascii|binary|unknown)/]
+  ['*.{reg,bat,ps1}', /(ascii|utf-16)/],
+  ['*', /(utf-8|ascii|binary|unknown)/]
 ]
 
 DEFAULT_CONFIGURATION = {
@@ -93,7 +118,9 @@ class AnEncoding
     if @empty
       false
     else
-      preferred = rules.select { |rule| filename =~ rule.first }.first[1]
+      preferred = rules.select do |rule|
+        Dotsmack::fnmatch?(rule.first, filename)
+      end.first[1]
 
       if ! (encoding =~ preferred)
         [encoding, preferred]
@@ -119,19 +146,16 @@ class AnEncoding
   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(filename, configuration = nil)
+  configuration =
+    if configuration.nil?
+      DEFAULT_CONFIGURATION
+    else
+      DEFAULT_CONFIGURATION.merge(YAML.load(configuration))
+    end
 
-def self.check(filename, configuration = DEFAULT_CONFIGURATION)
   rules = configuration['rules']
 
-  # puts "Rules: #{rules}"
-
   line = `file #{MIME_FLAG} "#{filename}" 2>&1`
 
   encoding = AnEncoding.parse(filename, line)

data/lib/version.rb

@@ -2,5 +2,5 @@
 # EnLint
 #
 module EnLint
-  VERSION = '0.4'
+  VERSION = '0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enlint
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 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
@@ -257,7 +271,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:
   - - '>='
@@ -265,7 +279,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: encoding linter