legion-transport 1.0.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8ebe4ac7e742ce233b6a34093a8b98d9edae6fd93a15bc1f0de46aedd0ae03
-  data.tar.gz: 24574a28c192e3f79da7b36b33e19de1b93550162f58ecdd0df136892a7aee1d
+  metadata.gz: a14303eeb59f5d328dba4782a6fcab96087a63403fa7e734fa98738c6010fccd
+  data.tar.gz: 3c30d91267de37a9f04e721755dd5452a9dcb8c6ff649c9a17ce0b941893be5d
 SHA512:
-  metadata.gz: 4b956aeca717ed356ea934f07f2a3ec58ae30da3d5b3aa3fe39b6e2968cda9f0ee42843751abefa120942c4ffd2df7f4f53bdd8cb5bb51c05e91ac65200d4299
-  data.tar.gz: 6165b84e313abce9a15e7126e6cae813323bc3ac4969bf8c7aba2e72c6e201e8d864e47d9125dfe8c216f78a50a728f7898634de20fd2967e532c7955637d4da
+  metadata.gz: b4e78c019c6ae475aa18cb82108c024d9df78f84d46073cdfcbbffafc2b1ac393e255052f4036a3311f652f01269aa1cfe7e636b6153c30b0c32cf11825e4622
+  data.tar.gz: f42031b318d1e491fff023496c379c323e8ec81aebe750d0291b8bdf0b6c1f361fd99b0d60804ba0814023b560f2e6ca3c76c00e845472cbf60ba54a9fbdc97e

data/.circleci/config.yml

@@ -1,116 +1,89 @@
-version: 2 # use CircleCI 2.0
+version: 2.1
+orbs:
+  ruby: circleci/ruby@0.2.1
+  sonarcloud: sonarsource/sonarcloud@1.0.1
+
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.4-node
+      - image: circleci/ruby:2.7-node
     steps:
       - checkout
-      - run: gem install rubocop
+      - ruby/load-cache
+      - ruby/install-deps
       - run:
           name: Run Rubocop
-          command: rubocop
-      - store_test_results:
-          path: test_results
-  "ruby-two-three":
+          command: bundle exec rubocop
+      - ruby/save-cache
+  "ruby-two-five":
     docker:
-      - image: circleci/ruby:2.3
+      - image: circleci/ruby:2.5
       - image: rabbitmq:3.7
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-
-  "ruby-two-four":
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.4-node
+      - image: circleci/ruby:2.6
       - image: rabbitmq:3.7
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "ruby-two-five":
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-seven":
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: circleci/ruby:2.7
       - image: rabbitmq:3.7
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "ruby-two-six":
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
+  "sonarcloud":
     docker:
-      - image: circleci/ruby:2.6-node
+      - image: circleci/ruby:2.7
       - image: rabbitmq:3.7
     steps:
       - checkout
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
       - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "jruby-nine-two":
-    docker:
-      - image: circleci/jruby:9.2
-      - image: rabbitmq:3.7
-    steps:
-      - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
+          name: Run Rubocop
+          command: bundle exec rubocop --format=json --out=rubocop-result.json
+      - sonarcloud/scan
+      - ruby/save-cache
 
 workflows:
   version: 2
-  cop_rake_deploy:
+  rubocop-rspec:
     jobs:
       - rubocop
-      - ruby-two-three:
-          requires:
-            - ruby-two-four
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-two-four:
-          requires:
-            - rubocop
       - ruby-two-five:
           requires:
-            - ruby-two-four
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
+            - rubocop
       - ruby-two-six:
           requires:
-            - ruby-two-four
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
+            - ruby-two-five
+      - ruby-two-seven:
+          requires:
+            - ruby-two-five
+      - sonarcloud:
+          requires:
+            - ruby-two-seven
+            - ruby-two-six

data/.rubocop.yml

@@ -1,4 +1,4 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
   Max: 30
@@ -14,6 +14,7 @@ Style/Documentation:
   Enabled: false
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

data/CHANGELOG.md

@@ -0,0 +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/README.md

@@ -1,35 +1,3 @@
 # Legion::Transport
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/legion/transport`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'legion-transport'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install legion-transport
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-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).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/legion-transport.
+Used to connect Legion to RabbitMQ and is a core component of Legion.

data/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: ruby:2.4.0
+image: ruby:2.5.0
 
 pipelines:
   branches:

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',
@@ -22,27 +23,21 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
   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 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  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 'concurrent-ruby'
-  spec.add_dependency 'concurrent-ruby-ext'
-
-  if RUBY_ENGINE == 'jruby'
-    spec.add_development_dependency 'legion-settings-java'
-    spec.add_dependency 'march_hare'
-  else
-    spec.add_development_dependency 'legion-settings'
-    spec.add_dependency 'bunny'
-  end
 
-  spec.add_development_dependency 'legion-logging'
+  spec.add_dependency 'bunny'
+  spec.add_dependency 'concurrent-ruby'
+  spec.add_dependency 'legion-json'
 end

data/lib/legion/transport.rb

@@ -3,11 +3,11 @@ require_relative 'transport/settings'
 
 module Legion
   module Transport
-    if RUBY_ENGINE == 'jruby'
-      require 'marchhare'
-      TYPE = 'marchhare'.freeze
-      CONNECTOR = ::Marchhare
-    else
+    begin
+      require 'march_hare'
+      TYPE = 'march_hare'.freeze
+      CONNECTOR = ::MarchHare
+    rescue LoadError
       require 'bunny'
       TYPE = 'bunny'.freeze
       CONNECTOR = ::Bunny
@@ -17,6 +17,5 @@ module Legion
   require_relative 'transport/common'
   require_relative 'transport/queue'
   require_relative 'transport/exchange'
-  require_relative 'transport/consumer'
   require_relative 'transport/message'
 end

data/lib/legion/transport/connection.rb

@@ -8,30 +8,61 @@ module Legion
           Legion::Transport::CONNECTOR
         end
 
-        def setup
+        def setup # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+          Legion::Logging.info("Using transport connector: #{Legion::Transport::CONNECTOR}")
+
           if @session.respond_to?(:value) && session.respond_to?(:closed?) && session.closed?
-            @channel_thread = Concurrent::ThreadLocalVar.new
+            @channel_thread = Concurrent::ThreadLocalVar.new(nil)
           elsif @session.respond_to?(:value) && session.respond_to?(:closed?) && session.open?
-            return nil
+            nil
+          elsif Legion::Transport::TYPE == 'march_hare'
+            @session ||= Concurrent::Atom.new(
+              MarchHare.connect(host: Legion::Settings[:transport][:connection][:host],
+                                vhost: Legion::Settings[:transport][:connection][:vhost],
+                                user: Legion::Settings[:transport][:connection][:user],
+                                password: Legion::Settings[:transport][:connection][:password],
+                                port: Legion::Settings[:transport][:connection][:port])
+            )
+            @channel_thread = Concurrent::ThreadLocalVar.new(nil)
+            session.start
+            session.create_channel.basic_qos(1)
           else
             @session ||= Concurrent::Atom.new(
               connector.new(
                 Legion::Settings[:transport][:connection],
-                logger: Legion::Logging::Logger.new(level: 'warn'), log_level: :info
+                logger: Legion::Logging::Logger.new(level: 'warn'),
+                log_level: :info
               )
             )
-            @channel_thread = Concurrent::ThreadLocalVar.new
+            @channel_thread = Concurrent::ThreadLocalVar.new(nil)
+            session.start
+            session.create_channel.basic_qos(20, true)
           end
 
-          session.start
-          session.create_channel.basic_qos(1, true)
+          if session.respond_to? :on_blocked
+            session.on_blocked { Legion::Logging.warn('Legion::Transport is being blocked by RabbitMQ!') }
+          end
+
+          if session.respond_to? :on_unblocked
+            session.on_unblocked { Legion::Logging.info('Legion::Transport is no longer being blocked by RabbitMQ') }
+          end
+
+          if session.respond_to? :after_recovery_completed
+            session.after_recovery_completed { Legion::Logging.info('Legion::Transport has completed recovery') }
+          end
+
+          true
         end
 
-        def channel
+        def channel # rubocop:disable Metrics/AbcSize
           return @channel_thread.value if !@channel_thread.value.nil? && @channel_thread.value.open?
 
           @channel_thread.value = session.create_channel
-          @channel_thread.value.prefetch(Legion::Settings[:transport][:prefetch])
+          if Legion::Transport::TYPE == 'march_hare'
+            @channel_thread.value.basic_qos(Legion::Settings[:transport][:prefetch])
+          else
+            @channel_thread.value.prefetch(Legion::Settings[:transport][:prefetch])
+          end
           @channel_thread.value
         end
 

data/lib/legion/transport/consumer.rb

@@ -3,6 +3,7 @@ module Legion
     class Consumer < Legion::Transport::CONNECTOR::Consumer
       include Legion::Transport::Common
       attr_reader :consumer_tag
+
       def initialize(queue:, no_ack: false, exclusive: false, consumer_tag: generate_consumer_tag, **opts)
         @consumer_tag = consumer_tag
         super(channel, queue, consumer_tag, no_ack, exclusive, opts)

data/lib/legion/transport/exchange.rb

@@ -6,8 +6,14 @@ module Legion
       def initialize(exchange = exchange_name, options = {})
         @options = options
         @type = options[:type] || default_type
-        super(channel, @type, exchange, options_builder(default_options, exchange_options, @options))
-      rescue ::Bunny::PreconditionFailed, ::Bunny::ChannelAlreadyClosed
+        if Legion::Transport::TYPE == 'march_hare'
+          super_options = options_builder(default_options, exchange_options, @options)
+          super_options[:type] = @type
+          super(channel, exchange, **super_options)
+        else
+          super(channel, @type, exchange, options_builder(default_options, exchange_options, @options))
+        end
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed, Legion::Transport::CONNECTOR::ChannelAlreadyClosed
         raise unless @retries.nil?
 
         @retries = 1
@@ -39,7 +45,7 @@ module Legion
       def delete(options = {})
         super(options)
         true
-      rescue ::Bunny::PreconditionFailed
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed
         false
       end
 

data/lib/legion/transport/message.rb

@@ -8,10 +8,12 @@ module Legion
         validate
       end
 
-      def publish(options = @options)
+      def publish(options = @options) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         raise unless @valid
 
-        exchange_dest = exchange.respond_to?(:new) ? exchange.new : exchange
+        $exchanges = {} if $exchanges.nil?
+        $exchanges[exchange.to_s] = exchange.new unless $exchanges.key?(exchange.to_s)
+        exchange_dest = $exchanges[exchange.to_s]
         exchange_dest.publish(encode_message,
                               routing_key: routing_key || '',
                               content_type: options[:content_type] || content_type,
@@ -26,14 +28,24 @@ module Legion
         @options
       end
 
+      def routing_key
+        nil
+      end
+
       def encode_message
         message_payload = message
-        message_payload = Legion::JSON.dump(message_payload) if message_payload.is_a? Hash
-        @options[:content_encoding] = 'identity'
-        return message_payload unless encrypt? && Legion::Settings[:crypt][:cs_encrypt_ready]
+        message_payload = Legion::JSON.dump(message_payload) unless message_payload.is_a? String
+
+        if encrypt?
+          encrypted = Legion::Crypt.encrypt(message_payload)
+          headers[:iv] = encrypted[:iv]
+          @options[:content_encoding] = 'encrypted/cs'
+          return encrypted[:enciphered_message]
+        else
+          @options[:content_encoding] = 'identity'
+        end
 
-        @options[:content_encoding] = 'encrypted/cs'
-        encrypt_message(message_payload)
+        message_payload
       end
 
       def encrypt_message(message, _type = 'cs')
@@ -41,7 +53,7 @@ module Legion
       end
 
       def encrypt?
-        Legion::Settings[:transport][:messages][:encrypt]
+        Legion::Settings[:transport][:messages][:encrypt] && Legion::Settings[:crypt][:cs_encrypt_ready]
       end
 
       def exchange_name
@@ -97,4 +109,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/messages/dynamic.rb

@@ -1,6 +1,7 @@
-module Legion::Transport::Messages
+module Legion::Transport::Messages # rubocop:disable Style/ClassAndModuleChildren
   class Dynamic < Legion::Transport::Message
     attr_accessor :options
+
     def type
       'task'
     end

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

@@ -1,4 +1,4 @@
-module Legion::Transport::Messages
+module Legion::Transport::Messages # rubocop:disable Style/ClassAndModuleChildren
   class RequestClusterSecret < Legion::Transport::Message
     def routing_key
       'node.crypt.push_cluster_secret'
@@ -7,9 +7,10 @@ module Legion::Transport::Messages
     def message
       { function: 'push_cluster_secret',
         node_name: Legion::Settings[:client][:name],
-        queue_name: "node.#{Legion::Settings['client']['name']}",
+        queue_name: "node.#{Legion::Settings[:client][:name]}",
         runner_class: 'Legion::Extensions::Node::Runners::Crypt',
-        public_key: Base64.encode64(Legion::Crypt.public_key) }
+        # public_key: Base64.encode64(Legion::Crypt.public_key) }
+        public_key: Legion::Crypt.public_key }
     end
 
     def exchange

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

@@ -16,17 +16,6 @@ module Legion
           }
         end
 
-        def routing_key
-          if @options[:conditions].is_a?(String) && @options[:conditions].length > 2
-            'task.subtask.conditioner'
-          elsif @options[:transformation].is_a?(String) && @options[:transformation].length > 2
-            'task.subtask.transform'
-          elsif @options[:function_id].is_a? Integer
-            function = Legion::Data::Model::Function[@options[:function_id]]
-            "#{function.runner.extension.values[:exchange]}.#{function.runner.values[:queue]}.#{function.values[:name]}"
-          end
-        end
-
         def validate
           raise TypeError unless @options[:function].is_a? String
 

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

@@ -23,8 +23,7 @@ module Legion
           conditioner = ['conditioner.queued', 'conditioner.failed', 'conditioner.exception']
           transformer = ['transformer.queued', 'transformer.succeeded', 'transformer.exception']
           task = ['task.scheduled', 'task.queued', 'task.completed', 'task.exception', 'task.delayed']
-          status = conditioner + transformer + task
-          status
+          conditioner + transformer + task
         end
       end
     end

data/lib/legion/transport/queue.rb

@@ -7,7 +7,7 @@ module Legion
         retries ||= 0
         @options = options
         super(channel, queue, options_builder(default_options, queue_options, options))
-      rescue ::Bunny::PreconditionFailed
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed
         retries.zero? ? retries = 1 : raise
         recreate_queue(channel, queue)
         retry
@@ -26,9 +26,11 @@ module Legion
         hash[:exclusive] = false
         hash[:block] = false
         hash[:auto_delete] = false
-        hash[:arguments] = { 'x-max-priority': 255,
-                             'x-overflow': 'reject-publish',
-                             'x-dead-letter-exchange': "#{self.class.ancestors.first.to_s.split('::')[2].downcase}.dlx" }
+        hash[:arguments] = {
+          'x-max-priority': 255,
+          'x-overflow': 'reject-publish',
+          'x-dead-letter-exchange': "#{self.class.ancestors.first.to_s.split('::')[2].downcase}.dlx"
+        }
         hash
       end
 
@@ -49,7 +51,7 @@ module Legion
       def delete(options = { if_unused: true, if_empty: true })
         super(options)
         true
-      rescue ::Bunny::PreconditionFailed
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed
         false
       end
 
@@ -57,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/queues/node_crypt.rb

@@ -0,0 +1,21 @@
+module Legion
+  module Transport
+    module Queues
+      class NodeCrypt < Legion::Transport::Queue
+        def queue_name
+          'node.status'
+        end
+
+        def queue_options
+          hash = {}
+          hash[:manual_ack] = true
+          hash[:durable] = true
+          hash[:exclusive] = false
+          hash[:block] = false
+          hash[:arguments] = { 'x-dead-letter-exchange': 'node.dlx' }
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/legion/transport/settings.rb

@@ -1,3 +1,5 @@
+require 'legion/settings'
+
 module Legion
   module Transport
     module Settings
@@ -21,8 +23,10 @@ module Legion
       end
 
       def self.grab_vault_creds
-        {} unless Legion::Settings[:vault][:connected]
-        lease = Legion::Crypt.read('rabbitmq/creds/legion')
+        return {} unless Legion::Settings[:crypt][:vault][:connected]
+
+        lease = Legion::Crypt.read('rabbitmq/creds/legion', type: nil)
+        Legion::Logging.debug 'successfully grabbed amqp username from Vault'
         { user: lease[:username], password: lease[:password] }
       rescue StandardError
         {}
@@ -61,4 +65,8 @@ module Legion
   end
 end
 
-Legion::Settings.merge_settings('transport', Legion::Transport::Settings.default) if Legion.const_defined?('Settings')
+begin
+  Legion::Settings.merge_settings('transport', Legion::Transport::Settings.default) if Legion.const_defined?('Settings')
+rescue StandardError => e
+  Legion::Logging.fatal(e.message) if Legion::Logging.method_defined?(:fatal)
+end

data/lib/legion/transport/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Transport
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.4'.freeze
   end
 end

data/settings/transport.json

@@ -1,9 +1,5 @@
-{"transport": {
-  "rabbitmq": {
-    "host": "localhost",
-    "vhost": "legion",
-    "user": "guest",
-    "password": "guest"
+{
+  "transport": {
+    "vhost": "legion"
   }
 }
-}

data/sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.projectKey=legion-io_legion-transport
+sonar.organization=legion-io
+sonar.projectName=Legion::Transport
+sonar.sources=.
+sonar.exclusions=vendor/**
+sonar.coverage.exclusions=spec/**
+sonar.ruby.coverage.reportPath=coverage/.resultset.json
+sonar.ruby.file.suffixes=rb,ruby
+sonar.ruby.coverage.framework=RSpec
+sonar.ruby.rubocopConfig=.rubocop.yml
+sonar.ruby.rubocop.reportPath=rubocop-result.json
+sonar.ruby.rubocop.filePath=.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.4
 platform: ruby
 authors:
 - Esity
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: legion-logging
   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
+  name: legion-settings
   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
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,13 +109,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,13 +123,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby-ext
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -137,13 +137,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: legion-settings
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,13 +165,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: legion-logging
+  name: legion-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -187,12 +187,6 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
-- ".idea/.rakeTasks"
-- ".idea/legion-transport.iml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/vagrant.xml"
-- ".idea/workspace.xml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -223,12 +217,14 @@ files:
 - lib/legion/transport/messages/task_update.rb
 - lib/legion/transport/queue.rb
 - lib/legion/transport/queues/node.rb
+- lib/legion/transport/queues/node_crypt.rb
 - lib/legion/transport/queues/node_status.rb
 - lib/legion/transport/queues/task_log.rb
 - lib/legion/transport/queues/task_update.rb
 - lib/legion/transport/settings.rb
 - lib/legion/transport/version.rb
 - settings/transport.json
+- sonar-project.properties
 homepage: https://bitbucket.org/legion-io/legion-transport
 licenses: []
 metadata:
@@ -236,7 +232,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
@@ -244,15 +240,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Used by Legion to connect with RabbitMQ
 test_files: []

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build legion-transport-0.1.1.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install legion-transport-0.1.1.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install legion-transport-0.1.1.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.1 and build and push legion-transport-0.1.1.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/legion-transport.iml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="amq-protocol (v2.3.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bunny (v2.14.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="codecov (v0.1.16, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.6, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby-ext (v1.1.6, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="docile (v1.3.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.3.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="legion-json (v0.1.6, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="legion-logging (v1.0.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="legion-settings (v1.0.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="oj (v3.10.5, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.19.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v2.7.0.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.5.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec_junit_formatter (v0.4.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.80.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.18.5, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="url (v0.3.2, RVM: ruby-2.6.3) [gem]" level="application" />
-  </component>
-</module>

data/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.6.3" project-jdk-type="RUBY_SDK" />
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/legion-transport.iml" filepath="$PROJECT_DIR$/.idea/legion-transport.iml" />
-    </modules>
-  </component>
-</project>

data/.idea/vagrant.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VagrantProjectSettings">
-    <option name="instanceFolder" value="" />
-    <option name="provider" value="" />
-  </component>
-</project>

data/.idea/workspace.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CoverageOptionsProvider">
-    <option name="myAddOrReplace" value="0" />
-  </component>
-  <component name="Git.Settings">
-    <option name="PUSH_AUTO_UPDATE" value="true" />
-    <option name="ROOT_SYNC" value="DONT_SYNC" />
-  </component>
-  <component name="ProjectId" id="1Yl3FmIkCYycmcT2pLSMAlN1Wxa" />
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.vagrant" />
-  </component>
-</project>