lili 0.0 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68335b3856e8891e5ba3d9729ea8e92eed2128ac
-  data.tar.gz: f34b4e49f42c14e80e5e9602755ab2faaed50119
+  metadata.gz: 825e18c500816a2d445dfb055260438524253108
+  data.tar.gz: eea5d057b10768685ba6029968faf06e3157c820
 SHA512:
-  metadata.gz: ac0b6b22e3047b29c913d4b4abcf7bf8496d63d6433bf23cbc2c9ca7670fa100bbd4a2a7b8afdf4c39b7ac80d812a8daddf506857b41e5a962b28b9ffaf7bc03
-  data.tar.gz: d90796255691835e45d4f60d2305667e7bbc69af1a0bfa6d5e5ebbd7c94dd4f3c86cfac8c66792c29d3dbdbd71054a45baef12778aee4c2ca52863d57de320e3
+  metadata.gz: 51596df41d135cc6c70f8cc9312675be5ee490f3b97bb17c7e40e061726dfe9aacf033ba4e320f78217de834c84c89f4d6438047c2049c3f4461ce6452172925
+  data.tar.gz: 22cccb6757d4d6ba3d13b1f0c75420f3c91d546964ee90f5e21b1385877a988dd4149209ff8a26dbeb194f91b8d837d859a722b49ad6f4f9dd082dae73019bdc

data/bin/lili

@@ -1,16 +1,21 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'find'
 require 'optparse'
-
-require 'rubygems'
+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>]'
 
@@ -43,7 +48,48 @@ 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)
+
+      check(f, configuration)
+    end
+  end
 end
 
 begin

data/lib/lili.rb

@@ -8,7 +8,6 @@ DEFAULT_IGNORES = %w(
   \.hg/
   \.svn/
   \.git/
-  \.git
   \.gitignore
   node_modules/
   \.vagrant/
@@ -28,12 +27,17 @@ DEFAULT_IGNORES = %w(
 # Only the earliest file pattern match's rule applies.
 #
 DEFAULT_RULES = [
-  [/[\.-]min\./, /^none$/],
-  [/\.reg$/, /^crlf$/],
-  [/\.bat$/, /^crlf$/],
-  [/.*/, /^lf$/]
+  [/[\.-]min\./, [/^none$/, /^false$/]],
+  [/\.reg$/, [/^crlf|none$/, /^false$/]],
+  [/\.bat$/, [/^crlf|none$/, /^false$/]],
+  [/\.ps1$/, [/^crlf|none$/, /^false$/]],
+  [/.*/, [/^lf|none$/, /^true$/]]
 ]
 
+DEFAULT_CONFIGURATION = {
+  'rules' => DEFAULT_RULES
+}
+
 # Warning for files that do not exist
 NO_SUCH_FILE = 'does not exist'
 
@@ -42,22 +46,35 @@ NO_SUCH_FILE = 'does not exist'
 # Distinct from Ruby's built-in Encoding class.
 #
 class ALineEnding
-  attr_accessor :filename, :line_ending
+  attr_accessor :filename, :line_ending, :final_eol
 
-  def self.parse(filename, line_ending)
-    ALineEnding.new(filename, line_ending.to_s)
+  def self.parse(filename, report)
+    ALineEnding.new(filename, report.line_ending.to_s, report.final_eol.to_s)
   end
 
-  def initialize(filename, line_ending)
+  def initialize(filename, line_ending, final_eol)
     @filename = filename
     @line_ending = line_ending
+    @final_eol = final_eol
   end
 
   def violate?(rules)
     preferred = rules.select { |rule| filename =~ rule.first }.first[1]
 
-    if ! (line_ending =~ preferred)
-      [line_ending, preferred]
+    preferred_line_ending = preferred[0]
+    preferred_final_eol = preferred[1]
+
+    if ! (@line_ending =~ preferred_line_ending)
+      [@line_ending, preferred_line_ending]
+    elsif ! (@final_eol =~ preferred_final_eol)
+      [
+        if !final_eol
+          'with final eol'
+        else
+          'without final eol'
+        end,
+        preferred_final_eol
+      ]
     else
       false
     end
@@ -87,11 +104,13 @@ 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']
+
   if !File.zero?(filename)
     line_ending = ALineEnding.parse(
       filename,
-      LineDetector.detect_line_ending_of_file(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.0'
+  VERSION = '0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lili
 version: !ruby/object:Gem::Version
-  version: '0.0'
+  version: '0.1'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement