enlint 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1edaeaa418532489fb5c29243d713688c717e0
-  data.tar.gz: 88144e5d6feae44c1cc8357d67cb88efdbf98e43
+  metadata.gz: 22767de80b9fa973581afb14aa5443c9f6ed5f5d
+  data.tar.gz: 212a81cae4d05cebef59d4694aa99ccb37a30184
 SHA512:
-  metadata.gz: 2071abe5fc051fc7f7b8bd0183f7cf8b9a5203820b2a556a52aee4e7c4d0beebe5c8562d6c62af505707de0e31f2a9ec3802cb4c739a0782387c1a39e167d5d2
-  data.tar.gz: b2cbc3611556a4a39cc056ef88fb67a65af5a6b6b0c33feee2835fe0f454ae00998ccd85764a8f3dfa767cfbea31db2c64ec0c4e41b6d2d82b66dfc4d57cea74
+  metadata.gz: 406b8284ab6084930461a7a07cb7196a16a5319ab0e9669853e54228235fa3ba224122ec9569ddda10b49fe8dd55a4261f6d084edb649d12fb8405dddddbb753
+  data.tar.gz: 7bbd4dbd40d8a4aabd9126087e46d39ae20d278c8c21a026d748dd6809c0ad4b5a2eb1694697642ced91564cb991743184a42e9cf15709ecb149edd3b2996faf

data/bin/enlint

@@ -1,16 +1,21 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'find'
 require 'optparse'
-
-require 'rubygems'
+require 'yaml'
 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>]'
 
@@ -43,7 +48,51 @@ def main
     end
   end
 
-  recursive_filenames.each { |f| check f }
+  configuration_dotfile = DEFAULT_CONFIGURATION
+
+  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
+  end
 end
 
 begin

data/lib/enlint.rb

@@ -4,22 +4,21 @@ require 'ptools'
 require 'version'
 
 DEFAULT_IGNORES = %w(
-  .hg/
-  .svn/
-  .git/
-  .git
-  .gitignore
+  \.hg/
+  \.svn/
+  \.git/
+  \.gitignore
   node_modules/
-  .vagrant/
-  Gemfile.lock
-  .exe
-  .bin
-  .pdf
-  .png
-  .jpg
-  .jpeg
-  .min.js
-  -min.js
+  \.vagrant/
+  Gemfile\.lock
+  \.exe
+  \.bin
+  \.pdf
+  \.png
+  \.jpg
+  \.jpeg
+  \.min.js
+  -min\.js
 )
 
 #
@@ -28,30 +27,36 @@ DEFAULT_IGNORES = %w(
 #
 DEFAULT_RULES = [
   [/\.reg$/, /(ascii|utf-16)/],
+  [/\.bat$/, /(ascii|utf-16)/],
+  [/\.ps1$/, /(ascii|utf-16)/],
   [/.*/, /(utf-8|ascii|binary|unknown)/]
 ]
 
+DEFAULT_CONFIGURATION = {
+  'rules' => DEFAULT_RULES
+}
+
 # Warning for files that do not exist
 NO_SUCH_FILE = 'no such file'
 
 MAC_OS_X = RUBY_PLATFORM =~ /darwin/
 
 MIME_FLAG =
-  if MAC_OS_X then
+  if MAC_OS_X
     '--mime-encoding'
   else
     '-i'
   end
 
 PARSER =
-  if MAC_OS_X then
+  if MAC_OS_X
     /^(.+)\:\s+(.+)$/
   else
     /^.+\:\s+(.+);\s+charset=(.+)$/
   end
 
 DNE =
-  if MAC_OS_X then
+  if MAC_OS_X
     /^.+: cannot open `.+' (No such file or directory)$/
   else
     /ERROR\:/
@@ -65,7 +70,7 @@ class AnEncoding
   attr_accessor :filename, :empty, :encoding
 
   def self.parse(filename, file_line)
-    if file_line =~ DNE then
+    if file_line =~ DNE
       AnEncoding.new(filename, false, NO_SUCH_FILE)
     else
       match = file_line.match(PARSER)
@@ -85,12 +90,12 @@ class AnEncoding
 
   def violate?(rules)
     # Ignore empty files, which are considered binary.
-    if @empty then
+    if @empty
       false
     else
       preferred = rules.select { |rule| filename =~ rule.first }.first[1]
 
-      if ! (encoding =~ preferred) then
+      if ! (encoding =~ preferred)
         [encoding, preferred]
       else
         false
@@ -99,11 +104,11 @@ class AnEncoding
   end
 
   def to_s(encoding_difference = false)
-    if encoding_difference then
+    if encoding_difference
       observed = encoding_difference[0]
       preferred = encoding_difference[1].inspect
 
-      if observed == NO_SUCH_FILE then
+      if observed == NO_SUCH_FILE
         "#{@filename}: #{NO_SUCH_FILE}"
       else
         "#{@filename}: observed #{observed} preferred: #{preferred}"
@@ -122,14 +127,16 @@ def self.recursive_list(directory, ignores = DEFAULT_IGNORES)
   end
 end
 
-def self.check(filename, rules = DEFAULT_RULES)
+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)
 
   encoding_difference = encoding.violate?(rules)
 
-  if encoding_difference then
-    puts encoding.to_s(encoding_difference)
-  end
+  puts encoding.to_s(encoding_difference) if encoding_difference
 end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enlint
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -241,10 +241,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/enlint.rb
-- lib/version.rb
 - LICENSE.md
 - bin/enlint
+- lib/enlint.rb
+- lib/version.rb
 homepage: https://github.com/mcandre/enlint
 licenses:
 - FreeBSD
@@ -265,9 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: encoding linter
 test_files: []
-has_rdoc: