code-cleaner 0.4 → 0.5

data/bin/code-cleaner

@@ -127,13 +127,14 @@ rescue Errno::EAGAIN, EOFError
       # The trick with line.length == ARGF.pos is simple, IO#pos returns position
       # of last character which was readed by gets or similar method, so if
       # the position is same as is the line, then it has to be the first line.
-      if line.length == ARGF.pos && encoding && ! line.match(/^#.*coding/)
+      if line.length == ARGF.pos && encoding && ! line.match(/^#(.*coding|\!)/) # the \! should means shebang. TODO: if there is a shebang on the first line, check if encoding declaration is on the second line
         puts "# encoding: #{encoding}"
       end
       # You might be wondering WTF is going on, I'm editing files, so I have to use File.open, do the modification on the original content and then save it. The point is we used -i switch which is good for in place editing
        # flag that we actually changed the file
-      status = 0 if line.match(/^\s*\t\s*/) || ! line.match(/\n/)
-      puts line.gsub(/\t/, "  ").rstrip
+      normalized_line = line.gsub(/\t/, "  ").rstrip + "\n"
+      status = 0 if line != normalized_line
+      print normalized_line
     end
   end
 end

data/code-cleaner.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "code-cleaner"
-  s.version = "0.4"
+  s.version = "0.5"
   s.authors = ["Jakub Šťastný aka Botanicus"]
   s.homepage = "http://github.com/botanicus/code-cleaner"
   s.summary = "Remove trailing whitespace, append missing \\n and replace tabs by two spaces"

data/support/pre-commit.erb

@@ -6,6 +6,10 @@ echo "Entering pre-commit hook ..."
 # the following line if you have code-cleaner installed locally
 <% if options[:path].nil? %>#<% end %>export PATH="<%= options[:path] || "script" %>:$PATH"
 
+# Setup whitelisting & blacklisting
+<% if options[:whitelist].nil? %>#<% end %>export WHITELIST='<%= options[:whitelist] %>'
+<% if options[:blacklist].nil? %>#<% end %>export BLACKLIST='<%= options[:blacklist] %>'
+
 # If you haven't done any commit yet,
 # git diff will fail with following message:
 # fatal: No HEAD commit to compare with (yet)
@@ -28,15 +32,19 @@ if which code-cleaner &> /dev/null; then
     if test -f "$file" ; then # ignore files which was removed by git rm
       if code-cleaner "$file" --try-apply-rules &> /dev/null ; then
         printf "Normalizing \"\e[36m$file\e[0m\" "
-        code-cleaner "$file" --apply-rules &> /dev/null
+        code-cleaner "$file" --apply-rules <%= "--encoding=#{options[:encoding]} " if options[:encoding] %>&> /dev/null
+        exitstatus=$?
         # NOTE: we have to check the exit status directly,
         # so we can be sure that the command just wasn't found
-        if [ $? -eq 10 ]; then # code-cleaner exits with 0 if some changes were made
+        if [ $exitstatus -eq 10 ]; then # code-cleaner exits with 0 if some changes were made
           printf "[\e[32mCLEAN\e[0m]\n"
-        elif [ $? -eq 1 ]; then # something goes wrong
+        elif [ $exitstatus -eq 1 ]; then # something goes wrong
           printf "[\e[31mERROR\e[0m]\n"
-          code-cleaner "$file" --apply-rules
-        elif [ $? -eq 0 ] ; then
+          echo "code-cleaner \"$file\" --apply-rules <%= "--encoding=#{options[:encoding]} " if options[:encoding] %>"
+          code-cleaner "$file" --apply-rules <%= "--encoding=#{options[:encoding]} " if options[:encoding] %>
+          echo "Exited with status $?"
+          exit 1
+        elif [ $exitstatus -eq 0 ] ; then
           printf "[\e[33mDONE\e[0m]\n"
           git add "$file" # so the changes will be committed immediately
         else

data/tasks.rb

@@ -5,3 +5,9 @@ begin
 rescue LoadError
   abort "If you want to contribute to code-cleaner, you have to run ./tasks.rb hooks:whitespace:install first!"
 end
+
+Nake::Task["hooks:whitespace:install"].tap do |task|
+  task.config[:path] = "bin"
+  task.config[:encoding] = "utf-8"
+  task.config[:whitelist] = '(bin/[^/]+|.+\.(rb|rake|nake|thor|task))$'
+end

data/tasks/code-cleaner.nake

@@ -7,7 +7,11 @@ require "nake/task"
 # nake hooks:whitespace:install
 # nake hooks:whitespace:install --force
 # nake hooks:whitespace:install --path=script
+# nake hooks:whitespace:install --encoding=utf-8
+# nake hooks:whitespace:install --whitelist=pattern
+# nake hooks:whitespace:install --blacklist=pattern
 Nake::Task.new("hooks:whitespace:install") do |task|
+  task.config.declare(:path, :encoding, :whitelist, :blacklist)
   task.description = "Install hook for automatically removing trailing whitespace"
   task.define do |options = Hash.new|
     # --force
@@ -15,6 +19,18 @@ Nake::Task.new("hooks:whitespace:install") do |task|
       FileUtils.rm ".git/hooks/pre-commit"
     end
 
+    # --path=script
+    options[:path] = task.config[:path] unless options[:path]
+
+    # --encoding=utf-8
+    options[:encoding] = task.config[:encoding] unless options[:encoding]
+
+    # --whitelist=pattern
+    options[:whitelist] = task.config[:whitelist] unless options[:whitelist]
+
+    # --blacklist=pattern
+    options[:blacklist] = task.config[:blacklist] unless options[:blacklist]
+
     if File.exist?(".git/hooks/pre-commit")
       abort "You must remove .git/hooks/pre-commit first!"
     else

data/tasks/code-cleaner.thor

@@ -5,9 +5,12 @@ require "fileutils"
 # thor hooks:whitespace:install
 # thor hooks:whitespace:install --force
 # thor hooks:whitespace:install --path=script
+# nake hooks:whitespace:install --encoding=utf-8
+# nake hooks:whitespace:install --whitelist=pattern
+# nake hooks:whitespace:install --blacklist=pattern
 module Hooks
   class Whitespace < Thor
-    method_options :force => :boolean, :path => :string
+    method_options :force => :boolean, :path => :string, :encoding => :string, :whitelist => :string, :blacklist => :string
     desc "install", "Install hook for automatically removing trailing whitespace"
     def install
       # --force

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: code-cleaner
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2009-12-28 00:00:00 +01:00
+date: 2009-12-29 00:00:00 +01:00
 default_executable: code-cleaner
 dependencies: []
 
@@ -22,6 +22,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/code-cleaner
+- code-cleaner-0.4.gem
 - code-cleaner.gemspec
 - LICENSE
 - README.textile