code-cleaner 0.1 → 0.2

data/bin/code-cleaner

@@ -114,7 +114,7 @@ status = 10
 # NOTE: if this shows as a bad idea, another way might be to put "/dev/null" resp. "NUL" on Windows to the ARGV
 begin
   STDIN.read_nonblock(1)
-rescue Errno::EAGAIN
+rescue Errno::EAGAIN, EOFError
   # The point of inspecting if STDIN and ARGV are empty is that we might
   # have an empty ARGF if anything passed and if so, it will wait for an interactive input which we don't want
   unless ARGV.empty?

data/code-cleaner.gemspec

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

@@ -12,6 +12,11 @@ echo "Entering pre-commit hook ..."
 # directory, but it isn't very good solution.
 files=$(git diff --staged --name-only 2> /dev/null || echo ".")
 
+function abort() {
+  printf "[\e[31mERROR\e[0m] $*\n"
+  exit 1
+}
+
 # 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
@@ -23,15 +28,19 @@ if which code-cleaner &> /dev/null; then
       # 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
         printf "[\e[32mCLEAN\e[0m]\n"
-      else
+      elif [ $? -eq 1 ]; then # something goes wrong
+        printf "[\e[31mERROR\e[0m]\n"
+        code-cleaner "$file" --apply-rules
+      elif [ $? -eq 0 ] ; then
         printf "[\e[33mDONE\e[0m]\n"
         git add "$file" # so the changes will be committed immediately
+      else
+        abort "Unexpected exit status $?"
       fi
     else
       printf "Skipping \"\e[36m$file\e[0m\"\n"
     fi
   done
 else
-  printf "[\e[31mERROR\e[0m] You have to install code-cleaner first!\n"
-  exit 1
+  abort "You have to install code-cleaner first!"
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: code-cleaner
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"