code-cleaner 0.7 → 0.8

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=''^(Rakefile|Thorfile|.+\.(rb|rake|nake|thor|task))$'' BLACKLIST='/(vendor|gems)/' code-cleaner .
+WHITELIST=''^(Rakefile|Thorfile|.+\.(rb|rake|nake|thor|task|gemspec))$'' 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.

data/bin/code-cleaner

@@ -24,7 +24,7 @@ require "find"
 
 $-i = "" # Windows compatibility
 
-WHITELIST = Regexp.new(ENV["WHITELIST"] || '^(Rakefile|Thorfile|.+\.(rb|rake|nake|thor|task))$')
+WHITELIST = Regexp.new(ENV["WHITELIST"] || '^(Rakefile|Thorfile|.+\.(rb|rake|nake|thor|task|gemspec))$')
 BLACKLIST = Regexp.new(ENV["BLACKLIST"] || '/(vendor|gems)/')
 
 def permitted?(file)

data/code-cleaner.gemspec

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

@@ -48,7 +48,6 @@ if which code-cleaner &> /dev/null; then
           exit 1
         elif [ $exitstatus -eq 0 ] ; then
           printf "[\e[33mDONE\e[0m]\n"
-          git add "$file" # so the changes will be committed immediately
           sleep=true # otherwise it might not work
         else
           abort "Unexpected exit status $?"
@@ -58,9 +57,14 @@ if which code-cleaner &> /dev/null; then
       fi
     fi
   done
+
+  # otherwise it doesn't work time to time
+  $sleep && sleep 0.8
+  for file in $files; do
+    test -f "$file" && git add "$file" # so the changes will be committed immediately
+  done
 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

data/tasks.rb

@@ -9,5 +9,5 @@ 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))$'
+  task.config[:whitelist] = '(bin/[^/]+|.+\.(rb|rake|nake|thor|task|gemspec))$'
 end

data/tasks/code-cleaner.nake

@@ -32,7 +32,7 @@ Nake::Task.new("hooks:whitespace:install") do |task|
     options[:blacklist] = task.config[:blacklist] unless options[:blacklist]
 
     if File.exist?(".git/hooks/pre-commit")
-      abort "You must remove .git/hooks/pre-commit first!"
+      abort "The hook .git/hooks/pre-commit already exists. Run this task with --force if you want to overwrite it."
     else
       begin
         puts "Installing .git/hooks/pre-commit ..."

metadata

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