message-driver 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb14ebba5623881502473a9a4b06dc0b1d863169
-  data.tar.gz: ca2251f3c765cdb81ce9fe2b6114bdc2ca45331d
+  metadata.gz: d3bcb04e7ce78a6c1fa187b2c3a4c1bdecc74506
+  data.tar.gz: 87bde205475a8f149eb6d08b0520b24826316189
 SHA512:
-  metadata.gz: 38f17b47d77f1fcdc2136d505a1a86220548ccf3363c354bea932615ddc42a2e9d8d9b15ac0d53c29fbef384cb5be4f5270d902f8e0a88c1855c0be8b0df1c15
-  data.tar.gz: 3ba7521ab3f5abf49212ab0ff2fe54d0f604e80f265f0c360d66b6575c52af66d3e71e12efedf86477784269d1ed71b2d2e3474994dd7e91694dad3faa47b822
+  metadata.gz: e9f602d1836c47357d30d76c7c34e1e75a5ebad910f84fa6871960d4fdefc9913c30d612ae9c4b3d52b84368ef8046164d1bc0a922f62f4f8e965d5d8fabb0a2
+  data.tar.gz: cf87a47b64e7fd438c515c4abb5891f6f6c803190d2fa3e7b8e89f3722f20db0be9ef89dd5c14ffc8c85a4c0896945ae4dfcc9ebce1b84e2ea9e0321b04829dd

data/.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: '.rubocop_todo.yml'
 
 AllCops:
+  TargetRubyVersion: 1.9
   Include:
     - 'message-driver.gemspec'
     - '**/Gemfile'
@@ -10,6 +11,9 @@ AllCops:
     - 'lib/vendor/**/*.rb'
     - 'vendor/**/*'
 
+Bundler/OrderedGems:
+  Enabled: false
+
 Metrics/BlockNesting:
   Max: 4
 
@@ -19,6 +23,9 @@ Metrics/LineLength:
   Include:
     - 'lib/**/*.rb'
 
+Metrics/ParameterLists:
+  Enabled: false
+
 Style/AccessorMethodName:
   Enabled: false
 
@@ -32,12 +39,23 @@ Style/FileName:
   Exclude:
     - 'lib/message-driver.rb'
 
+Style/MultilineMethodCallBraceLayout:
+  EnforcedStyle: new_line
+
 Style/NumericLiterals:
   Enabled: false
 
+Style/OptionalArguments:
+  Enabled: false
+
+Style/RaiseArgs:
+  Enabled: false
+
 Style/RegexpLiteral:
-  Exclude:
-    - 'Guardfile'
+  EnforcedStyle: slashes
+
+Style/RescueModifier:
+  Enabled: false
 
 Style/TrivialAccessors:
   ExactNameMatch: true

data/.rubocop_todo.yml

@@ -1,14 +1,20 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-11-12 20:52:38 -0600 using RuboCop version 0.27.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-12-06 13:04:29 -0600 using RuboCop version 0.46.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
+# Offense count: 9
 Metrics/AbcSize:
   Enabled: false
 
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Enabled: false
+
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
@@ -23,30 +29,16 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Enabled: false
 
+# Offense count: 7
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Enabled: false
+
 # Offense count: 3
 Metrics/PerceivedComplexity:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 13
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
-
-# Offense count: 1
-Style/ModuleFunction:
-  Enabled: false
-
-# Offense count: 1
-Style/MultilineBlockChain:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-Style/SymbolProc:
-  Enabled: false

data/.travis.yml

@@ -1,48 +1,36 @@
 language: ruby
-sudo: true
+sudo: required
 before_install: gem install bundler
 bundler_args: --without tools darwin
 services:
   - rabbitmq
 before_script:
-  - ci/travis_setup
+  - sudo rabbitmq-plugins enable rabbitmq_stomp
 script: bundle exec rake ci
 rvm:
+  - 2.3
   - 2.2
   - 2.0.0
   - 1.9.3
   - jruby-19mode
-  - 1.9.2
   - rbx-2
 env:
   - ADAPTER=in_memory
   - ADAPTER=bunny:1.7.0
-  - ADAPTER=bunny:2.0.1
-  - ADAPTER=bunny:2.1.0
-  - ADAPTER=bunny:2.2.0
-  - ADAPTER=stomp
+  - ADAPTER=bunny:2.5.1
+  - ADAPTER=bunny:2.6.1
+  - ADAPTER=stomp:1.3.1
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: rbx-2
     - rvm: jruby-19mode
-    - rvm: 1.9.2
   exclude:
-    - rvm: 1.9.2
-      env: ADAPTER=bunny:2.0.1
     - rvm: 1.9.3
-      env: ADAPTER=bunny:2.0.1
+      env: ADAPTER=bunny:2.5.1
     - rvm: jruby-19mode
-      env: ADAPTER=bunny:2.0.1
-    - rvm: 1.9.2
-      env: ADAPTER=bunny:2.1.0
+      env: ADAPTER=bunny:2.5.1
     - rvm: 1.9.3
-      env: ADAPTER=bunny:2.1.0
+      env: ADAPTER=bunny:2.6.1
     - rvm: jruby-19mode
-      env: ADAPTER=bunny:2.1.0
-    - rvm: 1.9.2
-      env: ADAPTER=bunny:2.2.0
-    - rvm: 1.9.3
-      env: ADAPTER=bunny:2.2.0
-    - rvm: jruby-19mode
-      env: ADAPTER=bunny:2.2.0
+      env: ADAPTER=bunny:2.6.1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.7.0 - 2016-12-19
+
+* update test gems
+* drop support for ruby 1.9.2
+* test against newer versions of bunny
+* Restructure internal API for adapter contexts to better facilitate instrumentation
+* Make the in_memory adapter actually support multiple subscriptions per destination
+    * This is a breaking change if you depended on the old behavior!
+
 ## 0.6.1 - 2016-01-28
 
 * fix an issue that prevents gems built under ruby 2.3.0 to be installed

data/Gemfile

@@ -7,21 +7,22 @@ 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'
@@ -29,7 +30,18 @@ group :tools do
   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__)
 
@@ -37,20 +49,18 @@ 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

data/Guardfile

@@ -8,43 +8,60 @@ guard 'bundler' do
   watch(/^.+\.gemspec/)
 end
 
-common_rspec_opts = { all_after_pass: true }
-unit_spec_opts = common_rspec_opts.merge(spec_paths: ['spec/units'], cmd: 'bundle exec rspec -f doc', run_all: { cmd: 'bundle exec rspec' })
+common_rspec_opts = {
+  all_after_pass: false,
+  cmd: 'bundle exec rspec -f doc',
+  run_all: { cmd: 'bundle exec rspec' }
+}
+unit_spec_opts = common_rspec_opts.merge(
+  spec_paths: ['spec/units'],
+  results_file: File.join(File.dirname(__FILE__), "tmp/rspec_units_#{BrokerConfig.current_adapter}_guard_result")
+)
 integration_spec_opts = common_rspec_opts.merge(
   spec_paths: ["spec/integration/#{BrokerConfig.current_adapter}"],
-  cmd: 'bundle exec rspec -f doc -t all_adapters',
-  run_all: { cmd: 'bundle exec rspec -t all_adapters' }
+  results_file: File.join(File.dirname(__FILE__), "tmp/rspec_integration_#{BrokerConfig.current_adapter}_guard_result"),
+  cmd_additional_args: '-t all_adapters'
 )
 
-group 'specs' do
-  guard 'rspec', unit_spec_opts do
-    watch(%r{^spec/units/.+_spec\.rb$})
-    watch(%r{^lib/(.+)\.rb$})          { |m| "spec/units/#{m[1]}_spec.rb" }
-    watch(%r{^spec/support/(.+)\.rb$}) { 'spec' }
-    watch('spec/spec_helper.rb')       { 'spec' }
+group :tests_and_checks, halt_on_failure: true do
+  group 'specs' do
+    guard 'rspec', unit_spec_opts do
+      watch(%r{^spec/units/.+_spec\.rb$})
+      watch(%r{^lib/(.+)\.rb$})          { |m| "spec/units/#{m[1]}_spec.rb" }
+      watch(%r{^spec/support/(.+)\.rb$}) { 'spec/units' }
+      watch('spec/spec_helper.rb')       { 'spec/units' }
+    end
   end
-end
 
-group 'integration' do
-  guard 'rspec', integration_spec_opts do
-    watch(%r{^spec/integration/.+_spec\.rb$})
-    watch(%r{^lib/(.+)\.rb$})          { |m| "spec/integration/#{m[1]}_spec.rb" }
-    watch(%r{^spec/support/(.+)\.rb$}) { 'spec' }
-    watch('spec/spec_helper.rb')       { 'spec' }
+  group 'integration' do
+    guard 'rspec', integration_spec_opts do
+      watch(%r{^spec/integration/.+_spec\.rb$})
+      watch(%r{^lib/message_driver/adapters/(.+)\.rb$}) { |m| "spec/integration/#{BrokerConfig.current_adapter}/#{m[1]}_spec.rb" }
+      watch(%r{^spec/support/(.+)\.rb$}) { integration_spec_opts[:spec_paths] }
+      watch('spec/spec_helper.rb') { integration_spec_opts[:spec_paths] }
+    end
   end
-end
 
-group 'features' do
-  cucumber_cli = "--no-profile --color --format progress --strict --tag @all_adapters,@#{BrokerConfig.current_adapter} --tag ~@wip"
-  cucumber_run_all_cli = "#{cucumber_cli} --tag ~@slow"
-  guard 'cucumber', change_format: 'pretty', all_on_start: false, cli: cucumber_cli, run_all: { cli: cucumber_run_all_cli } do
-    watch(%r{^features/.+\.feature$})
-    watch(%r{^features/support/.+$})          { 'features' }
-    watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+  group 'features' do
+    guard('cucumber',
+          all_on_start: false,
+          cmd: "bundle exec cucumber --no-profile --color --strict --tag @all_adapters,@#{BrokerConfig.current_adapter} --tag ~@wip",
+          cmd_additional_args: '--format pretty --tag ~@slow',
+          run_all: {
+            cmd_additional_args: '--format progress --tag ~@slow'
+          }
+         ) do
+      watch(%r{^features/.+\.feature$})
+      watch(%r{^features/support/.+$}) { 'features' }
+      watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+    end
   end
-end
 
-guard :rubocop do
-  watch(/.+\.rb/)
-  watch(%r{(?:.+/)?\.rubocop(?:_.+)*\.yml$}) { |m| File.dirname(m[0]) }
+  guard :rubocop, cli: '-D -E' do
+    watch(/.+\.rb$/)
+    watch('Gemfile')
+    watch('Guardfile')
+    watch(/.+\.gemspec$/)
+    watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
+  end
 end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2015 Matt Campbell
+Copyright (c) 2013-2016 Matt Campbell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -6,12 +6,12 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
-require 'coveralls/rake/task'
-
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new do |t|
     t.fail_on_error = false
+    t.options << '-D'
+    t.options << '-E'
   end
 rescue LoadError
   puts 'rubocop not present'
@@ -31,7 +31,7 @@ namespace :spec do
   end
 
   cucumber_opts = "--format progress --tag @all_adapters,@#{BrokerConfig.current_adapter} --tag ~@wip"
-  cucumber_opts += ' --tag ~@no_ci' #if ENV['CI'] == 'true' && ENV['ADAPTER'] && ENV['ADAPTER'].start_with?('bunny')
+  cucumber_opts += ' --tag ~@no_ci' # if ENV['CI'] == 'true' && ENV['ADAPTER'] && ENV['ADAPTER'].start_with?('bunny')
   Cucumber::Rake::Task.new(:features) do |t|
     t.cucumber_opts = cucumber_opts
   end
@@ -48,7 +48,6 @@ begin
 
   YARD::Rake::YardocTask.new(:docs)
   namespace :docs do
-
     desc 'open the documentation for this gem in your browser'
     task open: [:docs] do
       Launchy.open("file:///#{File.join(Dir.pwd, 'doc', 'index.html')}")
@@ -74,8 +73,17 @@ def set_adapter_under_test(adapter)
   system "echo #{adapter} > #{File.join(File.dirname(__FILE__), '.adapter_under_test')}"
 end
 
-Coveralls::RakeTask.new
-desc 'run with code coverage'
+begin
+  require 'coveralls/rake/task'
+  Coveralls::RakeTask.new
+  desc 'run with code coverage'
+rescue LoadError
+  puts "couldn't load coveralls gems, code coverage tasks not available"
+  namespace :coveralls do
+    task :push
+  end
+end
+
 task ci: ['spec', 'coveralls:push']
 
 namespace :undertest do

data/features/CHANGELOG.md

@@ -0,0 +1 @@
+../CHANGELOG.md

data/features/step_definitions/logging_steps.rb

@@ -1,6 +1,6 @@
 require 'logger'
 
-LOG_FILE_NAME = 'cucumber_log_file.log'
+LOG_FILE_NAME = 'cucumber_log_file.log'.freeze
 
 Given(/^I am logging to a log file(?: at the (#{STRING_OR_SYM}) level)?$/) do |level|
   step "an empty file named \"#{LOG_FILE_NAME}\""
@@ -8,7 +8,8 @@ Given(/^I am logging to a log file(?: at the (#{STRING_OR_SYM}) level)?$/) do |l
     @logger = Logger.new(LOG_FILE_NAME)
   end
   step "I set the log level to #{level || 'info'}"
-  @orig_logger, MessageDriver.logger = MessageDriver.logger, @logger
+  @orig_logger = MessageDriver.logger
+  MessageDriver.logger = @logger
 end
 
 Given(/^I set the log level to (#{STRING_OR_SYM})$/) do |level|