Merge 0addf28 into 0ef5835

.gitignore

@@ -1,4 +1,5 @@
 Gemfile.lock
+test/*.jar
 .rspec-local
 *.gem
 lib/1.8

.travis.yml

@@ -1,24 +1,41 @@
 language: ruby
 rvm:
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-2
-  - 1.8.7
-  - 1.9.3
+  - 2.2.0
+  - 2.1.5
+  - 2.1.4
   - 2.0.0
-  - 2.1.0
+  - 1.9.3
+  - ruby-head
+  - jruby-1.7.18
+  - jruby-head
+  - rbx-2
 jdk: # for JRuby only
   - openjdk7
   - oraclejdk8
 matrix:
   exclude:
-    - rvm: rbx-2
+    - rvm: 2.2.0
+      jdk: openjdk7
       jdk: oraclejdk8
-    - rvm: 1.8.7
+    - rvm: 2.1.5
+      jdk: openjdk7
       jdk: oraclejdk8
-    - rvm: 1.9.3
+    - rvm: 2.1.4
+      jdk: openjdk7
       jdk: oraclejdk8
     - rvm: 2.0.0
+      jdk: openjdk7
       jdk: oraclejdk8
-    - rvm: 2.1.0
-      jdk: oraclejdk8
+    - rvm: 1.9.3
+      jdk: openjdk7
+      jdk: oraclejdk8
+    - rvm: ruby-head
+      jdk: openjdk7
+      jdk: oraclejdk8
+    - rvm: rbx-2
+      jdk: openjdk7
+      jdk: oraclejdk8
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: 1.9.3

Gemfile

@@ -1,12 +1,17 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in thread_safe.gemspec
 gemspec
 
+group :development, :test do
+  gem 'minitest', '~> 5.5.1'
+  gem 'minitest-reporters', '~> 1.0.11'
+  gem 'simplecov', '~> 0.9.2', :require => false
+  gem 'coveralls', '~> 0.7.11', :require => false
+end
+
 group :documentation do
   gem 'countloc', '~> 0.4.0', :platforms => :mri, :require => false
-  gem 'rubycritic', '~> 1.0.2', :platforms => :mri, require: false
-  gem 'yard', '~> 0.8.7.4', :require => false
-  gem 'inch', '~> 0.4.6', :platforms => :mri, :require => false
-  gem 'redcarpet', '~> 3.1.2', platforms: :mri # understands github markdown
+  gem 'yard', '~> 0.8.7.6', :require => false
+  gem 'inch', '~> 0.5.10', :platforms => :mri, :require => false
+  gem 'redcarpet', '~> 3.2.2', platforms: :mri # understands github markdown
 end

README.md

@@ -1,6 +1,6 @@
 # Threadsafe
 
-[![Build Status](https://travis-ci.org/headius/thread_safe.png)](https://travis-ci.org/headius/thread_safe)
+[![Gem Version](https://badge.fury.io/rb/thread_safe.svg)](http://badge.fury.io/rb/thread_safe) [![Build Status](https://travis-ci.org/ruby-concurrency/thread_safe.svg?branch=master)](https://travis-ci.org/ruby-concurrency/thread_safe) [![Coverage Status](https://img.shields.io/coveralls/ruby-concurrency/thread_safe/master.svg)](https://coveralls.io/r/ruby-concurrency/thread_safe) [![Code Climate](https://codeclimate.com/github/ruby-concurrency/thread_safe.svg)](https://codeclimate.com/github/ruby-concurrency/thread_safe) [![Dependency Status](https://gemnasium.com/ruby-concurrency/thread_safe.svg)](https://gemnasium.com/ruby-concurrency/thread_safe) [![License](https://img.shields.io/badge/license-apache-green.svg)](http://opensource.org/licenses/MIT) [![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/ruby-concurrency/concurrent-ruby)
 
 A collection of thread-safe versions of common core Ruby classes.
 

test/test_helper.rb

@@ -1,14 +1,33 @@
-require 'thread'
-require 'rubygems'
-gem 'minitest', '>= 4'
+unless defined?(JRUBY_VERSION)
+  require 'simplecov'
+  require 'coveralls'
+
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+
+  SimpleCov.start do
+    project_name 'thread_safe'
+
+    add_filter '/examples/'
+    add_filter '/pkg/'
+    add_filter '/test/'
+    add_filter '/tasks/'
+    add_filter '/yard-template/'
+    add_filter '/yardoc/'
+
+    command_name 'Mintest'
+  end
+end
+
 require 'minitest/autorun'
 
-if Minitest.const_defined?('Test')
-  # We're on Minitest 5+. Nothing to do here.
-else
-  # Minitest 4 doesn't have Minitest::Test yet.
-  Minitest::Test = MiniTest::Unit::TestCase
-end
+require 'minitest/reporters'
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new(color: true)
+
+require 'thread'
+require 'thread_safe'
 
 if defined?(JRUBY_VERSION) && ENV['TEST_NO_UNSAFE']
   # to be used like this: rake test TEST_NO_UNSAFE=true

thread_safe.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.version       = ThreadSafe::VERSION
   gem.license       = "Apache-2.0"
 
-  gem.add_development_dependency 'atomic', ['>= 1.1.7', '< 2']
+  gem.add_development_dependency 'atomic', '= 1.1.16'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest', '>= 4'
 end