Fix CI

rwz · rwz · commit e1f6584d2796 · 2019-10-13T18:41:29.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,7 @@ log
 *.gem
 .bundle
 pkg
-Gemfile.lock
+gemfiles/*.lock
 
 ## RBENV
 .ruby-version
diff --git a/.travis.yml b/.travis.yml
@@ -1,29 +1,54 @@
-bundler_args: --without development
-cache: bundler
 language: ruby
-rvm:
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-9000
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - jruby-head
-  - rbx-2
-  - ruby-head
+
 matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: rbx-2
-    - rvm: ruby-head
-  fast_finish: true
-sudo: false
-before_install:
-  - gem update --system
-  - gem update --remote bundler
+  include:
+  - rvm: 1.8
+    gemfile: gemfiles/gemfile-1-8
+    os: linux
+    dist: trusty
+    env: SKIP_ADAPTERS=yajl,gson,jr_jackson,nsjsonserialization
+  - rvm: jruby-18mode
+    gemfile: gemfiles/gemfile-1-8-jruby
+    os: linux
+    dist: trusty
+    env: SKIP_ADAPTERS=oj,yajl,nsjsonserialization
+  - rvm: 1.9
+    gemfile: gemfiles/gemfile-1-9
+    os: linux
+    dist: trusty
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: jruby-19mode
+    gemfile: gemfiles/gemfile-1-9-jruby
+    os: linux
+    dist: trusty
+    env: SKIP_ADAPTERS=oj,yajl,nsjsonserialization
+  - rvm: 2.0
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: 2.1
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: 2.2
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: 2.3
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: 2.4
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: 2.5
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: 2.6
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: ruby-head
+    gemfile: gemfiles/gemfile-2
+    env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+  - rvm: jruby-9000
+    gemfile: gemfiles/gemfile-2-jruby
+    env: SKIP_ADAPTERS=oj,yajl,jr_jackson,nsjsonserialization
+  - rvm: jruby-head
+    gemfile: gemfiles/gemfile-2-jruby
+    env: SKIP_ADAPTERS=oj,yajl,jr_jackson,nsjsonserialization
diff --git a/Gemfile b/Gemfile
diff --git a/README.md b/README.md
@@ -60,17 +60,15 @@ MultiJSON falls back to [OkJson][], a simple, vendorable JSON parser.
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.8.7
-* Ruby 1.9.2
-* Ruby 1.9.3
-* Ruby 2.0.0
-* Ruby 2.1.10
-* Ruby 2.2.9
-* Ruby 2.4.3
-* Ruby 2.5.0
+* Ruby 1.8
+* Ruby 1.9
+* Ruby 2.0
+* Ruby 2.1
+* Ruby 2.2
+* Ruby 2.4
+* Ruby 2.5
+* Ruby 2.6
 * [JRuby][]
-* [Rubinius][]
-* [MacRuby][] (not tested on Travis CI)
 
 If something doesn't work in one of these implementations, it's a bug.
 
@@ -106,7 +104,6 @@ and Pavel Pravosud. See [LICENSE][] for details.
 
 [codeclimate]: https://codeclimate.com/github/intridea/multi_json
 [gem]: https://rubygems.org/gems/multi_json
-[gemnasium]: https://gemnasium.com/intridea/multi_json
 [gson]: https://github.com/avsej/gson.rb
 [jrjackson]: https://github.com/guyboertje/jrjackson
 [jruby]: http://www.jruby.org/
@@ -118,7 +115,6 @@ and Pavel Pravosud. See [LICENSE][] for details.
 [oj]: https://github.com/ohler55/oj
 [okjson]: https://github.com/kr/okjson
 [pvc]: http://docs.rubygems.org/read/chapter/16#page74
-[rubinius]: http://rubini.us/
 [semver]: http://semver.org/
 [travis]: http://travis-ci.org/intridea/multi_json
 [yajl]: https://github.com/brianmario/yajl-ruby
diff --git a/Rakefile b/Rakefile
@@ -3,7 +3,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:base_spec) do |task|
-  task.pattern = 'spec/multi_json_spec.rb,spec/options_cache_spec.rb'
+  task.pattern = 'spec/{multi_json,options_cache}_spec.rb'
 end
 
 namespace :adapters do
@@ -16,10 +16,17 @@ namespace :adapters do
   end
 end
 
-task :spec => %w(base_spec adapters:oj adapters:yajl adapters:json_gem adapters:json_pure adapters:ok_json adapters:gson adapters:jr_jackson adapters:nsjsonserialization)
+task :spec => %w[
+  base_spec
+  adapters:oj
+  adapters:yajl
+  adapters:json_gem
+  adapters:json_pure
+  adapters:ok_json
+  adapters:gson
+  adapters:jr_jackson
+  adapters:nsjsonserialization
+]
 
 task :default => :spec
 task :test => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new
diff --git a/gemfiles/gemfile-1-8 b/gemfiles/gemfile-1-8
@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "json",      "~> 1.8",  :require => false
+gem "json_pure", "~> 1.8",  :require => false
+gem "oj",        "~> 2.18", :require => false
+
+gemspec :path => ".."
diff --git a/gemfiles/gemfile-1-8-jruby b/gemfiles/gemfile-1-8-jruby
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "json",      "~> 1.8",   :require => false
+gem "json_pure", "~> 1.8",   :require => false
+gem "gson",      ">= 0.6",   :require => false
+gem "jrjackson", "~> 0.3.4", :require => false
+
+gemspec :path => ".."
diff --git a/gemfiles/gemfile-1-9 b/gemfiles/gemfile-1-9
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "json",      "~> 1.8",  require: false
+gem "json_pure", "~> 1.8",  require: false
+gem "oj",        "~> 2.18", require: false
+gem "yajl-ruby", "~> 1.3",  require: false
+
+gemspec :path => ".."
diff --git a/gemfiles/gemfile-1-9-jruby b/gemfiles/gemfile-1-9-jruby
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "json",      "~> 1.8",   require: false
+gem "json_pure", "~> 1.8",   require: false
+gem "gson",      ">= 0.6",   require: false
+gem "jrjackson", "~> 0.3.4", require: false
+
+gemspec :path => ".."
diff --git a/gemfiles/gemfile-2 b/gemfiles/gemfile-2
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "json",      "~> 2.0",  require: false
+gem "json_pure", "~> 2.0",  require: false
+gem "oj",        "~> 2.18", require: false
+gem "yajl-ruby", "~> 1.3",  require: false
+
+gemspec path: ".."
diff --git a/gemfiles/gemfile-2-jruby b/gemfiles/gemfile-2-jruby
@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "json",      "~> 2.0",  require: false
+gem "json_pure", "~> 2.0",  require: false
+gem "gson",      ">= 0.6",   require: false
+
+gemspec path: ".."
diff --git a/lib/multi_json/adapters/nsjsonserialization.rb b/lib/multi_json/adapters/nsjsonserialization.rb
@@ -1,3 +1,6 @@
+# This adapter is here for legacy reasons. We can't really test it, so it's hard
+# to tell if it's even working properly. If you're still using it, please
+# consider migrating to any other adapter out there.
 framework 'Foundation'
 require 'multi_json/adapters/ok_json'
 
diff --git a/multi_json.gemspec b/multi_json.gemspec
@@ -16,5 +16,6 @@ Gem::Specification.new do |spec|
   spec.version       = MultiJson::Version
 
   spec.required_rubygems_version = ">= 1.3.5"
-  spec.add_development_dependency "bundler", "~> 1.0"
-end
+  spec.add_development_dependency "rake", "~> 10.5"
+  spec.add_development_dependency "rspec", "~> 3.9"
+end
diff --git a/spec/gson_adapter_spec.rb b/spec/gson_adapter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-exit true unless jruby?
+exit 0 if skip_adapter?('gson')
 
 require 'shared/adapter'
 require 'multi_json/adapters/gson'
diff --git a/spec/jr_jackson_adapter_spec.rb b/spec/jr_jackson_adapter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-exit true unless jruby?
+exit 0 if skip_adapter?('jr_jackson')
 
 require 'shared/adapter'
 require 'multi_json/adapters/jr_jackson'
diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
@@ -54,8 +54,10 @@
     # Clear cache variable already set by previous tests
     MultiJson.send(:remove_instance_variable, :@adapter) if MultiJson.instance_variable_defined?(:@adapter)
 
-    if jruby?
+    if jruby? && !skip_adapter?('jr_jackson')
       expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::JrJackson')
+    elsif jruby?
+      expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::JsonGem')      
     else
       expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::Oj')
     end
@@ -126,6 +128,8 @@
   end
 
   it 'JSON gem does not create symbols on parse' do
+    skip 'breaks in JRuby' if jruby?
+
     MultiJson.with_engine(:json_gem) do
       MultiJson.load('{"json_class":"ZOMG"}')
 
@@ -135,35 +139,6 @@
     end
   end
 
-  unless jruby?
-    it 'Oj does not create symbols on parse' do
-      MultiJson.with_engine(:oj) do
-        MultiJson.load('{"json_class":"ZOMG"}')
-
-        expect do
-          MultiJson.load('{"json_class":"OMG"}')
-        end.to_not change { Symbol.all_symbols.count }
-      end
-    end
-
-    context 'with Oj.default_settings' do
-      around do |example|
-        options = Oj.default_options
-        Oj.default_options = {:symbol_keys => true}
-        MultiJson.with_engine(:oj) { example.call }
-        Oj.default_options = options
-      end
-
-      it 'ignores global settings' do
-        MultiJson.with_engine(:oj) do
-          example = '{"a": 1, "b": 2}'
-          expected = {'a' => 1, 'b' => 2}
-          expect(MultiJson.load(example)).to eq(expected)
-        end
-      end
-    end
-  end
-
   describe 'default options' do
     after(:all) { MultiJson.load_options = MultiJson.dump_options = nil }
 
@@ -182,7 +157,7 @@
   it_behaves_like 'has options', MultiJson
 
   describe 'aliases' do
-    if jruby?
+    unless skip_adapter?('jr_jackson')
       describe 'jrjackson' do
         after { expect(MultiJson.adapter).to eq(MultiJson::Adapters::JrJackson) }
 
diff --git a/spec/nsjsonserialization_adapter_spec.rb b/spec/nsjsonserialization_adapter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-exit true unless macruby?
+exit 0 if skip_adapter?("nsjsonserialization")
 
 require 'shared/adapter'
 require 'multi_json/adapters/nsjsonserialization'
diff --git a/spec/oj_adapter_spec.rb b/spec/oj_adapter_spec.rb
diff --git a/spec/shared/adapter.rb b/spec/shared/adapter.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/spec/yajl_adapter_spec.rb b/spec/yajl_adapter_spec.rb
