legion-transport 0.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e533b2973535c4763ab30eddf935de8f180e1114dc94c04ca8b1f875ff29ac
-  data.tar.gz: 595f0dbb65675f616c9485f28433220475ded71a4727e8f3db8f4fc8206449c3
+  metadata.gz: aca9d21a2d161f0838dc16ce328d81c3ba42360a777c63e6aa805f6c52502e13
+  data.tar.gz: 46af9353894537c81d73a68e01522498181d6d2fb54ae3fcdec465ebb75f8675
 SHA512:
-  metadata.gz: 6b1eac97b2775e5d67ff1f27efecf93fa96ab7dc276a5698a1323be276ee0176040eccec771752eee49068a928cce8fa044cb9ddb0d59c603f37c511c913937e
-  data.tar.gz: 4efa70d6438d27bfb9a9ceda17be7bb63f3f34aca5ff0dfad33186f3d16d70d99fc4aeeeecc227769a098a0118554abca4781ec5c8b37de8f359f928b52e9b25
+  metadata.gz: add6818532d2159f4fa2be2a40148694f24511f7ca5095ad4477c9e0b72d70c546b2c7ba7ce6b60b44fa9b538c64e08d032dede1f341bbcb6e1831f541828d0e
+  data.tar.gz: 754b708ce889ff36ab763f4f72887895195721a9f5e43bea168e802ad6cde0e3fc813ef9ed7ac2e11d677388777d264fc635b57912376f96dff1b03d71108ce3

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-2.3":
+          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-2.4":
+          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-2.5":
+          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-2.6":
+          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-9.2":
-    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-2.3:
-          requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.4:
+      - ruby-two-five:
           requires:
             - rubocop
-      - ruby-2.5:
+      - ruby-two-six:
+          requires:
+            - ruby-two-five
+      - ruby-two-seven:
           requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.6:
+            - ruby-two-five
+      - sonarcloud:
           requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
+            - ruby-two-seven
+            - ruby-two-six

data/.rspec

@@ -0,0 +1 @@
+--color

data/.rubocop.yml

@@ -1,4 +1,4 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
   Max: 30
@@ -6,21 +6,15 @@ Metrics/ClassLength:
   Max: 1500
 Metrics/BlockLength:
   Max: 50
-  Exclude:
-    - 'spec/legion/connections/*'
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:
   Enabled: true
-Layout/AlignHash:
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
-Style/HashSyntax:
-  EnforcedStyle: ruby19_no_mixed_keys
 Style/Documentation:
   Enabled: false
 AllCops:
-  TargetRubyVersion: 2.4
+  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/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in legion-transport.gemspec
 gemspec

data/README.md

@@ -0,0 +1,3 @@
+# 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,28 +11,33 @@ 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.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.metadata = {
+    'bug_tracker_uri' => 'https://legionio.atlassian.net/projects/TRANSPORT/issues',
+    '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'
+  }
+
+  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', '~> 1'
+  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'
 
-  if RUBY_ENGINE == 'jruby'
-    spec.add_development_dependency 'legion-settings-java', '~> 0.1'
-    spec.add_dependency 'march_hare'
-  else
-    spec.add_development_dependency 'legion-settings', '~> 0.1'
-    spec.add_dependency 'bunny'
-  end
-
-  spec.add_development_dependency 'legion-logging', '~> 0.1'
+  spec.add_dependency 'bunny'
+  spec.add_dependency 'concurrent-ruby'
+  spec.add_dependency 'legion-json'
 end

data/lib/legion/transport.rb

@@ -1,20 +1,22 @@
-require 'legion/transport/version'
+require_relative 'transport/version'
+require_relative 'transport/settings'
 
 module Legion
-  # Base Legion::Transport
   module Transport
-    if RUBY_ENGINE == 'jruby'
+    if RUBY_ENGINE == 'jruby' && defined?(::Marchhare)
       require 'marchhare'
-      CONNECTOR = 'marchhare'.freeze
+      TYPE = 'marchhare'.freeze
+      CONNECTOR = ::Marchhare
     else
       require 'bunny'
-      CONNECTOR = 'bunny'.freeze
+      TYPE = 'bunny'.freeze
+      CONNECTOR = ::Bunny
     end
   end
 
-  require 'legion/transport/common'
-  require 'legion/transport/queue'
-  require 'legion/transport/exchange'
-  require 'legion/transport/consumer'
-  require 'legion/transport/message'
+  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/common.rb

@@ -3,16 +3,12 @@ require 'legion/transport/connection'
 module Legion
   module Transport
     module Common
-      def open_channel(options = {})
-        @channel = Legion::Transport::Connection.new(options).channel
+      def open_channel(_options = {})
+        @channel = Legion::Transport::Connection.channel
       end
 
-      def channel_valid?(channel = @channel)
-        return false if channel.nil?
-        return false unless channel.instance_of?(::Bunny::Channel)
-        return false if channel.closed?
-
-        true
+      def channel_open?
+        channel.open?
       end
 
       def options_builder(first, *args)
@@ -51,20 +47,29 @@ module Legion
       end
       # rubocop:enable all
 
-      def closed?
-        @channel.closed?
+      def channel
+        @channel ||= Legion::Transport::Connection.channel
+      end
+
+      def close!
+        Legion::Logging.error 'close! called'
+        false unless Legion::Transport::Connection.channel_open?
+        Legion::Transport::Connection.channel.close
       end
 
-      def channel(options = @options || {})
-        @channel if channel_valid?
-        @channel = options[:channel] if channel_valid?(options[:channel])
-        @channel = open_channel(options) unless channel_valid?(@channel)
-        @channel
+      def close
+        Legion::Logging.error 'close called'
+        Legion::Logging.warn 'close called, but method is called close!'
+        close!
       end
 
-      def close(_options = @options || {})
-        false if @channel.closed?
-        @channel.close
+      def generate_consumer_tag(lex_name: nil, runner_name: nil, thread: Thread.current.object_id)
+        tag = "#{Legion::Settings[:client][:name]}_"
+        tag.concat("#{lex_name}_") unless lex_name.nil?
+        tag.concat("#{runner_name}_") unless runner_name.nil?
+        tag.concat("#{thread}_")
+        tag.concat(SecureRandom.hex)
+        tag
       end
     end
   end

data/lib/legion/transport/connection.rb

@@ -1,17 +1,61 @@
+require 'concurrent-ruby'
+
 module Legion
   module Transport
-    class Connection
-      @@session = nil # rubocop:disable Style/ClassVars
-      attr_accessor :session, :channel
-
-      if RUBY_ENGINE == 'jruby'
-        require 'march-hare'
-        require 'legion/transport/connections/marchhare'
-        include Legion::Transport::Connections::Marchhare
-      else
-        require 'bunny'
-        require 'legion/transport/connections/bunny'
-        include Legion::Transport::Connections::Bunny
+    module Connection
+      class << self
+        def connector
+          Legion::Transport::CONNECTOR
+        end
+
+        def setup # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+          if @session.respond_to?(:value) && session.respond_to?(:closed?) && session.closed?
+            @channel_thread = Concurrent::ThreadLocalVar.new
+          elsif @session.respond_to?(:value) && session.respond_to?(:closed?) && session.open?
+            return nil
+          else
+            @session ||= Concurrent::Atom.new(
+              connector.new(
+                Legion::Settings[:transport][:connection],
+                logger: Legion::Logging::Logger.new(level: 'warn'),
+                log_level: :info
+              )
+            )
+            @channel_thread = Concurrent::ThreadLocalVar.new
+          end
+
+          session.start
+          session.create_channel.basic_qos(1, true)
+        end
+
+        def channel
+          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])
+          @channel_thread.value
+        end
+
+        def session
+          nil if @session.nil?
+          @session.value
+        end
+
+        def channel_thread
+          channel
+        end
+
+        def channel_open?
+          channel.open?
+        end
+
+        def session_open?
+          session.open?
+        end
+
+        def shutdown
+          session.close
+        end
       end
     end
   end