Gemfile in message-driver-0.6.1 vs Gemfile in message-driver-0.7.0

@@ -5,52 +5,62 @@
 
 platform :rbx do
   gem 'rubysl'
 end
 
-gem 'rubocop', platform: [:ruby_20, :ruby_21]
+mri_2plus = [:mri_20, :mri_21, :mri_22, :mri_23]
+ruby_2plus = [:ruby_20, :ruby_21, :ruby_22, :ruby_23]
 
 group :tools do
-  gem 'guard', platform: [:mri_20, :mri_21]
-  gem 'guard-bundler', platform: [:mri_20, :mri_21]
-  gem 'guard-rspec', platform: [:mri_20, :mri_21]
-  gem 'guard-cucumber', platform: [:mri_20, :mri_21]
-  gem 'guard-rubocop', platform: [:mri_20, :mri_21]
+  gem 'guard', platform: mri_2plus
+  gem 'guard-bundler', platform: mri_2plus
+  gem 'guard-rspec', platform: mri_2plus
+  gem 'guard-cucumber', platform: mri_2plus
+  gem 'guard-rubocop', platform: mri_2plus
   gem 'pry'
-  gem 'pry-byebug', platform: [:mri_20, :mri_21]
-  gem 'pry-stack_explorer', platform: [:ruby_20, :ruby_21]
+  gem 'pry-byebug', platform: mri_2plus
+  gem 'pry-stack_explorer', platform: ruby_2plus
   group :darwin do
     gem 'ruby_gntp'
     gem 'rb-fsevent'
-    gem 'relish'
+    gem 'relish', platform: mri_2plus
     gem 'lunchy'
   end
   gem 'yard'
   gem 'redcarpet'
   gem 'launchy'
 end
 
-gem 'thread_safe'
+group :development do
+  gem 'thread_safe' # for the in_memory_adapter
 
+  # coveralls and it's dependencies need some management under ruby 1.9.3
+  gem 'coveralls', require: false
+  gem 'term-ansicolor', '~> 1.3.0' if RUBY_VERSION == '1.9.3'
+  platform :ruby_19 do
+    gem 'json', '< 2'
+    gem 'addressable', '< 2.5'
+    gem 'tins', '~> 1.6.0'
+  end
+end
+
 require File.expand_path('../test_lib/broker_config', __FILE__)
 
 adapter = BrokerConfig.current_adapter.to_s
 version = BrokerConfig.adapter_version
 provider = BrokerConfig.provider
 
-case adapter
-when 'in_memory'
-else
-  case version
-  when nil
-    gem adapter
-  else
-    gem adapter.to_s, "~> #{version}"
+group :development do
+  unless adapter == 'in_memory'
+    case version
+    when nil
+      gem adapter
+    else
+      gem adapter.to_s, "~> #{version}"
+    end
   end
-end
 
-case provider
-when :rabbitmq
-  gem 'rabbitmq_http_api_client'
+  case provider
+  when :rabbitmq
+    gem 'rabbitmq_http_api_client'
+  end
 end
-
-gem 'coveralls', require: false