legion-transport 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e533b2973535c4763ab30eddf935de8f180e1114dc94c04ca8b1f875ff29ac
-  data.tar.gz: 595f0dbb65675f616c9485f28433220475ded71a4727e8f3db8f4fc8206449c3
+  metadata.gz: 4b8ebe4ac7e742ce233b6a34093a8b98d9edae6fd93a15bc1f0de46aedd0ae03
+  data.tar.gz: 24574a28c192e3f79da7b36b33e19de1b93550162f58ecdd0df136892a7aee1d
 SHA512:
-  metadata.gz: 6b1eac97b2775e5d67ff1f27efecf93fa96ab7dc276a5698a1323be276ee0176040eccec771752eee49068a928cce8fa044cb9ddb0d59c603f37c511c913937e
-  data.tar.gz: 4efa70d6438d27bfb9a9ceda17be7bb63f3f34aca5ff0dfad33186f3d16d70d99fc4aeeeecc227769a098a0118554abca4781ec5c8b37de8f359f928b52e9b25
+  metadata.gz: 4b956aeca717ed356ea934f07f2a3ec58ae30da3d5b3aa3fe39b6e2968cda9f0ee42843751abefa120942c4ffd2df7f4f53bdd8cb5bb51c05e91ac65200d4299
+  data.tar.gz: 6165b84e313abce9a15e7126e6cae813323bc3ac4969bf8c7aba2e72c6e201e8d864e47d9125dfe8c216f78a50a728f7898634de20fd2967e532c7955637d4da

data/.circleci/config.yml

@@ -11,7 +11,7 @@ jobs:
           command: rubocop
       - store_test_results:
           path: test_results
-  "ruby-2.3":
+  "ruby-two-three":
     docker:
       - image: circleci/ruby:2.3
       - image: rabbitmq:3.7
@@ -27,7 +27,7 @@ jobs:
       - store_test_results:
           path: test-results
 
-  "ruby-2.4":
+  "ruby-two-four":
     docker:
       - image: circleci/ruby:2.4-node
       - image: rabbitmq:3.7
@@ -42,7 +42,7 @@ jobs:
           when: always
       - store_test_results:
           path: test-results
-  "ruby-2.5":
+  "ruby-two-five":
     docker:
       - image: circleci/ruby:2.5-node
       - image: rabbitmq:3.7
@@ -57,7 +57,7 @@ jobs:
           when: always
       - store_test_results:
           path: test-results
-  "ruby-2.6":
+  "ruby-two-six":
     docker:
       - image: circleci/ruby:2.6-node
       - image: rabbitmq:3.7
@@ -72,7 +72,7 @@ jobs:
           when: always
       - store_test_results:
           path: test-results
-  "jruby-9.2":
+  "jruby-nine-two":
     docker:
       - image: circleci/jruby:9.2
       - image: rabbitmq:3.7
@@ -93,24 +93,24 @@ workflows:
   cop_rake_deploy:
     jobs:
       - rubocop
-      - ruby-2.3:
+      - ruby-two-three:
           requires:
-            - ruby-2.4
+            - ruby-two-four
           filters:
             branches:
               only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.4:
+      - ruby-two-four:
           requires:
             - rubocop
-      - ruby-2.5:
+      - ruby-two-five:
           requires:
-            - ruby-2.4
+            - ruby-two-four
           filters:
             branches:
               only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.6:
+      - ruby-two-six:
           requires:
-            - ruby-2.4
+            - ruby-two-four
           filters:
             branches:
               only: /\bdevelop\b|\bmaster\b/

data/.idea/.rakeTasks

@@ -0,0 +1,7 @@
+<?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

@@ -0,0 +1,45 @@
+<?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

@@ -0,0 +1,7 @@
+<?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

@@ -0,0 +1,8 @@
+<?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

@@ -0,0 +1,7 @@
+<?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

@@ -0,0 +1,14 @@
+<?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>

data/.rspec

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

data/.rubocop.yml

@@ -6,21 +6,14 @@ 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
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

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,35 @@
+# 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.

data/legion-transport.gemspec

@@ -12,27 +12,37 @@ Gem::Specification.new do |spec|
   spec.description   = 'The Legion transport gem'
   spec.homepage      = 'https://bitbucket.org/legion-io/legion-transport'
 
-  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 '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', '~> 0.1'
+    spec.add_development_dependency 'legion-settings-java'
     spec.add_dependency 'march_hare'
   else
-    spec.add_development_dependency 'legion-settings', '~> 0.1'
+    spec.add_development_dependency 'legion-settings'
     spec.add_dependency 'bunny'
   end
 
-  spec.add_development_dependency 'legion-logging', '~> 0.1'
+  spec.add_development_dependency 'legion-logging'
 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'
       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,60 @@
+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
+          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