Fix spec folders structure

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

lib/guard/minitest.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'guard'
 require 'guard/plugin'
 

lib/guard/minitest/inspector.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Guard
   class Minitest
     class Inspector

lib/guard/minitest/notifier.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'guard/notifier'
 
 module Guard

lib/guard/minitest/reporter.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest'
 require 'guard/minitest/notifier'
 

lib/guard/minitest/reporters/old_reporter.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest'
 require 'guard/minitest/notifier'
 

lib/guard/minitest/runner.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'rubygems/requirement'
 
 module Guard

lib/guard/minitest/runners/old_runner.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'minitest/unit'
 require 'guard/minitest/notifier'
 

spec/guard/minitest/inspector_spec.rb → 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

spec/guard/minitest/version_spec.rb → 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