Update to RSpec 3.1.0

Surprisingly, little broke in the move from 1.3.0 to 3.1.0. Changes
included:

- simplify `require 'spec_helper'` statements
- kill some old lambdas
- change `expect`/`should` assertions to `expect`/`to`
- updates for new mock API
- update binstubs
- drop explicit `require 'rubygems'` from spec helper; we'll always run
  using `bin/rspec`
- tweak `pending` examples, as RSpec now complains if they have a block
  which doesn't raise an error

Note, we're still mostly using the deprecated `should` syntax. I'll
leave the move to `expect` for another moment.

diff --git a/.bundle/config b/.bundle/config
new file mode 100644 (file)
index 0000000..e66ea7b
--- /dev/null
+++ b/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

diff --git a/Gemfile.lock b/Gemfile.lock
index a7b2ee40825e7df2c90fd549235ed09aacc2e681..3969562119a639219b67e58b9e201e8a73892bcc 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,13 +6,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    rspec (1.3.0)
+    diff-lcs (1.2.5)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     yard (0.5.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec (= 1.3.0)
+  rspec (~> 3.1)
   walrat!
   yard

diff --git a/bin/autospec b/bin/autospec
deleted file mode 100755 (executable)
index 3d333e4..0000000
--- a/bin/autospec
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'autospec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec', 'autospec')

diff --git a/bin/bundler b/bin/bundler
new file mode 100755 (executable)
index 0000000..72c62ec
--- /dev/null
+++ b/bin/bundler
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('bundler', 'bundler')

diff --git a/bin/htmldiff b/bin/htmldiff
new file mode 100755 (executable)
index 0000000..c70e238
--- /dev/null
+++ b/bin/htmldiff
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'htmldiff')

diff --git a/bin/ldiff b/bin/ldiff
new file mode 100755 (executable)
index 0000000..8e3524a
--- /dev/null
+++ b/bin/ldiff
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'ldiff')

diff --git a/bin/rspec b/bin/rspec
new file mode 100755 (executable)
index 0000000..0c86b5c
--- /dev/null
+++ b/bin/rspec
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

diff --git a/bin/spec b/bin/spec
deleted file mode 100755 (executable)
index c41c75e..0000000
--- a/bin/spec
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'spec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec', 'spec')

diff --git a/bin/yard-graph b/bin/yard-graph
new file mode 100755 (executable)
index 0000000..464546f
--- /dev/null
+++ b/bin/yard-graph
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'yard-graph' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('yard', 'yard-graph')

diff --git a/bin/yardoc b/bin/yardoc
new file mode 100755 (executable)
index 0000000..43eff6b
--- /dev/null
+++ b/bin/yardoc
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'yardoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('yard', 'yardoc')

diff --git a/bin/yri b/bin/yri
new file mode 100755 (executable)
index 0000000..05f2461
--- /dev/null
+++ b/bin/yri
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'yri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('yard', 'yri')

diff --git a/spec/additions/proc_spec.rb b/spec/additions/proc_spec.rb
index 8423ae59c15de215a976d0b65bfcdab3c106e2c6..e0788b3f675aa6a97de95e3d10e213bf4d4547ce 100755 (executable)
--- a/spec/additions/proc_spec.rb
+++ b/spec/additions/proc_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe 'proc additions' do
   it 'responds to "to_parseable", "parse" and "memoizing_parse"' do

diff --git a/spec/additions/regexp_spec.rb b/spec/additions/regexp_spec.rb
index 2bf2f013c4fcca8c1b2e60b3fff2757f3403a5c1..5d7b0dcac54d96167961c0e42f3874e43d1672ed 100755 (executable)
--- a/spec/additions/regexp_spec.rb
+++ b/spec/additions/regexp_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 # For more detailed specification of the RegexpParslet behaviour see
 # regexp_parslet_spec.rb.

diff --git a/spec/additions/string_spec.rb b/spec/additions/string_spec.rb
index 4db5110914ade114c036b74ccb0376f902cadb8a..0ed599f922d9f666e8749e5c6a1bd69a10af0ed3 100755 (executable)
--- a/spec/additions/string_spec.rb
+++ b/spec/additions/string_spec.rb
@@ -2,7 +2,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe String do
   describe '#to_class_name' do

diff --git a/spec/and_predicate_spec.rb b/spec/and_predicate_spec.rb
index 5872fe18b1d985d4ec2cc866d8dfbac6eeada175..a5db303baf39ca06dc2fb777cc5ff492e7b68b46 100755 (executable)
--- a/spec/and_predicate_spec.rb
+++ b/spec/and_predicate_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::AndPredicate do
   subject { Walrat::AndPredicate.new('foo') }

diff --git a/spec/continuation_wrapper_exception_spec.rb b/spec/continuation_wrapper_exception_spec.rb
index 2a184ab8e2fdcbb8fa12648c91328a2ced562eb6..0dec747e9254af8d37737ccd115d973c23223387 100755 (executable)
--- a/spec/continuation_wrapper_exception_spec.rb
+++ b/spec/continuation_wrapper_exception_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe 'creating a continuation wrapper exception' do
   it 'complains if initialized with nil' do

diff --git a/spec/grammar_spec.rb b/spec/grammar_spec.rb
index d253c253cf837f1b727c4a8f0d2f9334b4591ad3..663c5af37998ae75854e2da3c8ea8dcae43a26a6 100755 (executable)
--- a/spec/grammar_spec.rb
+++ b/spec/grammar_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::Grammar do
   describe '::rules' do
@@ -106,9 +106,7 @@ describe Walrat::Grammar do
         starting_symbol :expr # :expr is not defined
       end
 
-      expect do
-        RoyGrammar.new.parse('foo')
-      end.should raise_error(/no rule for key/)
+      expect { RoyGrammar.new.parse('foo') }.to raise_error(/no rule for key/)
     end
 
     it 'should be able to parse using a simple grammar (one rule)' do
@@ -404,20 +402,20 @@ describe Walrat::Grammar do
     end
 
     it 'should complain if trying to set default skipping parslet more than once' do
-      expect do
+      expect {
         class SetSkipperTwice < Walrat::Grammar
           skipping :first   # fine
           skipping :again   # should raise here
         end
-      end.should raise_error(/default skipping parslet already set/)
+      }.to raise_error(/default skipping parslet already set/)
     end
 
     it 'should complain if passed nil' do
-      expect do
+      expect {
         class PassNilToSkipping < Walrat::Grammar
           skipping nil
         end
-      end.should raise_error(ArgumentError, /nil rule_or_parslet/)
+      }.to raise_error(ArgumentError, /nil rule_or_parslet/)
     end
 
     it 'should be able to override default skipping parslet on a per-rule basis' do

diff --git a/spec/match_data_wrapper_spec.rb b/spec/match_data_wrapper_spec.rb
index 8a5f809ebd437b69d6764746d3a88bc6118181e7..df15d94ae729c139ec5aef0f0ae8ee0b69c50376 100755 (executable)
--- a/spec/match_data_wrapper_spec.rb
+++ b/spec/match_data_wrapper_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::MatchDataWrapper do
   before do

diff --git a/spec/memoizing_cache_spec.rb b/spec/memoizing_cache_spec.rb
index 31fc04ea2d994be7540ebd0249e8fa452bd6bb68..c4bc1cf2ad1044af7ec38565f77d6cce80091458 100755 (executable)
--- a/spec/memoizing_cache_spec.rb
+++ b/spec/memoizing_cache_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::MemoizingCache::NoValueForKey do
   it 'is a singleton' do
@@ -24,17 +24,9 @@ describe Walrat::MemoizingCache::NoValueForKey do
 end
 
 describe Walrat::MemoizingCache do
-  it 'parses with memoizing turned on' do
-    pending
-  end
-
-  it 'parses with memoizing turned off' do
-    pending
-  end
-
-  specify 'parsing with memoization turned on is faster' do
-    pending
-  end
+  it 'parses with memoizing turned on'
+  it 'parses with memoizing turned off'
+  it 'parses faster with memoization turned on'
 end
 
 # left-recursion is enabled by code in the memoizer and elsewhere; keep the

diff --git a/spec/node_spec.rb b/spec/node_spec.rb
index ea5e47b1323a4ef2361b3955f302e05f437c861c..c0d7fd9407cc2c838229760192a89c2efdc29601 100755 (executable)
--- a/spec/node_spec.rb
+++ b/spec/node_spec.rb
@@ -1,10 +1,8 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::Node do
-  it 'has behavior' do
-    pending
-  end
+  it 'has behavior'
 end

diff --git a/spec/not_predicate_spec.rb b/spec/not_predicate_spec.rb
index c2ebc7d96040d9bbe3bb96f7a3927841ceead421..f49e5fe2493cc5960ecf4ca0763426c262ea6b7e 100755 (executable)
--- a/spec/not_predicate_spec.rb
+++ b/spec/not_predicate_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::NotPredicate do
   it 'complains on trying to parse a nil string' do

diff --git a/spec/parser_state_spec.rb b/spec/parser_state_spec.rb
index df182f7e1de4f8b020e9dab8fe3c8c301785ebbd..5562edc406b129fc22112ee00d0ed2cb30627e1c 100755 (executable)
--- a/spec/parser_state_spec.rb
+++ b/spec/parser_state_spec.rb
@@ -2,7 +2,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::ParserState do
   before do
@@ -76,26 +76,26 @@ describe Walrat::ParserState do
 
   it '"parsed" should complain if passed something that doesn\'t respond to the "line_end" and "column_end" messages' do
     # line_end
-    my_mock = mock('mock_which_does_not_implement_line_end', :null_object => true)
-    my_mock.should_receive(:line_end).and_raise(NoMethodError)
-    lambda { @state.parsed(my_mock) }.should raise_error(NoMethodError)
+    my_mock = double('Mock which does not implement #line_end').as_null_object
+    expect(my_mock).to receive(:line_end).and_raise(NoMethodError)
+    expect { @state.parsed(my_mock) }.to raise_error(NoMethodError)
 
     # column_end
-    my_mock = mock('mock_which_does_not_implement_column_end', :null_object => true)
-    my_mock.should_receive(:column_end).and_raise(NoMethodError)
-    lambda { @state.parsed(my_mock) }.should raise_error(NoMethodError)
+    my_mock = double('Mock which does not implement #column_end').as_null_object
+    expect(my_mock).to receive(:column_end).and_raise(NoMethodError)
+    expect { @state.parsed(my_mock) }.to raise_error(NoMethodError)
   end
 
   it '"skipped" should complain if passed something that doesn\'t respond to the "line_end" and "column_end" messages' do
     # line_end
-    my_mock = mock('mock_which_does_not_implement_line_end', :null_object => true)
-    my_mock.should_receive(:line_end).and_raise(NoMethodError)
-    lambda { @state.skipped(my_mock) }.should raise_error(NoMethodError)
+    my_mock = double('Mock which does not implement #line_end').as_null_object
+    expect(my_mock).to receive(:line_end).and_raise(NoMethodError)
+    expect { @state.skipped(my_mock) }.to raise_error(NoMethodError)
 
     # column_end
-    my_mock = mock('mock_which_does_not_implement_column_end', :null_object => true)
-    my_mock.should_receive(:column_end).and_raise(NoMethodError)
-    lambda { @state.skipped(my_mock) }.should raise_error(NoMethodError)
+    my_mock = double('Mock which does not implement #column_end').as_null_object
+    expect(my_mock).to receive(:column_end).and_raise(NoMethodError)
+    expect { @state.skipped(my_mock) }.to raise_error(NoMethodError)
   end
 
   it 'should be able to mix use of "parsed" and "skipped" methods' do

diff --git a/spec/parslet_choice_spec.rb b/spec/parslet_choice_spec.rb
index 1d3d9215147e02e28d43df31d01eda1404d83100..59097ea57bee4bc02613a401f57675b3ae94d2ea 100755 (executable)
--- a/spec/parslet_choice_spec.rb
+++ b/spec/parslet_choice_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::ParsletChoice do
   before do

diff --git a/spec/parslet_combining_spec.rb b/spec/parslet_combining_spec.rb
index 05e4946de240b5657bbe4fe898f135299875f569..aace632fe716ff8849c80a7f593c0c86cd93c5ce 100755 (executable)
--- a/spec/parslet_combining_spec.rb
+++ b/spec/parslet_combining_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 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/parslet_merge_spec.rb b/spec/parslet_merge_spec.rb
index a6ba7f427b94add723b0e5cefd8d233f0deab76c..767a0b185c900d71d53d1e82577c4e97dce46e82 100755 (executable)
--- a/spec/parslet_merge_spec.rb
+++ b/spec/parslet_merge_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::ParsletMerge do
   it 'should be able to compare for equality' do

diff --git a/spec/parslet_omission_spec.rb b/spec/parslet_omission_spec.rb
index a780b79454a2199f2ff028b1f7a505e57da1e733..96166292b0c998c1e998e9473d1921f910823335 100755 (executable)
--- a/spec/parslet_omission_spec.rb
+++ b/spec/parslet_omission_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::ParsletOmission do
   it 'raises if "parseable" argument is nil' do

diff --git a/spec/parslet_repetition_spec.rb b/spec/parslet_repetition_spec.rb
index cfd4191dc6dc030e0fc1e874a8524db1d625cd70..c0c7472a09c9826d3cf17420a8cc1b4ed1bae29e 100755 (executable)
--- a/spec/parslet_repetition_spec.rb
+++ b/spec/parslet_repetition_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::ParsletRepetition do
   it 'raises if "parseable" argument is nil' do

diff --git a/spec/parslet_sequence_spec.rb b/spec/parslet_sequence_spec.rb
index b45563194d4f9b8327f3a802f36c25ec7c54e819..a974c679a5151f424fc598a6175b495dd80f4d70 100755 (executable)
--- a/spec/parslet_sequence_spec.rb
+++ b/spec/parslet_sequence_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::ParsletSequence do
   before do

diff --git a/spec/parslet_spec.rb b/spec/parslet_spec.rb
index 1e674f356ce619b8e0cf4dd5ab4b7d151dc40bd9..aad58f9b72ffe0e0520c555afd281037de93c1ac 100755 (executable)
--- a/spec/parslet_spec.rb
+++ b/spec/parslet_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::Parslet do
   it 'complains if sent "parse" message' do

diff --git a/spec/predicate_spec.rb b/spec/predicate_spec.rb
index a7f4e2dc3b91af49c9ab1686af146e14f07319d6..63551254d5e4f4dc00825c849e0149f365ec71d3 100755 (executable)
--- a/spec/predicate_spec.rb
+++ b/spec/predicate_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::Predicate do
   it 'raises an ArgumentError if initialized with nil' do

diff --git a/spec/proc_parslet_spec.rb b/spec/proc_parslet_spec.rb
index 5dc20ecf3ab28667ac7191e33171be35b1acbc1b..67917d0353309ccda7a9fa064814c6ac4933ef49 100755 (executable)
--- a/spec/proc_parslet_spec.rb
+++ b/spec/proc_parslet_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::ProcParslet do
   before do

diff --git a/spec/regexp_parslet_spec.rb b/spec/regexp_parslet_spec.rb
index 455c1be1bbfb5d52a955f2cc611faa45650adae6..9d7637e445f17fb1150ac297350b99896c182963 100755 (executable)
--- a/spec/regexp_parslet_spec.rb
+++ b/spec/regexp_parslet_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::RegexpParslet do
   before do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 92af168e30d3d238a1bb71fb20554acd2d487b7a..7932657903502f988491c2dc9b565453451d156a 100755 (executable)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,8 +2,7 @@
 # Licensed under the terms of the BSD 2-clause license.
 
 require 'pathname'
-require 'rubygems'
-require 'spec'
+require 'rspec'
 
 module Walrat
   module SpecHelper

diff --git a/spec/string_enumerator_spec.rb b/spec/string_enumerator_spec.rb
index 973133d0a33a331103a7a82947f3c9121b40ed6a..045fadfd600ff511357f59819f31ef8f749ebae1 100755 (executable)
--- a/spec/string_enumerator_spec.rb
+++ b/spec/string_enumerator_spec.rb
@@ -2,7 +2,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::StringEnumerator do
   it 'raises an ArgumentError if initialized with nil' do

diff --git a/spec/string_parslet_spec.rb b/spec/string_parslet_spec.rb
index e4baf4725fea393c5c51443aba84d29662c672ea..83f3311b6e1b6ea03ddd2b1326d9a19f234676b7 100755 (executable)
--- a/spec/string_parslet_spec.rb
+++ b/spec/string_parslet_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::StringParslet do
   before do

diff --git a/spec/symbol_parslet_spec.rb b/spec/symbol_parslet_spec.rb
index f5ee98cd17217fc70c1ca92af7ce58c4394e9026..0afc096eb442cf84b3cba643d49c025799037b3a 100755 (executable)
--- a/spec/symbol_parslet_spec.rb
+++ b/spec/symbol_parslet_spec.rb
@@ -1,7 +1,7 @@
 # Copyright 2007-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Walrat::SymbolParslet do
   it 'should raise an ArgumentError if initialized with nil' do

diff --git a/walrat.gemspec b/walrat.gemspec
index 2154166783b7f7352bf3b332f005adb5dbd6babc..837b7729ed055f02d2635bdb19807910f81d05f7 100644 (file)
--- a/walrat.gemspec
+++ b/walrat.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
 
   # TODO: add 'docs' subdirectory, 'README.txt' when they're done
   s.files             = Dir['lib/**/*.rb']
-  s.add_development_dependency 'rspec', '1.3.0'
+  s.add_development_dependency 'rspec', '~> 3.1'
   s.add_development_dependency 'yard'
 end