Update to Ruby 2.3.0 for development purposes

Note that I also switched to using chruby/ruby-install in order to get
2.3.0 on the system, and that doesn't play nicely with these Bundler
bin-stubs, so I had to rip those out in favor of explicit `bundle exec`
invocations.

diff --git a/.bundle/config b/.bundle/config
deleted file mode 100644 (file)
index e18ad3d..0000000
--- a/.bundle/config
+++ /dev/null
@@ -1,4 +0,0 @@
---- 
-BUNDLE_BIN: bin
-BUNDLE_DISABLE_SHARED_GEMS: "1"
-BUNDLE_PATH: ~/.bundle/wikitext

diff --git a/.ruby-version b/.ruby-version
index b1b25a5ffae43c2f07d222b53240d871e7c1789b..276cbf9e2858c779297bb9f73b34170302949ec4 100644 (file)
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.2.2
+2.3.0

diff --git a/Rakefile b/Rakefile
index b6bb2f4b6e1be42b1d41257c75701cfc88a16eda..16c3f06e89a686e9db1e51cd44e7bf1b851f18e8 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -81,12 +81,12 @@ end
 
 desc 'Run specs'
 task :spec => :make do
-  sh 'bin/rspec spec'
+  sh 'bundle exec rspec spec'
 end
 
 desc 'Build the YARD HTML files'
 task :yard do
-  sh 'bin/yardoc --one-file -o html --title Wikitext doc/*.rb - doc/RELEASE-NOTES'
+  sh 'bundle exec yardoc --one-file -o html --title Wikitext doc/*.rb - doc/RELEASE-NOTES'
 end
 
 desc 'Build gem ("gem build")'

diff --git a/bin/autospec b/bin/autospec
index 64dcb9cb08a95d412d17ad1f2d6e5de296b3ece6..e8a7132e31912962b8487c9bdb1cabdda3af2fdf 100755 (executable)
--- a/bin/autospec
+++ b/bin/autospec
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('rspec-core', 'autospec')
+load Gem.bin_path("rspec-core", "autospec")

diff --git a/bin/autotest b/bin/autotest
index 5e9a7a4d1bbff91a746deed9d748007733e49e2c..eba62f17dc0991dc9d24f9e04f89316b163d536a 100755 (executable)
--- a/bin/autotest
+++ b/bin/autotest
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('ZenTest', 'autotest')
+load Gem.bin_path("ZenTest", "autotest")

diff --git a/bin/htmldiff b/bin/htmldiff
index c70e238dc2d81ab8ecc70537203db00db723e4e4..2ca984d6ed021746142485df2ab3a29064864f2a 100755 (executable)
--- a/bin/htmldiff
+++ b/bin/htmldiff
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('diff-lcs', 'htmldiff')
+load Gem.bin_path("diff-lcs", "htmldiff")

diff --git a/bin/ldiff b/bin/ldiff
index 8e3524a92e366c5fcfba0c83b7b3eca0b94fafdb..0be9dc455a596284d2f0e117d75b35d62d9bca96 100755 (executable)
--- a/bin/ldiff
+++ b/bin/ldiff
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('diff-lcs', 'ldiff')
+load Gem.bin_path("diff-lcs", "ldiff")

diff --git a/bin/multigem b/bin/multigem
index abc00a49760312c09f5790a6abc9cd0dfb37e3d0..c01cf83387b08ae87510ec9001278052350b6d60 100755 (executable)
--- a/bin/multigem
+++ b/bin/multigem
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('ZenTest', 'multigem')
+load Gem.bin_path("ZenTest", "multigem")

diff --git a/bin/multiruby b/bin/multiruby
index fa574be94e80de5b47af0ec475825d2f52dd82e3..8ee81446de63bb9aee1ed8889f744a8efa78d2cf 100755 (executable)
--- a/bin/multiruby
+++ b/bin/multiruby
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('ZenTest', 'multiruby')
+load Gem.bin_path("ZenTest", "multiruby")

diff --git a/bin/multiruby_setup b/bin/multiruby_setup
index 28432ebe4c3ae5df28341c57e577ec721a3a5bf9..b867297ac573c16e2116490588fbaeb43e751fbc 100755 (executable)
--- a/bin/multiruby_setup
+++ b/bin/multiruby_setup
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('ZenTest', 'multiruby_setup')
+load Gem.bin_path("ZenTest", "multiruby_setup")

diff --git a/bin/rake b/bin/rake
index 26c7a2d5b5f18e50c555558e19ed6050ab461628..c8973c4b5d7bf9f61b8e3787aa790d542f2c4d16 100755 (executable)
--- a/bin/rake
+++ b/bin/rake
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('rake', 'rake')
+load Gem.bin_path("rake", "rake")

diff --git a/bin/rake2thor b/bin/rake2thor
index b0b6ec9b869378330c3c20a2f92abb5fe89c7239..84f1e1b754b2e6c3cc44f818fa73e3e1ccb4371b 100755 (executable)
--- a/bin/rake2thor
+++ b/bin/rake2thor
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('thor', 'rake2thor')
+load Gem.bin_path("thor", "rake2thor")

diff --git a/bin/rspec b/bin/rspec
index 0c86b5c6fa177ab2b58ee7146e19d0d26506487d..3e07513cd899fde6aa7a16496adf582cbf612562 100755 (executable)
--- a/bin/rspec
+++ b/bin/rspec
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('rspec-core', 'rspec')
+load Gem.bin_path("rspec-core", "rspec")

diff --git a/bin/thor b/bin/thor
index 8421e001eac7fd15bc92dc8d30c1390139252833..5769ec97bae42370e646ea63f19521dda06a1a05 100755 (executable)
--- a/bin/thor
+++ b/bin/thor
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('thor', 'thor')
+load Gem.bin_path("thor", "thor")

diff --git a/bin/unit_diff b/bin/unit_diff
index 765d72b0b6fa95285f15f3bcf0f2339c4b5be9c6..9b072acef29c2ab3102d0697cd8f8990eedc3ae5 100755 (executable)
--- a/bin/unit_diff
+++ b/bin/unit_diff
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('ZenTest', 'unit_diff')
+load Gem.bin_path("ZenTest", "unit_diff")

diff --git a/bin/yard b/bin/yard
index bd489a82952280a12386a77b5262fe44b1d71d2a..2e55ec3b254a0e13ad89844ec555de02b0fe67e3 100755 (executable)
--- a/bin/yard
+++ b/bin/yard
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('yard', 'yard')
+load Gem.bin_path("yard", "yard")

diff --git a/bin/yardoc b/bin/yardoc
index 43eff6b0a5d1c934be6897296e1dae00be71b9a7..8756fe8ef29991fe6c214ff736e2b5070e73bc25 100755 (executable)
--- a/bin/yardoc
+++ b/bin/yardoc
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('yard', 'yardoc')
+load Gem.bin_path("yard", "yardoc")

diff --git a/bin/yri b/bin/yri
index 05f2461171ce5c1d8340a1dcebe3118087a9b1ac..2e61a32c0bf20ad0e4d3c1cf710f3d3dcd23da71 100755 (executable)
--- a/bin/yri
+++ b/bin/yri
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('yard', 'yri')
+load Gem.bin_path("yard", "yri")

diff --git a/bin/zentest b/bin/zentest
index a140d5e38c7d7152fd61f6b978c45a8780176bf7..47c2360075495d7d7514d2128629c6a1ba81e5cd 100755 (executable)
--- a/bin/zentest
+++ b/bin/zentest
@@ -6,11 +6,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('ZenTest', 'zentest')
+load Gem.bin_path("ZenTest", "zentest")