lili 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e32f95d37ff463284e60641c74eb529926dc40
-  data.tar.gz: 3b35f665b17d6b8ccb9be17a6c0032bf682d6d31
+  metadata.gz: a6717ed5f3b2aa12e73512500ed7fa6a61bf28da
+  data.tar.gz: 2e4a3e884289d9aec9458f0e7e23fdff400beb4c
 SHA512:
-  metadata.gz: 727fdd8d218261f0ec1e73d906cf24ea84c5a30d641cb3af265c4ada6a51b08ee02ee38bde25e2e816b79503df4122e5ae076ea82a01bb6b0f083d0d1cb2b33b
-  data.tar.gz: d21725172cf867e550546380863b8fb8ac1b8c2da3f38496cf88f3bfd3aab2dc0640014dd05bf3cfb6f2f04511378a245d79e405bf38797cba20abf7852a12d1
+  metadata.gz: 1d9f9892f4208ffbf6b7679d14531751bd39183d4d7f2f19ecf7ebb5ef4f4c044398f3562c5ef43c4d7c1c5cff02e706bb1ce8bbc1136b2737eecbcced042b02
+  data.tar.gz: 7eb988af1865e3deca078f947e3655fa3b0f08decf1653333a33399e45380d46979dd5251d722566ace4bde516840ce5668e2daeda86270d7d65f12750c653b1

data/bin/lili

@@ -3,23 +3,19 @@
 require 'rubygems'
 require 'find'
 require 'optparse'
+require 'dotsmack'
 require 'yaml'
 require 'lili'
 
-IGNORE_FILENAME = '.lili-ignore'
-CONFIGURATION_FILENAME = '.lili-rc.yml'
-
 def main
   ignores = DEFAULT_IGNORES
 
-  filenames = ['.']
-
   configuration_flags = {}
 
   option = OptionParser.new do |option|
     option.banner = 'Usage: lili [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
 
@@ -36,59 +32,28 @@ 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
-
-  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"))
+  dotsmack = Dotsmack::Smacker.new(
+    dotignore = '.lili-ignore',
+    additional_ignores = ignores,
+    dotconfig = '.lili-rc.yml'
+  )
+
+  dotsmack.enumerate(filenames).each do |filename, config|
+    config =
+      if config.nil?
+        DEFAULT_CONFIGURATION.merge(configuration_flags)
+      else
+        DEFAULT_CONFIGURATION.merge(YAML.load(config)).merge(configuration_flags)
       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)
-
-      check(f, configuration)
-    end
+    check(filename, config)
   end
 end
 

data/lib/lili.rb

@@ -1,31 +1,52 @@
-require 'rubygems'
 require 'ptools'
 require 'line-detector'
 
-require 'version'
+require_relative 'version'
 
 DEFAULT_IGNORES = %w(
-  tmp/
-  \.hg/
-  \.svn/
-  \.git/
-  \.gitignore
-  node_modules/
-  bower_components/
-  target/
-  \.vagrant/
-  Gemfile\.lock
-  \.exe
-  \.bin
-  \.cmo
-  \.cmi
-  \.pdf
-  \.dot
-  \.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
+  *.svg
+  *.wav
+  *.mp3
 )
 
 #
@@ -33,9 +54,9 @@ DEFAULT_IGNORES = %w(
 # Only the earliest file pattern match's rule applies.
 #
 DEFAULT_RULES = [
-  [/[\.-]min\./, [/^none$/, /^false$/]],
-  [/\.(reg|bat|ps1|cs|fs|xaml|csproj|sln)$/, [/^crlf|none$/, /^true|false$/]],
-  [/.*/, [/^lf|none$/, /^true$/]]
+  ['*[.-]min.*', [/^none$/, /^false$/]],
+  ['*.{reg,cmd,bat,ps1,cs,fs,vbs,xaml,csproj,sln,aip}', [/^crlf|none$/, /^true|false$/]],
+  ['*', [/^lf|none$/, /^true$/]]
 ]
 
 DEFAULT_CONFIGURATION = {
@@ -63,7 +84,9 @@ class ALineEnding
   end
 
   def violate?(rules)
-    preferred = rules.select { |rule| filename =~ rule.first }.first[1]
+    preferred = rules.select do |rule|
+      Dotsmack::fnmatch?(rule.first, @filename)
+    end.first[1]
 
     preferred_line_ending = preferred[0]
     preferred_final_eol = preferred[1]
@@ -100,22 +123,21 @@ class ALineEnding
   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
+      configuration
+    end
 
-def self.check(filename, configuration = DEFAULT_CONFIGURATION)
   rules = configuration['rules']
 
   if !File.zero?(filename)
     line_ending = ALineEnding.parse(
       filename,
       LineDetector.report_of_file(filename)
-      )
+    )
 
     line_ending_difference = line_ending.violate?(rules)
 

data/lib/version.rb

@@ -2,5 +2,5 @@
 # LiLi
 #
 module LiLi
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lili
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -11,33 +11,47 @@ cert_chain: []
 date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ptools
+  name: line-detector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: line-detector
+  name: dotsmack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !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: line ending linter