Merge pull request #138 from bitwiseman/patch-3

Locked rake version to ~11.3.0

.gitignore

@@ -13,3 +13,6 @@ tmp/
 Gemfile.lock
 Jarfile.lock
 .jbundler/
+lib/hermann_jars.rb
+coverage/
+spec/reports

.travis.yml

@@ -1,10 +1,17 @@
 language: ruby
+sudo: false
 rvm:
 - ruby-head
+- 2.3.0
+- 2.2
 - 2.1
 - 1.9.3
 - jruby
-- ree
+
+# upgrading bundler since our gemspec relying on lib/hermann_jars.rb being
+# present causes troubles with bundler .17.x
+before_install:
+    - gem install bundler -N --version ">= 1.8.0"
 #deploy:
 #  provider: rubygems
 #  gemspec: hermann.gemspec

Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 group :development do
   gem 'jbundler', :platform => :jruby
-  gem 'rake'
+  gem 'rake', '~> 11.3.0'
   gem 'i18n', '~> 0.6.11', :platform => :mri_18
   gem 'activesupport', '~> 3.x', :platform => :mri_18
   gem 'ruby-maven', '~> 3.1.1.0', :platform => :jruby
@@ -23,4 +23,8 @@ group :test do
   # Used for testing encoding protobufs in an out of Hermann in integration
   # tests
   gem 'protobuffy'
+
+  gem 'ci_reporter_rspec'
+  gem 'simplecov'
+  gem 'simplecov-rcov'
 end

Jenkinsfile

@@ -0,0 +1,33 @@
+#!groovy
+
+/* Only keep the 10 most recent builds. */
+properties([[$class: 'BuildDiscarderProperty',
+                strategy: [$class: 'LogRotator', numToKeepStr: '10']]])
+
+stage ('Build') {
+
+  node {
+    // Checkout
+    checkout scm
+
+    // install required bundles
+    sh 'bundle install'
+
+    // build and run tests with coverage
+    sh 'bundle exec rake build spec'
+
+    // Archive the built artifacts
+    archive (includes: 'pkg/*.gem')
+
+    // publish html
+    publishHTML ([
+        allowMissing: false,
+        alwaysLinkToLastBuild: false,
+        keepAll: true,
+        reportDir: 'coverage',
+        reportFiles: 'index.html',
+        reportName: "RCov Report"
+      ])
+
+  }
+}

README.md

@@ -1,6 +1,6 @@
 # Hermann
 
-[![Gitter chat](https://badges.gitter.im/lookout/Hermann.png)](https://gitter.im/lookout/Hermann) [![Build Status](https://travis-ci.org/lookout/hermann.svg?branch=master)](https://travis-ci.org/lookout/hermann)
+[![Gitter chat](https://badges.gitter.im/reiseburo/hermann.png)](https://gitter.im/reiseburo/hermann) [![Build Status](https://travis-ci.org/reiseburo/hermann.svg?branch=master)](https://travis-ci.org/reiseburo/hermann)
 
 A Ruby gem implementing a Kafka Publisher and Consumer
 
@@ -114,6 +114,14 @@ end
 
 ```
 
+#### Build & Unit Test 
+
+First time (from a clean repository): 
+`bundle install && bundle exec rake`
+
+Thereafter: 
+`bundle exec rake spec`
+
 #### Testing
 
 To run the integration tests:

RELEASING.md

@@ -0,0 +1,17 @@
+# Releasing Hermann
+
+Hermann is a multi-platform gem, which means that two actual `.gem` files need
+to be built and uploaded to [rubygems.org](https://rubygems.org/gems/hermann).
+
+Here's the current process that [I](https://github.com/rtyler) use:
+
+ * `rvm use ruby@rubygems` (*switch to MRI*)
+ * `bundle install && rake` (*ensure that MRI tests pass*)
+ * `rvm use jruby@rubygems` (*switch to JRuby*)
+ * `bundle install && rake` (*ensure that the JRuby tests pass*)
+ * `rake release` (*tag the release and upload the `-java` platform gem*)
+ * `rvm use ruby@rubygems` (*switch back to MRI*)
+ * `gem build hermann.gemspec` (*build the 'ruby' platform gem*)
+ * `gem push pkg/hermann-0.blah.gem` (*upload the ruby platform gem*)
+
+This can certainly be cleaned up, but this is the process at it is right now

Rakefile

@@ -3,7 +3,7 @@ require 'fileutils'
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 require 'rake/extensiontask'
-
+require 'ci/reporter/rake/rspec'
 
 Rake::ExtensionTask.new do |t|
   t.name = 'hermann_rdkafka'

hermann.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/lookout/Hermann'
   s.licenses = ['MIT']
 
-  s.files = [ "Rakefile"]
+  s.files = ['Rakefile']
   s.files += `git ls-files -- lib`.split($\)
   s.files += `git ls-files -- ext`.split($\)
 
@@ -28,15 +28,16 @@ Gem::Specification.new do |s|
   s.add_dependency 'thread_safe', '~> 0.3.4'
 
   if RUBY_PLATFORM == "java"
-    s.add_dependency 'concurrent-ruby', '~> 0.7.0'
+    s.files << 'lib/hermann_jars.rb'
+    s.add_dependency 'concurrent-ruby', '~> 1.0.0'
 
     # IMPORTANT: make sure that jar-dependencies is only a development
     # dependency of your gem. if it is a runtime dependencies the require_jars
     # file will be overwritten during installation.
     s.add_dependency 'jar-dependencies', ['~> 0.1', '>= 0.1.10']
-    s.requirements << "jar org.apache.kafka:kafka_2.10, ~>0.8.1.1"
+    s.requirements << "jar org.apache.kafka:kafka_2.11, ~> 0.8.2.2"
     # use log4j-1.2.16+ to as 1.2.15 declares deps which are not in maven central and causes the dep resolution to fail
-    s.requirements << "jar log4j:log4j, ~>1.2.16"
+    s.requirements << "jar log4j:log4j, ~> 1.2.16"
     s.require_paths = ["lib"]
     s.platform = 'java'
   else

lib/hermann/producer.rb

@@ -102,7 +102,8 @@ module Hermann
         @children.each do |child|
           # Skip over any children that should already be reaped for other
           # reasons
-          next if child.completed?
+          next if (Hermann.jruby? ? child.fulfilled? : child.completed?)
+
           # Propagate errors to the remaining children
           child.internal_set_error(ex)
         end
@@ -118,7 +119,7 @@ module Hermann
       # Filter all children who are no longer pending/fulfilled
       total_children = @children.size
 
-      @children = @children.reject { |c| c.completed? }
+      @children = @children.reject { |c| Hermann.jruby? ? c.fulfilled? : c.completed? }
 
       return (total_children - children.size)
     end

lib/hermann_jars.rb

@@ -1,13 +0,0 @@
-# this is a generated file, to avoid over-writing it just delete this comment
-require 'jar_dependencies'
-
-require_jar( 'org.apache.zookeeper', 'zookeeper', '3.3.4' )
-require_jar( 'net.sf.jopt-simple', 'jopt-simple', '3.2' )
-require_jar( 'org.xerial.snappy', 'snappy-java', '1.0.5' )
-require_jar( 'jline', 'jline', '0.9.94' )
-require_jar( 'com.101tec', 'zkclient', '0.3' )
-require_jar( 'log4j', 'log4j', '1.2.17' )
-require_jar( 'org.scala-lang', 'scala-library', '2.10.1' )
-require_jar( 'org.slf4j', 'slf4j-api', '1.7.2' )
-require_jar( 'com.yammer.metrics', 'metrics-core', '2.2.0' )
-require_jar( 'org.apache.kafka', 'kafka_2.10', '0.8.1.1' )

spec/spec_helper.rb

@@ -2,6 +2,13 @@ require 'rubygems'
 require 'yaml'
 require 'rspec'
 
+require 'simplecov'
+require 'simplecov-rcov'
+
+SimpleCov.start do
+  formatter = SimpleCov::Formatter::RcovFormatter
+end
+
 # Add ext/ to the load path so we can load `hermann_lib`
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../ext/'))
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib/'))