legion-transport 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bd62b9624fec1655427b9957cf33e78ce0e6d3e6334ffbbc271013ed8aa7986
-  data.tar.gz: 6b33728ef477505532c606b6ff298e4d0210305a5ca8834b9d47408f084f630b
+  metadata.gz: aca9d21a2d161f0838dc16ce328d81c3ba42360a777c63e6aa805f6c52502e13
+  data.tar.gz: 46af9353894537c81d73a68e01522498181d6d2fb54ae3fcdec465ebb75f8675
 SHA512:
-  metadata.gz: a883f32e68e869a703769199c3276eea70d0587a90553adf3c3a09623131976a3a51f725856a25aaa7a7401e3a8bed44908bbf9e4ac9b7f680bc89a29f2d249a
-  data.tar.gz: 2f7777a6aa714ad9fb69247052985a24f70fd007f29647226000bd8296d5de6c853616a1f341e3f9e65ff45042c11da3cd23ea65f42449da25d511acc300a937
+  metadata.gz: add6818532d2159f4fa2be2a40148694f24511f7ca5095ad4477c9e0b72d70c546b2c7ba7ce6b60b44fa9b538c64e08d032dede1f341bbcb6e1831f541828d0e
+  data.tar.gz: 754b708ce889ff36ab763f4f72887895195721a9f5e43bea168e802ad6cde0e3fc813ef9ed7ac2e11d677388777d264fc635b57912376f96dff1b03d71108ce3

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Legion::Transport ChangeLog
 
+## v1.1.3
+* Adding JRuby support via a different gem
+* Adding more logic on choosing which gem to pick for the CONNECTOR
+* Cleaning up some rubocop things
+
 ## v1.1.2
 Updating queue auto_delete to be false

data/legion-transport.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Used by Legion to connect with RabbitMQ'
   spec.description   = 'The Legion transport gem'
   spec.homepage      = 'https://bitbucket.org/legion-io/legion-transport'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.metadata = {
     'bug_tracker_uri' => 'https://legionio.atlassian.net/projects/TRANSPORT/issues',
@@ -29,16 +30,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'legion-logging'
   spec.add_development_dependency 'legion-settings'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'march_hare' if RUBY_ENGINE == 'jruby'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
-  spec.add_dependency 'concurrent-ruby'
 
-  if RUBY_ENGINE == 'jruby'
-    spec.add_dependency 'march_hare'
-  else
-    spec.add_dependency 'bunny'
-  end
+  spec.add_dependency 'bunny'
+  spec.add_dependency 'concurrent-ruby'
+  spec.add_dependency 'legion-json'
 end

data/lib/legion/transport.rb

@@ -3,7 +3,7 @@ require_relative 'transport/settings'
 
 module Legion
   module Transport
-    if RUBY_ENGINE == 'jruby'
+    if RUBY_ENGINE == 'jruby' && defined?(::Marchhare)
       require 'marchhare'
       TYPE = 'marchhare'.freeze
       CONNECTOR = ::Marchhare

data/lib/legion/transport/message.rb

@@ -103,4 +103,4 @@ module Legion
   end
 end
 
-Dir[__dir__ + '/messages/*.rb'].sort.each { |file| require file }
+Dir["#{__dir__}/messages/*.rb"].sort.each { |file| require file }

data/lib/legion/transport/queue.rb

@@ -38,7 +38,7 @@ module Legion
         {}
       end
 
-      def queue_name # rubocop:disable Metrics/AbcSize
+      def queue_name
         ancestor = self.class.ancestors.first.to_s.split('::')
         name = if ancestor[5].scan(/[A-Z]/).length > 1
                  ancestor[5].gsub!(/(.)([A-Z])/, '\1_\2').downcase!
@@ -59,7 +59,7 @@ module Legion
         channel.acknowledge(delivery_tag)
       end
 
-      def reject(delivery_tag, requeue = false)
+      def reject(delivery_tag, requeue: false)
         channel.reject(delivery_tag, requeue)
       end
     end

data/lib/legion/transport/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Transport
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-transport
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Esity
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,30 +70,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: legion-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,7 +191,6 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -227,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="