protobuf-nats 0.10.2 → 0.10.3.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56bd1c8b7367534bdb06a6e92afb1a3593c8333157a2ab7b348d3813d7c7bc7d
-  data.tar.gz: 1ea7763925d8aac77092945de99e50707905eb2c21ea657ecca9c12fe98df4f2
+  metadata.gz: 3ff8c1cf794fd44ab13e6de90476890c29c083d242aa80a2f1e1072485c7bfe2
+  data.tar.gz: edba1e8c55228916e506e7840f4fae4b2118420b8ea1d2fc4879eac14169134c
 SHA512:
-  metadata.gz: 1963bcda2ae4fd5f1f9c36d6778625300a2a1557963ef4b7622a04eee764c4b5d0a0d79efe9a2d71b447d29258842b0438bd1a6f6436b22f2ec6b3b72fbc265c
-  data.tar.gz: a1f321734d00671c43f0b2b22c447cf5c991ec734ff6c015058592e0ebde6facc6955a4fa9c2e38969862d56fd8a3c78d577f6882b45a9498ad34e9c1bc47ed0
+  metadata.gz: a2284a77ebd58b47b6812d221554d3becc19f4a724b648fc3d101fdfb8f9ebf73194b4cf92557cbfab458ffaa99e998f8fc37092fe5dc03ce16781ff7c3d0c4d
+  data.tar.gz: 1e9894389ae24f8ec6288b0022234277a00f49a6ad2f816137bdc80e4c3423b75e289f98db9560b2d926cfc6d7e4cc7fab10ccdbd0960fff12fa2c3f16c920ef

data/.travis.yml

@@ -4,7 +4,13 @@ jdk:
  - openjdk8
 rvm:
   - 2.3.0
+  - 2.7.0
   - jruby-9.1.7.0
+  - jruby-9.2.13.0
 before_install:
-  - gem install bundler -v 1.14.3
+  # Install and start gnatsd
+  - ./scripts/install_gnatsd.sh
+  - $HOME/nats-server/nats-server &
+  # Install deps for project
+  - gem install bundler
   - gem update --system

data/README.md

@@ -154,6 +154,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+The java-nats client is temporarily forked to support jruby > 9.2.10.0. The living branch for that is here: https://github.com/film42/java-nats/tree/jruby-compat. This will be removed when we upgrade to the new nats.java client.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/abrandoned/protobuf-nats.

data/lib/protobuf/nats/jnats.rb

@@ -5,11 +5,6 @@ require ::File.join(ext_base, "jars/slf4j-simple-1.7.25.jar")
 require ::File.join(ext_base, "jars/gson-2.6.2.jar")
 require ::File.join(ext_base, "jars/jnats-1.1-SNAPSHOT.jar")
 
-# Set field accessors so we can access the member variables directly.
-class Java::IoNatsClient::SubscriptionImpl
-  field_accessor :pMsgs, :pBytes, :delivered
-end
-
 module Protobuf
   module Nats
     class JNats
@@ -190,9 +185,9 @@ module Protobuf
               # We have to update the subscription stats so we're not considered a slow consumer.
               begin
                 sub.lock
-                sub.pMsgs -= 1
-                sub.pBytes -= message.getData.length if message.getData
-                sub.delivered += 1 unless sub.isClosed
+                sub.incrPMsgs(-1)
+                sub.incrPBytes(-message.getData.length) if message.getData
+                sub.incrDelivered(1) unless sub.isClosed
               ensure
                 sub.unlock
               end

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.10.2"
+    VERSION = "0.10.3.pre0"
   end
 end

data/scripts/install_gnatsd.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+export DEFAULT_NATS_SERVER_VERSION=v2.0.0
+
+export NATS_SERVER_VERSION="${NATS_SERVER_VERSION:=$DEFAULT_NATS_SERVER_VERSION}"
+
+# check to see if nats-server folder is empty
+if [ ! "$(ls -A $HOME/nats-server)" ]; then
+    (
+	mkdir -p $HOME/nats-server
+	cd $HOME/nats-server
+	wget https://github.com/nats-io/nats-server/releases/download/$NATS_SERVER_VERSION/nats-server-$NATS_SERVER_VERSION-linux-amd64.zip -O nats-server.zip
+	unzip nats-server.zip
+	cp nats-server-$NATS_SERVER_VERSION-linux-amd64/nats-server $HOME/nats-server/nats-server
+    )
+else
+  echo 'Using cached directory.';
+fi

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3.pre0
 platform: ruby
 authors:
 - Brandon Dewitt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+  name: activesupport
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,12 +25,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: connection_pool
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,7 +39,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -48,6 +47,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.2
+  name: protobuf
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.7.2
 - !ruby/object:Gem::Dependency
-  name: nats-pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -68,6 +67,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
+  name: nats-pure
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,12 +79,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: bundler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,12 +93,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,12 +107,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -121,12 +121,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: benchmark-ips
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -135,12 +135,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -184,12 +184,13 @@ files:
 - lib/protobuf/nats/thread_pool.rb
 - lib/protobuf/nats/version.rb
 - protobuf-nats.gemspec
-homepage: 
+- scripts/install_gnatsd.sh
+homepage:
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,13 +201,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: ruby-protobuf client/server for nats
 test_files: []