Move spec/walrat files up one level

As we no longer share the spec directory with Walrus, there is no need
to compartmentalize the Walrat files inside their own subdirectory.

Signed-off-by: Wincent Colaiuta <win@wincent.com>

diff --git a/spec/walrat/additions/proc_spec.rb b/spec/additions/proc_spec.rb
similarity index 95%
rename from spec/walrat/additions/proc_spec.rb
rename to spec/additions/proc_spec.rb
index aff4952ab589650df41307db3943844c62eb822e..4af8d9b5e802770724964fba28b8646e029e9a4a 100755 (executable)
--- a/spec/walrat/additions/proc_spec.rb
+++ b/spec/additions/proc_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe 'proc additions' do
   it 'responds to "to_parseable", "parse" and "memoizing_parse"' do

diff --git a/spec/walrat/additions/regexp_spec.rb b/spec/additions/regexp_spec.rb
similarity index 97%
rename from spec/walrat/additions/regexp_spec.rb
rename to spec/additions/regexp_spec.rb
index de344c68f19e361731bc99dc797d6eee96814845..d977b04e3cbde7f360654f7449423b8fc14edf59 100755 (executable)
--- a/spec/walrat/additions/regexp_spec.rb
+++ b/spec/additions/regexp_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 # For more detailed specification of the RegexpParslet behaviour see
 # regexp_parslet_spec.rb.

diff --git a/spec/walrat/additions/string_spec.rb b/spec/additions/string_spec.rb
similarity index 98%
rename from spec/walrat/additions/string_spec.rb
rename to spec/additions/string_spec.rb
index 2b5aa4d029885fe7fc4f4d7f03ba4c4461cd6ded..1b64550030347a775f1974ed77d984b8a8be11e0 100755 (executable)
--- a/spec/walrat/additions/string_spec.rb
+++ b/spec/additions/string_spec.rb
@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe String do
   describe '#to_class_name' do

diff --git a/spec/walrat/and_predicate_spec.rb b/spec/and_predicate_spec.rb
similarity index 96%
rename from spec/walrat/and_predicate_spec.rb
rename to spec/and_predicate_spec.rb
index fb5abdd3fc59724c667aa2d0d3e5088dbc9f4ba1..dd5da79a65a4e39d1c6c139e017bd889a2d3571b 100755 (executable)
--- a/spec/walrat/and_predicate_spec.rb
+++ b/spec/and_predicate_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper.rb', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::AndPredicate do
   subject { Walrat::AndPredicate.new('foo') }

diff --git a/spec/walrat/continuation_wrapper_exception_spec.rb b/spec/continuation_wrapper_exception_spec.rb
similarity index 95%
rename from spec/walrat/continuation_wrapper_exception_spec.rb
rename to spec/continuation_wrapper_exception_spec.rb
index a9b8ca6990188eb699ee1d7e6eb98d8675accba6..8af22799db953d6161d18b4cd8dc2a10ad8b559d 100755 (executable)
--- a/spec/walrat/continuation_wrapper_exception_spec.rb
+++ b/spec/continuation_wrapper_exception_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe 'creating a continuation wrapper exception' do
   it 'complains if initialized with nil' do

diff --git a/spec/walrat/grammar_spec.rb b/spec/grammar_spec.rb
similarity index 99%
rename from spec/walrat/grammar_spec.rb
rename to spec/grammar_spec.rb
index 9caa91afd0d223c0aa759837674a90f8c9c2526a..9e810ddaa0238a3ab6543720c031f6c3ae8ba909 100755 (executable)
--- a/spec/walrat/grammar_spec.rb
+++ b/spec/grammar_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::Grammar do
   describe '::rules' do

diff --git a/spec/walrat/match_data_wrapper_spec.rb b/spec/match_data_wrapper_spec.rb
similarity index 97%
rename from spec/walrat/match_data_wrapper_spec.rb
rename to spec/match_data_wrapper_spec.rb
index d133a3462f4d4d908777112fb4bac45ea11097ba..747d91642987c275e3df4d14ada581c738589b02 100755 (executable)
--- a/spec/walrat/match_data_wrapper_spec.rb
+++ b/spec/match_data_wrapper_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::MatchDataWrapper do
   before do

diff --git a/spec/walrat/memoizing_cache_spec.rb b/spec/memoizing_cache_spec.rb
similarity index 98%
rename from spec/walrat/memoizing_cache_spec.rb
rename to spec/memoizing_cache_spec.rb
index 9970b4b4ee523a46bccf0893bd81e8ce2f3596af..e3627973db5912c7c93351908d12062dfa5349f7 100755 (executable)
--- a/spec/walrat/memoizing_cache_spec.rb
+++ b/spec/memoizing_cache_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::MemoizingCache::NoValueForKey do
   it 'is a singleton' do

diff --git a/spec/walrat/node_spec.rb b/spec/node_spec.rb
similarity index 95%
rename from spec/walrat/node_spec.rb
rename to spec/node_spec.rb
index 7d4f033bc1f712700f5bf04e493b105316da5fea..e35987399ea5941cef1aef82d7ffa5ff80824484 100755 (executable)
--- a/spec/walrat/node_spec.rb
+++ b/spec/node_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::Node do
   it 'has behavior'

diff --git a/spec/walrat/not_predicate_spec.rb b/spec/not_predicate_spec.rb
similarity index 96%
rename from spec/walrat/not_predicate_spec.rb
rename to spec/not_predicate_spec.rb
index 5dd0535ab1fbef71dec1165afa99c3354527a90e..809afd44b94cc0a11fcef59ef4515e14116e1dcf 100755 (executable)
--- a/spec/walrat/not_predicate_spec.rb
+++ b/spec/not_predicate_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::NotPredicate do
   it 'complains on trying to parse a nil string' do

diff --git a/spec/walrat/parser_state_spec.rb b/spec/parser_state_spec.rb
similarity index 99%
rename from spec/walrat/parser_state_spec.rb
rename to spec/parser_state_spec.rb
index 3dea464a82a864d20190afaaa3b4890c1f92eef0..cecb7d4059d0b89972f3dd7e45be4707d512507f 100755 (executable)
--- a/spec/walrat/parser_state_spec.rb
+++ b/spec/parser_state_spec.rb
@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::ParserState do
   before do

diff --git a/spec/walrat/parslet_choice_spec.rb b/spec/parslet_choice_spec.rb
similarity index 97%
rename from spec/walrat/parslet_choice_spec.rb
rename to spec/parslet_choice_spec.rb
index 912743db9f2cb2cb3e6f4a416314fcf692369215..20766dedf51274f07dba3d44c0a4a9ab00efb3ca 100755 (executable)
--- a/spec/walrat/parslet_choice_spec.rb
+++ b/spec/parslet_choice_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::ParsletChoice do
   before do

diff --git a/spec/walrat/parslet_combining_spec.rb b/spec/parslet_combining_spec.rb
similarity index 99%
rename from spec/walrat/parslet_combining_spec.rb
rename to spec/parslet_combining_spec.rb
index 71199d49449d491f3a6f2943e5e682837d304fd6..6e758210226424dc92c77f6883c0b648965049e4 100755 (executable)
--- a/spec/walrat/parslet_combining_spec.rb
+++ b/spec/parslet_combining_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe 'using shorthand operators to combine String, Symbol and Regexp parsers' do
   it 'should be able to chain a String and a Regexp together' do

diff --git a/spec/walrat/parslet_merge_spec.rb b/spec/parslet_merge_spec.rb
similarity index 96%
rename from spec/walrat/parslet_merge_spec.rb
rename to spec/parslet_merge_spec.rb
index ab6b3e9993e205657f7a5f9fd2ace0607a381bcf..f74355a2cee303dfc460f8847cfb0ef66099ff90 100755 (executable)
--- a/spec/walrat/parslet_merge_spec.rb
+++ b/spec/parslet_merge_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::ParsletMerge do
   it 'should be able to compare for equality' do

diff --git a/spec/walrat/parslet_omission_spec.rb b/spec/parslet_omission_spec.rb
similarity index 97%
rename from spec/walrat/parslet_omission_spec.rb
rename to spec/parslet_omission_spec.rb
index b9c525d709d36a39490ff2ef0048f13ce7b99c81..a15e454375a060a40c9a1857c9ab55a51e777ed4 100755 (executable)
--- a/spec/walrat/parslet_omission_spec.rb
+++ b/spec/parslet_omission_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::ParsletOmission do
   it 'raises if "parseable" argument is nil' do

diff --git a/spec/walrat/parslet_repetition_spec.rb b/spec/parslet_repetition_spec.rb
similarity index 98%
rename from spec/walrat/parslet_repetition_spec.rb
rename to spec/parslet_repetition_spec.rb
index 262f9406b5887d91a04e8900d957fab5d6ebbfd0..cd22e45978a89d25c7128020bd0ecb81b13bb000 100755 (executable)
--- a/spec/walrat/parslet_repetition_spec.rb
+++ b/spec/parslet_repetition_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::ParsletRepetition do
   it 'raises if "parseable" argument is nil' do

diff --git a/spec/walrat/parslet_sequence_spec.rb b/spec/parslet_sequence_spec.rb
similarity index 97%
rename from spec/walrat/parslet_sequence_spec.rb
rename to spec/parslet_sequence_spec.rb
index e3f332090ba9311acef5c8a77ac1519e985f231f..b36e15f516f4bb28dae900537fc8e5ab9197cd0e 100755 (executable)
--- a/spec/walrat/parslet_sequence_spec.rb
+++ b/spec/parslet_sequence_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::ParsletSequence do
   before do

diff --git a/spec/walrat/parslet_spec.rb b/spec/parslet_spec.rb
similarity index 96%
rename from spec/walrat/parslet_spec.rb
rename to spec/parslet_spec.rb
index f5299f2d74848e6617a7b90352cb7c4b466fcfdd..81e7d5a7c6f4023d8e1dc3bd25d0e2de4a4c8823 100755 (executable)
--- a/spec/walrat/parslet_spec.rb
+++ b/spec/parslet_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::Parslet do
   it 'complains if sent "parse" message' do

diff --git a/spec/walrat/predicate_spec.rb b/spec/predicate_spec.rb
similarity index 97%
rename from spec/walrat/predicate_spec.rb
rename to spec/predicate_spec.rb
index 20ce903ebf2b26e5bb7a0e3348a072a29d7a097d..07a964488b8ac104ff9e4cf2d2e6f94d5c1d4541 100755 (executable)
--- a/spec/walrat/predicate_spec.rb
+++ b/spec/predicate_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::Predicate do
   it 'raises an ArgumentError if initialized with nil' do

diff --git a/spec/walrat/proc_parslet_spec.rb b/spec/proc_parslet_spec.rb
similarity index 97%
rename from spec/walrat/proc_parslet_spec.rb
rename to spec/proc_parslet_spec.rb
index 851a9a5049736b05b8cbef35943ac963411a198d..4caf89171336974310f50ac4d29941eeb678ebbc 100755 (executable)
--- a/spec/walrat/proc_parslet_spec.rb
+++ b/spec/proc_parslet_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::ProcParslet do
   before do

diff --git a/spec/walrat/regexp_parslet_spec.rb b/spec/regexp_parslet_spec.rb
similarity index 99%
rename from spec/walrat/regexp_parslet_spec.rb
rename to spec/regexp_parslet_spec.rb
index fde6d1a911b34da845c0f4410c652a789f48cb46..afc7e02589dc7938ef45c9debc5764d169e68366 100755 (executable)
--- a/spec/walrat/regexp_parslet_spec.rb
+++ b/spec/regexp_parslet_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::RegexpParslet do
   before do

diff --git a/spec/walrat/string_enumerator_spec.rb b/spec/string_enumerator_spec.rb
similarity index 98%
rename from spec/walrat/string_enumerator_spec.rb
rename to spec/string_enumerator_spec.rb
index 703a63df4cbe4363ea1b388ca13657991557f4bc..775ee0f11b53e9712675371f338ff0c92e7b9165 100755 (executable)
--- a/spec/walrat/string_enumerator_spec.rb
+++ b/spec/string_enumerator_spec.rb
@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::StringEnumerator do
   it 'raises an ArgumentError if initialized with nil' do

diff --git a/spec/walrat/string_parslet_spec.rb b/spec/string_parslet_spec.rb
similarity index 98%
rename from spec/walrat/string_parslet_spec.rb
rename to spec/string_parslet_spec.rb
index f512d1f3f7292946639683df28ec2d4ef7e4d3bd..b726f4a8213416304fa8d66af52425cf8ac735ae 100755 (executable)
--- a/spec/walrat/string_parslet_spec.rb
+++ b/spec/string_parslet_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::StringParslet do
   before do

diff --git a/spec/walrat/symbol_parslet_spec.rb b/spec/symbol_parslet_spec.rb
similarity index 96%
rename from spec/walrat/symbol_parslet_spec.rb
rename to spec/symbol_parslet_spec.rb
index c3e49045c7b03283cd02621f4ec4dfdde81ca542..4066aef188561605e91bfecd11ce7f0dfd3ed1a2 100755 (executable)
--- a/spec/walrat/symbol_parslet_spec.rb
+++ b/spec/symbol_parslet_spec.rb
@@ -20,7 +20,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Walrat::SymbolParslet do
   it 'should raise an ArgumentError if initialized with nil' do