enlint 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dcac354178551b172cc03f7baab170db48007e
-  data.tar.gz: 6dc00dcf8c1d354599066f8d4bcd2e1047e929a1
+  metadata.gz: 2e1edaeaa418532489fb5c29243d713688c717e0
+  data.tar.gz: 88144e5d6feae44c1cc8357d67cb88efdbf98e43
 SHA512:
-  metadata.gz: ec8f8479a28d55276911c1223ae612349dae2a0487313cf5b9782b622c8cf43e18b9e48e5aa283a65020ab9841493c981b96e766482ad023e6f0f183329d04cc
-  data.tar.gz: 675ca015f2fe1eb712d8fabc58059a5a212c75d32e14c9d46729322a242d791be471cdc898bacf444a13b80e229491bd7cc5cd890fd7fff8e442146ffc5c76a5
+  metadata.gz: 2071abe5fc051fc7f7b8bd0183f7cf8b9a5203820b2a556a52aee4e7c4d0beebe5c8562d6c62af505707de0e31f2a9ec3802cb4c739a0782387c1a39e167d5d2
+  data.tar.gz: b2cbc3611556a4a39cc056ef88fb67a65af5a6b6b0c33feee2835fe0f454ae00998ccd85764a8f3dfa767cfbea31db2c64ec0c4e41b6d2d82b66dfc4d57cea74

data/lib/enlint.rb

@@ -18,7 +18,6 @@ DEFAULT_IGNORES = %w(
   .png
   .jpg
   .jpeg
-  .svg
   .min.js
   -min.js
 )
@@ -35,6 +34,29 @@ 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
+    '--mime-encoding'
+  else
+    '-i'
+  end
+
+PARSER =
+  if MAC_OS_X then
+    /^(.+)\:\s+(.+)$/
+  else
+    /^.+\:\s+(.+);\s+charset=(.+)$/
+  end
+
+DNE =
+  if MAC_OS_X then
+    /^.+: cannot open `.+' (No such file or directory)$/
+  else
+    /ERROR\:/
+  end
+
 #
 # Parse, model, and print an encoding.
 # Distinct from Ruby's built-in Encoding class.
@@ -43,12 +65,12 @@ class AnEncoding
   attr_accessor :filename, :empty, :encoding
 
   def self.parse(filename, file_line)
-    if file_line =~ /ERROR\:/ then
+    if file_line =~ DNE then
       AnEncoding.new(filename, false, NO_SUCH_FILE)
     else
-      match = file_line.match(/^.+\:\s+(.+);\s+charset=(.+)$/)
+      match = file_line.match(PARSER)
 
-      empty = match[1] == 'inode/x-empty'
+      empty = match[1] == 'inode/x-empty' || match[2] == 'binary'
       encoding = match[2]
 
       AnEncoding.new(filename, empty, encoding)
@@ -101,7 +123,7 @@ def self.recursive_list(directory, ignores = DEFAULT_IGNORES)
 end
 
 def self.check(filename, rules = DEFAULT_RULES)
-  line = `file -i "#{filename}" 2>&1`
+  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.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enlint
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -220,6 +220,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: cowl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: See README.md for example usage
 email: andrew.pennebaker@gmail.com
 executables:
@@ -227,10 +241,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.md
-- bin/enlint
 - lib/enlint.rb
 - lib/version.rb
+- LICENSE.md
+- bin/enlint
 homepage: https://github.com/mcandre/enlint
 licenses:
 - FreeBSD
@@ -251,8 +265,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: encoding linter
 test_files: []
+has_rdoc: