From 583c38e46ac72a3f6d88a4a5f3928b097995f8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 21 Nov 2013 10:47:04 +0100
Subject: [PATCH] Fix spec folders structure

---
 Guardfile                                       | 2 +-
 lib/guard/minitest.rb                           | 1 -
 lib/guard/minitest/inspector.rb                 | 1 -
 lib/guard/minitest/notifier.rb                  | 1 -
 lib/guard/minitest/reporter.rb                  | 1 -
 lib/guard/minitest/reporters/old_reporter.rb    | 1 -
 lib/guard/minitest/runner.rb                    | 1 -
 lib/guard/minitest/runners/old_runner.rb        | 1 -
 spec/{ => lib}/guard/minitest/inspector_spec.rb | 4 ++--
 spec/{ => lib}/guard/minitest/notifier_spec.rb  | 0
 spec/{ => lib}/guard/minitest/runner_spec.rb    | 0
 spec/{ => lib}/guard/minitest/version_spec.rb   | 2 +-
 spec/{ => lib}/guard/minitest_spec.rb           | 0
 13 files changed, 4 insertions(+), 11 deletions(-)
 rename spec/{ => lib}/guard/minitest/inspector_spec.rb (83%)
 rename spec/{ => lib}/guard/minitest/notifier_spec.rb (100%)
 rename spec/{ => lib}/guard/minitest/runner_spec.rb (100%)
 rename spec/{ => lib}/guard/minitest/version_spec.rb (73%)
 rename spec/{ => lib}/guard/minitest_spec.rb (100%)

diff --git a/Guardfile b/Guardfile
index a0e834e..a0c1b72 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,5 +1,5 @@
 guard :minitest do
   watch(%r{^spec/(.*)_spec\.rb})
-  watch(%r{^lib/(.*/)?([^/]+)\.rb}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^(lib/.*/)?([^/]+)\.rb}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r{^spec/spec_helper\.rb})  { 'spec' }
 end
diff --git a/lib/guard/minitest.rb b/lib/guard/minitest.rb
index cd92685..427979c 100644
--- a/lib/guard/minitest.rb
+++ b/lib/guard/minitest.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'guard'
 require 'guard/plugin'
 
diff --git a/lib/guard/minitest/inspector.rb b/lib/guard/minitest/inspector.rb
index aaaaffc..2bbee99 100644
--- a/lib/guard/minitest/inspector.rb
+++ b/lib/guard/minitest/inspector.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Guard
   class Minitest
     class Inspector
diff --git a/lib/guard/minitest/notifier.rb b/lib/guard/minitest/notifier.rb
index 60214a2..5aaa0a9 100644
--- a/lib/guard/minitest/notifier.rb
+++ b/lib/guard/minitest/notifier.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'guard/notifier'
 
 module Guard
diff --git a/lib/guard/minitest/reporter.rb b/lib/guard/minitest/reporter.rb
index 91a302a..6f55ed9 100644
--- a/lib/guard/minitest/reporter.rb
+++ b/lib/guard/minitest/reporter.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest'
 require 'guard/minitest/notifier'
 
diff --git a/lib/guard/minitest/reporters/old_reporter.rb b/lib/guard/minitest/reporters/old_reporter.rb
index db0a441..6c7dfb1 100644
--- a/lib/guard/minitest/reporters/old_reporter.rb
+++ b/lib/guard/minitest/reporters/old_reporter.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest'
 require 'guard/minitest/notifier'
 
diff --git a/lib/guard/minitest/runner.rb b/lib/guard/minitest/runner.rb
index e3aa5ac..78a56f9 100644
--- a/lib/guard/minitest/runner.rb
+++ b/lib/guard/minitest/runner.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'rubygems/requirement'
 
 module Guard
diff --git a/lib/guard/minitest/runners/old_runner.rb b/lib/guard/minitest/runners/old_runner.rb
index 12d0883..66eb47a 100644
--- a/lib/guard/minitest/runners/old_runner.rb
+++ b/lib/guard/minitest/runners/old_runner.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest/unit'
 require 'guard/minitest/notifier'
 
diff --git a/spec/guard/minitest/inspector_spec.rb b/spec/lib/guard/minitest/inspector_spec.rb
similarity index 83%
rename from spec/guard/minitest/inspector_spec.rb
rename to spec/lib/guard/minitest/inspector_spec.rb
index 96af264..f957ceb 100644
--- a/spec/guard/minitest/inspector_spec.rb
+++ b/spec/lib/guard/minitest/inspector_spec.rb
@@ -7,7 +7,7 @@
   describe 'clean' do
 
     before do
-      @files_on_disk = Dir['spec/**/*_spec.rb'].sort#'spec/guard/minitest/inspector_spec.rb', 'spec/guard/minitest_spec.rb', 'spec/guard/minitest_spec.rb'].sort
+      @files_on_disk = Dir['spec/**/*_spec.rb'].sort
     end
 
     it "should add all test files under the given dir" do
@@ -31,7 +31,7 @@
     end
 
     it 'should remove duplication' do
-      inspector.clean(['spec/guard/minitest_spec.rb', 'spec/guard/minitest_spec.rb']).must_equal ['spec/guard/minitest_spec.rb']
+      inspector.clean(['spec/lib/guard/minitest_spec.rb', 'spec/lib/guard/minitest_spec.rb']).must_equal ['spec/lib/guard/minitest_spec.rb']
     end
 
     it 'should remove duplication (2)' do
diff --git a/spec/guard/minitest/notifier_spec.rb b/spec/lib/guard/minitest/notifier_spec.rb
similarity index 100%
rename from spec/guard/minitest/notifier_spec.rb
rename to spec/lib/guard/minitest/notifier_spec.rb
diff --git a/spec/guard/minitest/runner_spec.rb b/spec/lib/guard/minitest/runner_spec.rb
similarity index 100%
rename from spec/guard/minitest/runner_spec.rb
rename to spec/lib/guard/minitest/runner_spec.rb
diff --git a/spec/guard/minitest/version_spec.rb b/spec/lib/guard/minitest/version_spec.rb
similarity index 73%
rename from spec/guard/minitest/version_spec.rb
rename to spec/lib/guard/minitest/version_spec.rb
index 7eb882b..840baa3 100644
--- a/spec/guard/minitest/version_spec.rb
+++ b/spec/lib/guard/minitest/version_spec.rb
@@ -5,7 +5,7 @@
 
   describe 'VERSION' do
     it 'is the current version' do
-      Guard::MinitestVersion::VERSION.must_equal '2.1.1'
+      Guard::MinitestVersion::VERSION.must_equal '2.1.2'
     end
   end
 
diff --git a/spec/guard/minitest_spec.rb b/spec/lib/guard/minitest_spec.rb
similarity index 100%
rename from spec/guard/minitest_spec.rb
rename to spec/lib/guard/minitest_spec.rb