code-cleaner 0.6 → 0.7

data/README.textile

@@ -24,7 +24,7 @@ Default behaviour is to ignore everything from vendor and gems directories and f
 You can change this behaviour by setting environment variables @BLACKLIST@ and @WHITELIST@. What you pass to these variables will be treated as a regular expression. The default behaviour respond to @BLACKLIST='/(vendor|gems)/'@ and @WHITELIST='\.(rb|rake|task|thor)$'@. Here's an example how you can use it:
 
 <pre>
-WHITELIST=''\.(rb|rake|nake|thor|task)$'' BLACKLIST='/(vendor|gems)/' code-cleaner .
+WHITELIST=''^(Rakefile|Thorfile|.+\.(rb|rake|nake|thor|task))$'' BLACKLIST='/(vendor|gems)/' code-cleaner .
 </pre>
 
 Note that these rules aren't applied for explicit arguments, so if you run @code-cleaner README.textile@, your readme actually will be normalized. It's because blacklisting and whitelisting rules are applied just on directories, so if you run @code-cleaner .@, your readme will stay untouched. Because of this reason @code-cleaner .@ and @code-cleaner *@ will be different.
@@ -73,6 +73,7 @@ end
 
 Also, if you project run in bundled environment, make sure you have your @bin@ or @script@ directory in your @$PATH@ or change the pre-commit hook to point to the right path to the @code-cleaner@. If you are using Nake or Thor, just specify @--path=bin@ resp. @--path=script@ as an option for the @hooks:whitespace:install@ If you are using Rake, you will have to do it manually.
 
+
 --encoding=utf-8
 --whitelist=pattern & --blacklist=pattern
 

data/bin/code-cleaner

@@ -24,7 +24,7 @@ require "find"
 
 $-i = "" # Windows compatibility
 
-WHITELIST = Regexp.new(ENV["WHITELIST"] || '\.(rb|rake|nake|thor|task)$')
+WHITELIST = Regexp.new(ENV["WHITELIST"] || '^(Rakefile|Thorfile|.+\.(rb|rake|nake|thor|task))$')
 BLACKLIST = Regexp.new(ENV["BLACKLIST"] || '/(vendor|gems)/')
 
 def permitted?(file)
@@ -129,6 +129,7 @@ rescue Errno::EAGAIN, EOFError
       # 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|\!)/) # 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}"
+        puts
       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

data/code-cleaner.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "code-cleaner"
-  s.version = "0.6"
+  s.version = "0.7"
   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

@@ -25,6 +25,8 @@ function abort() {
   exit 1
 }
 
+sleep=false
+
 # NOTE: we are using printf rather than echo because printf should be
 # more portable, each echo implementation has quite different behaviour
 if which code-cleaner &> /dev/null; then
@@ -47,7 +49,7 @@ if which code-cleaner &> /dev/null; then
         elif [ $exitstatus -eq 0 ] ; then
           printf "[\e[33mDONE\e[0m]\n"
           git add "$file" # so the changes will be committed immediately
-          sleep 0.1 # otherwise it might not work
+          sleep=true # otherwise it might not work
         else
           abort "Unexpected exit status $?"
         fi
@@ -59,3 +61,6 @@ if which code-cleaner &> /dev/null; then
 else
   abort "You have to have code-cleaner installed and the code-cleaner script has to be in your \$PATH ($PATH)"
 fi
+
+$sleep && sleep 0.1 # otherwise it might not work
+exit 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: code-cleaner
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: "0.7"
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
@@ -22,6 +22,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/code-cleaner
+- code-cleaner-0.7.gem
 - code-cleaner.gemspec
 - LICENSE
 - README.textile