mirror of https://github.com/reiseburo/hermann
Rework the dependencies and some of the code to support retro rubies better
This commit is contained in:
parent
069150cd1f
commit
3fda5ec3f3
2
Gemfile
2
Gemfile
|
@ -5,6 +5,8 @@ gemspec
|
||||||
group :development do
|
group :development do
|
||||||
gem 'jbundler', :platform => :jruby
|
gem 'jbundler', :platform => :jruby
|
||||||
gem 'rake'
|
gem 'rake'
|
||||||
|
gem 'i18n', '~> 0.6.11', :platform => :mri_18
|
||||||
|
gem 'activesupport', '~> 3.x', :platform => :mri_18
|
||||||
gem 'ruby-maven', '~> 3.1.1.0', :platform => :jruby
|
gem 'ruby-maven', '~> 3.1.1.0', :platform => :jruby
|
||||||
gem 'jar-dependencies', :platform => :jruby
|
gem 'jar-dependencies', :platform => :jruby
|
||||||
gem 'rake-compiler'
|
gem 'rake-compiler'
|
||||||
|
|
|
@ -24,10 +24,12 @@ Gem::Specification.new do |s|
|
||||||
s.rubygems_version = '2.2.2'
|
s.rubygems_version = '2.2.2'
|
||||||
s.specification_version = 3 if s.respond_to?(:specification_version)
|
s.specification_version = 3 if s.respond_to?(:specification_version)
|
||||||
|
|
||||||
s.add_dependency 'concurrent-ruby', '~> 0.7.0'
|
s.add_dependency 'json', '~> 1.8.2'
|
||||||
s.add_dependency 'thread_safe', '~> 0.3.4'
|
s.add_dependency 'thread_safe', '~> 0.3.4'
|
||||||
|
|
||||||
if RUBY_PLATFORM == "java"
|
if RUBY_PLATFORM == "java"
|
||||||
|
s.add_dependency 'concurrent-ruby', '~> 0.7.0'
|
||||||
|
|
||||||
# IMPORTANT: make sure that jar-dependencies is only a development
|
# IMPORTANT: make sure that jar-dependencies is only a development
|
||||||
# dependency of your gem. if it is a runtime dependencies the require_jars
|
# dependency of your gem. if it is a runtime dependencies the require_jars
|
||||||
# file will be overwritten during installation.
|
# file will be overwritten during installation.
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
module Hermann
|
module Hermann
|
||||||
require 'java'
|
require 'java'
|
||||||
require 'hermann_jars'
|
require 'hermann_jars'
|
||||||
|
require 'concurrent'
|
||||||
|
|
||||||
module JavaUtil
|
module JavaUtil
|
||||||
include_package 'java.util'
|
include_package 'java.util'
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
require 'hermann'
|
|
||||||
require 'concurrent'
|
|
||||||
require 'json'
|
require 'json'
|
||||||
|
require 'hermann'
|
||||||
require 'hermann/errors'
|
require 'hermann/errors'
|
||||||
|
|
||||||
module Hermann
|
module Hermann
|
||||||
|
|
|
@ -55,7 +55,7 @@ describe Hermann::Consumer do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'on Jruby', :platform => :java do
|
context 'on Jruby', :platform => :java do
|
||||||
subject(:consumer) { described_class.new(topic, group_id: groupId, zookeepers: zookeepers) }
|
subject(:consumer) { described_class.new(topic, :group_id => groupId, :zookeepers => zookeepers) }
|
||||||
|
|
||||||
let(:zookeepers) { 'localhost:2181' }
|
let(:zookeepers) { 'localhost:2181' }
|
||||||
let(:groupId) { 'groupId' }
|
let(:groupId) { 'groupId' }
|
||||||
|
|
|
@ -3,12 +3,12 @@ require 'spec_helper'
|
||||||
require 'hermann/producer'
|
require 'hermann/producer'
|
||||||
require 'hermann/consumer'
|
require 'hermann/consumer'
|
||||||
require 'hermann/discovery/zookeeper'
|
require 'hermann/discovery/zookeeper'
|
||||||
require 'concurrent'
|
|
||||||
|
|
||||||
require 'protobuf'
|
require 'protobuf'
|
||||||
require_relative '../fixtures/testevent.pb'
|
|
||||||
|
|
||||||
describe 'producer' do
|
require 'spec/fixtures/testevent.pb'
|
||||||
|
|
||||||
|
describe 'producer', :platform => :java do
|
||||||
include_context 'integration test context'
|
include_context 'integration test context'
|
||||||
|
|
||||||
let(:timeout) { 10 }
|
let(:timeout) { 10 }
|
||||||
|
|
Loading…
Reference in New Issue