improved extra_grep

jish · Sep 13, 2014 · ac02861 · ac02861
1 parent 13618e4
commit ac02861
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lib/plugins/pre_commit/checks/before_all.rb b/lib/plugins/pre_commit/checks/before_all.rb
@@ -9,7 +9,7 @@ def files_filter(staged_files)
       end
 
       def extra_grep
-        %w{| grep -v //}
+        %w{-v //}
       end
 
       def message

diff --git a/lib/plugins/pre_commit/checks/console_log.rb b/lib/plugins/pre_commit/checks/console_log.rb
@@ -9,7 +9,7 @@ def files_filter(staged_files)
       end
 
       def extra_grep
-        %w{| grep -v //}
+        %w{-v //}
       end
 
       def message

diff --git a/lib/plugins/pre_commit/checks/gemfile_path.rb b/lib/plugins/pre_commit/checks/gemfile_path.rb
@@ -17,7 +17,7 @@ def pattern
       end
 
       def extra_grep
-        %w{| grep -v #}
+        %w{-v #}
       end
 
       def self.description

diff --git a/lib/pre-commit/checks/grep.rb b/lib/pre-commit/checks/grep.rb
@@ -33,7 +33,7 @@ def call(staged_files)
         staged_files = files_filter(staged_files)
         return if staged_files.empty?
         args = grep + [pattern] + staged_files
-        args << extra_grep if !extra_grep.nil? and extra_grep != ""
+        args += ["|", "grep"] + extra_grep if !extra_grep.nil? and !extra_grep.empty?
         errors = execute(args, success_status: false)
         errors and "#{message}#{errors}"
       end

diff --git a/test/unit/pre-commit/checks/grep_test.rb b/test/unit/pre-commit/checks/grep_test.rb
@@ -44,7 +44,7 @@
 
   it "respects extra_grep" do
     subject.instance_variable_set(:@pattern, "test")
-    subject.instance_variable_set(:@extra_grep, "| grep -v test")
+    subject.instance_variable_set(:@extra_grep, %w{-v test})
     subject.call([fixture_file('file_with_nb_space.rb')]).must_equal(nil)
   end