legion-transport 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567b542ea43b5a232f8abdde592f899666b9dff1e976fe6c14790394ab056bd2
-  data.tar.gz: 103aab3379485b1731119820f26b8b38b25fd8592efe9b1e6c7fa10aa9f629e9
+  metadata.gz: 63d52e031c058a898022ffe052a75fdee6bd83208f37e5413e5e1b361883d3bd
+  data.tar.gz: 5be4a5d602de235d0ff73fab3f31c93f8ac664eee869f4e0bd6f36e3471dc49e
 SHA512:
-  metadata.gz: 66958af49eba04baee630061c0359078cbf02955392b830e921587044425e7b3333d511198006d7324a49e4364a56ad98b2234a4b55b6724029b5c7f805c0676
-  data.tar.gz: ddeddc83b4a865af2a9ee817732f7102b8bde0ef5b8b729b8959dea1176ab9da945ce42b799a55e6bc5f83101f38a11756a0e519355b9fd296f1de6f353de4fa
+  metadata.gz: f65bf581a683147c76a1b64d410b1603397f1f66365209b2bae6d89607e967cac7aaf641b9a88dfb9e434ef5ac4871da9737ff2bf0814a52331730c0ff3f1145
+  data.tar.gz: ada8ca704e24de54ff6096b094b1352117495b7c1f9a3ce67bdbb107629dbd4b77282193b55b0f7f7617b6214f4943e44ad30d95b8d4feb1333bc23b2bba3d32

data/.circleci/config.yml

@@ -14,6 +14,7 @@ jobs:
       - run:
           name: Run Rubocop
           command: bundle exec rubocop
+      - sonarcloud/scan
       - ruby/save-cache
   "ruby-two-five":
     docker:
@@ -27,6 +28,7 @@ jobs:
           command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
+      - sonarcloud/scan
       - ruby/save-cache
   "ruby-two-six":
     docker:
@@ -40,6 +42,7 @@ jobs:
           command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
+      - sonarcloud/scan
       - ruby/save-cache
   "ruby-two-seven":
     docker:
@@ -53,19 +56,6 @@ jobs:
           command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
-      - ruby/save-cache
-  "sonarcloud":
-    docker:
-      - image: circleci/ruby:2.7
-      - image: rabbitmq:3.7
-    steps:
-      - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - run:
-          name: Run Rubocop
-          command: bundle exec rubocop --format=json --out=rubocop-result.json
       - sonarcloud/scan
       - ruby/save-cache
 
@@ -82,8 +72,4 @@ workflows:
             - ruby-two-five
       - ruby-two-seven:
           requires:
-            - ruby-two-five
-      - sonarcloud:
-          requires:
-            - ruby-two-seven
-            - ruby-two-six
+            - ruby-two-five

data/.rubocop.yml

@@ -6,6 +6,8 @@ Metrics/ClassLength:
   Max: 1500
 Metrics/BlockLength:
   Max: 50
+  Exclude:
+    - 'spec/*/**.rb'
 Metrics/PerceivedComplexity:
   Max: 15
 Metrics/CyclomaticComplexity:
@@ -19,6 +21,7 @@ Style/Documentation:
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
+  SuggestExtensions: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Legion::Transport ChangeLog
 
+## v1.1.8
+* Removing codecov gem
+* Changing bunny gem requirement to `>= 2.17.0`
+* Changing current-ruby gem requirement to `>= 1.1.7`
+* Removing JRuby support
+* Removing bin/ folder
+* Cleaning up some channel objects inside Messages and Queues
+
 ## v1.1.3
 * Adding JRuby support via a different gem
 * Adding more logic on choosing which gem to pick for the CONNECTOR

data/bitbucket-pipelines.yml

@@ -1,25 +1,14 @@
-image: ruby:2.7.0
+image: ruby:2.7
 
 pipelines:
-  branches:
-    master:
-    - step:
-        caches:
-        - bundler
-        script:
-        - gem install bundle rubocop
-        - gem update bundler
-        - bundle install
-        - rubocop
-        - rake
-        services:
-        - broker
-definitions:
-  caches:
-    bundler: vendor/bundle
-  services:
-    broker:
-      image: rabbitmq:3
-      environment:
-        RABBITMQ_DEFAULT_USER: guest
-        RABBITMQ_DEFAULT_PASS: guest
+  tags:
+    "v*":
+      - step:
+          name: Push to RubyGems
+          deployment: RubyGems
+          script:
+            - gem install gem-release
+            - (umask  077 ; echo $gem_creds | base64 --decode > ~/.gem/credentials)
+            - gem release
+          artifacts:
+            - pkg/**

data/legion-transport.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'legion/transport/version'
 
 Gem::Specification.new do |spec|
-  spec.name = (RUBY_ENGINE == 'jruby' ? 'legion-transport-java' : 'legion-transport')
+  spec.name = 'legion-transport'
   spec.version       = Legion::Transport::VERSION
   spec.authors       = ['Esity']
   spec.email         = ['matthewdiverson@gmail.com']
@@ -23,21 +23,17 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'legion-logging'
   spec.add_development_dependency 'legion-settings'
-  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 'bunny'
-  spec.add_dependency 'concurrent-ruby'
+  spec.add_dependency 'bunny', '>= 2.17.0'
+  spec.add_dependency 'concurrent-ruby', '>= 1.1.7'
   spec.add_dependency 'legion-json'
 end

data/lib/legion/transport/connection.rb

@@ -4,11 +4,21 @@ module Legion
   module Transport
     module Connection
       class << self
+        def new
+          clone
+        end
+
         def connector
           Legion::Transport::CONNECTOR
         end
 
-        def setup # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def reconnect(connection_name: 'Legion', **)
+          @session = nil
+          @channel_thread = Concurrent::ThreadLocalVar.new(nil)
+          setup(connection_name: connection_name)
+        end
+
+        def setup(connection_name: 'Legion', **) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           Legion::Logging.info("Using transport connector: #{Legion::Transport::CONNECTOR}")
 
           if @session.respond_to?(:value) && session.respond_to?(:closed?) && session.closed?
@@ -16,7 +26,7 @@ module Legion
           elsif @session.respond_to?(:value) && session.respond_to?(:closed?) && session.open?
             nil
           elsif Legion::Transport::TYPE == 'march_hare'
-            @session ||= Concurrent::Atom.new(
+            @session ||= Concurrent::AtomicReference.new(
               MarchHare.connect(host: Legion::Settings[:transport][:connection][:host],
                                 vhost: Legion::Settings[:transport][:connection][:vhost],
                                 user: Legion::Settings[:transport][:connection][:user],
@@ -28,9 +38,10 @@ module Legion
             session.create_channel.basic_qos(1)
             Legion::Settings[:transport][:connected] = true
           else
-            @session ||= Concurrent::Atom.new(
+            @session ||= Concurrent::AtomicReference.new(
               connector.new(
                 Legion::Settings[:transport][:connection],
+                connection_name: connection_name,
                 logger: Legion::Logging::Logger.new(level: 'warn'),
                 log_level: :info
               )
@@ -79,14 +90,19 @@ module Legion
 
         def channel_open?
           channel.open?
+        rescue StandardError
+          false
         end
 
         def session_open?
           session.open?
+        rescue StandardError
+          false
         end
 
         def shutdown
           session.close
+          @session = nil
         end
       end
     end

data/lib/legion/transport/message.rb

@@ -107,6 +107,10 @@ module Legion
       def validate
         @valid = true
       end
+
+      def channel
+        Legion::Transport::Connection.channel
+      end
     end
   end
 end

data/lib/legion/transport/messages/task_update.rb

@@ -2,8 +2,13 @@ require 'legion/transport/exchanges/task'
 
 module Legion
   module Exception
-    class InvalidTaskStatus; end
-    class InvalidTaskId; end
+    class InvalidTaskStatus < ArgumentError
+      # exception class
+    end
+
+    class InvalidTaskId < ArgumentError
+      # exception class
+    end
   end
 end
 

data/lib/legion/transport/queue.rb

@@ -9,13 +9,13 @@ module Legion
         super(channel, queue, options_builder(default_options, queue_options, options))
       rescue Legion::Transport::CONNECTOR::PreconditionFailed
         retries.zero? ? retries = 1 : raise
-        recreate_queue(channel, queue)
+        recreate_queue(queue)
         retry
       end
 
-      def recreate_queue(channel, queue)
+      def recreate_queue(queue)
         Legion::Logging.warn "Queue:#{queue} exists with wrong parameters, deleting and creating"
-        queue = ::Bunny::Queue.new(channel, queue, no_declare: true, passive: true)
+        queue = ::Bunny::Queue.new(Legion::Transport::Connection.channel, queue, no_declare: true, passive: true)
         queue.delete(if_empty: true)
       end
 

data/lib/legion/transport/settings.rb

@@ -7,11 +7,12 @@ module Legion
       def self.connection
         {
           read_timeout: 1,
-          heartbeat: 1,
+          heartbeat: 30,
           automatically_recover: true,
           continuation_timeout: 4000,
           network_recovery_interval: 1,
           connection_timeout: 1,
+          frame_max: 65_536,
           user: 'guest',
           password: 'guest',
           host: '127.0.0.1',

data/lib/legion/transport/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Transport
-    VERSION = '1.1.6'.freeze
+    VERSION = '1.1.8'.freeze
   end
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: legion-transport
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Esity
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: legion-logging
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +114,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: legion-json
   requirement: !ruby/object:Gem::Requirement
@@ -194,8 +166,6 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bitbucket-pipelines.yml
 - legion-transport.gemspec
 - lib/legion/transport.rb
@@ -234,7 +204,7 @@ metadata:
   changelog_uri: https://bitbucket.org/legion-io/legion-transport/src/master/CHANGELOG.md
   homepage_uri: https://bitbucket.org/legion-io/legion-transport
   wiki_uri: https://bitbucket.org/legion-io/legion-transport/wiki/Home
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -249,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Used by Legion to connect with RabbitMQ
 test_files: []

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'legion/transport'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here