legionio 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 422da0782965ca0f944ebb9579fc1e794ae656c59f9ad22c26b84949f1846f9b
-  data.tar.gz: 169445db597ca9717dd46dfe38f8d02ecb57b08800bcd1a0177eea2512b80069
+  metadata.gz: 732846134f79449f2a5c0141e57e40379015403485296374f39263c2dcda4060
+  data.tar.gz: 7867fa05990668a0d4742134ba017fcdc19f5a00a2272f750b07e2810539e516
 SHA512:
-  metadata.gz: de64ef4fd36950f9d2e74b3b3a0007decb9d7765119524c327fc57237101f9fd593362a67dc88d0e0bcc157e69b44b574bfc153c5f34d872a421bb4bf9ddf3bf
-  data.tar.gz: 212834c354a6bb0d3060bde1f442cf302f490be84a1af1c183d61d65d9bff59e5ffdb6e595192ec70f8fcd82f52bd069eacba0030a32858253243367fff33df0
+  metadata.gz: 932ab867c3212b6893b414e35051c90117e38ed0036301a5559f77c38f4574953a127e5194c199cff099d74336fdbaca41e3709887d465d0940a4034c830daae
+  data.tar.gz: b9d6af4416f0261cee4df3d6111eb4ec09b324ae64e7efef6f8f09f76b67db1a9897fe1e82405a80cd82b7f65ef48b4e21ea1628a2cf688ceec6c03750581c76

data/.circleci/config.yml

@@ -75,6 +75,27 @@ jobs:
           when: always
       - store_test_results:
           path: test-results
+  "jruby-nine-two":
+    docker:
+      - image: circleci/jruby:9.2-jra
+      - image: mysql:5.7
+        environment:
+          MYSQL_DATABASE: 'legion'
+          MYSQL_ROOT_PASSWORD: 'legion'
+          MYSQL_USER: 'legion'
+          MYSQL_PASSWORD: 'legion'
+      - 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
 
 workflows:
   version: 2

data/.gitignore

@@ -9,6 +9,6 @@
 /tmp/
 /legion/.idea/
 /.idea/
-
+*.key
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -19,18 +19,58 @@ Metrics:
     - .trace
 Metrics/MethodLength:
   Max: 50
+  ExcludedMethods:
+    - .unknown
+    - .fatal
+    - .error
+    - .warn
+    - .info
+    - .debug
+    - .trace
 Metrics/ClassLength:
   Max: 1500
 Metrics/ModuleLength:
   Max: 1500
 Metrics/BlockLength:
   Max: 40
+  ExcludedMethods:
+    - .unknown
+    - .fatal
+    - .error
+    - .warn
+    - .info
+    - .debug
+    - .trace
 Metrics/AbcSize:
   Max: 50
+  IgnoredMethods:
+    - .unknown
+    - .fatal
+    - .error
+    - .warn
+    - .info
+    - .debug
+    - .trace
 Metrics/CyclomaticComplexity:
   Max: 15
+  IgnoredMethods:
+    - .unknown
+    - .fatal
+    - .error
+    - .warn
+    - .info
+    - .debug
+    - .trace
 Metrics/PerceivedComplexity:
   Max: 15
+  IgnoredMethods:
+    - .unknown
+    - .fatal
+    - .error
+    - .warn
+    - .info
+    - .debug
+    - .trace
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:
@@ -41,15 +81,8 @@ Layout/HashAlignment:
 Style/Documentation:
   Enabled: false
 AllCops:
-  TargetRubyVersion: 2.6
-  IgnoredPatterns:
-    - .unknown
-    - .fatal
-    - .error
-    - .warn
-    - .info
-    - .debug
-    - .trace
+  TargetRubyVersion: 2.5
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Legion Changelog
 
+## v0.3.0
+* Updating dependencies based on if we are using `JRUBY` or not
+* Cleaning up some files and rubocop errors
+* Adding new settings option for a lex definition with functionality to add it to the override settings stack
+* Fixing supervision filename
+* Cleaning up `Legion::Service`
+* Cleaning up rogue comments
+* Updating exe/legion to match bin/legion
+
 ## v0.1.1
 Testing
 

data/Gemfile

@@ -1,15 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'lex-conditioner', path: '~/Rubymine/lex/lex-conditioner'
-gem 'lex-health', path: '~/Rubymine/lex/lex-health'
-gem 'lex-influxdb', path: '~/Rubymine/lex/lex-influxdb'
-gem 'lex-lex', path: '~/Rubymine/lex/lex-lex'
-gem 'lex-log', path: '~/Rubymine/lex/lex-log'
-gem 'lex-memcached', path: '~/Rubymine/lex/legion-extensions-memcached'
-gem 'lex-node', path: '~/Rubymine/lex/lex-node'
-gem 'lex-sleepiq', path: '~/Rubymine/lex/lex-sleepiq'
-gem 'lex-tasker', path: '~/Rubymine/lex/lex-tasker'
-gem 'lex-transformer', path: '~/Rubymine/lex/lex-transformer'
-

data/Rakefile

@@ -21,7 +21,7 @@ task :start do
 end
 
 namespace :deploy do
-  require 'legion/version.rb'
+  require 'legion/version'
   desc 'Deploy alpha/test'
   task :test do
     Gem.yank_gem('legion', "#{Legion::VERSION}a")

data/bin/legion

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
-# rubocop:disable all
+
 require 'optparse'
 
 options = { action: :run }
@@ -28,11 +28,11 @@ op.on('-t', '--time 10', time_help)          { |value| options[:time_limit] = va
 
 op.separator ''
 op.separator 'Ruby options:'
-op.on('-I', '--include PATH', include_help) {
-    |value| $LOAD_PATH.unshift(*value.split(':').map {
-      |v| File.expand_path(v)
-    })
-}
+op.on('-I', '--include PATH', include_help) do |value|
+  $LOAD_PATH.unshift(*value.split(':').map do |v|
+                       File.expand_path(v)
+                     end)
+end
 op.on('--debug',        debug_help)   { $DEBUG = true }
 op.on('--warn',         warn_help)    { $-w = true    }
 
@@ -44,18 +44,7 @@ op.on('-v', '--version') { options[:action] = :version }
 op.separator ''
 op.parse!(ARGV)
 
-#==============================================================================
-# EXECUTE script
-#==============================================================================
-
 require File.expand_path('lib/legion.rb') unless options[:action] == :help
 Legion.start
 require File.expand_path('lib/legion/process.rb') unless options[:action] == :help
-# case options[:action]
-# when :help    then puts op.to_s
-# when :version then puts Legion::VERSION
-# else
-#   Legion::Process.run!(options)
-# end
-
 Legion::Process.new(options).run!

data/exe/legion

@@ -1,6 +1,6 @@
-#!/usr/bin/env jruby
+#!/usr/bin/env ruby
 # frozen_string_literal: true
-# rubocop:disable all
+
 require 'optparse'
 
 options = { action: :run }
@@ -11,6 +11,7 @@ logfile_help   = 'the log filename'
 include_help   = 'an additional $LOAD_PATH (may be used more than once)'
 debug_help     = 'set $DEBUG to true'
 warn_help      = 'enable warnings'
+time_help      = 'only run legion for X seconds'
 
 op = OptionParser.new
 op.banner =  'An example of how to daemonize a long running Ruby process.'
@@ -23,14 +24,15 @@ op.separator 'Process options:'
 op.on('-d', '--daemonize',   daemonize_help) {         options[:daemonize] = true  }
 op.on('-p', '--pid PIDFILE', pidfile_help)   { |value| options[:pidfile]   = value }
 op.on('-l', '--log LOGFILE', logfile_help)   { |value| options[:logfile]   = value }
+op.on('-t', '--time 10', time_help)          { |value| options[:time_limit] = value }
 
 op.separator ''
 op.separator 'Ruby options:'
-op.on('-I', '--include PATH', include_help) {
-    |value| $LOAD_PATH.unshift(*value.split(':').map {
-      |v| File.expand_path(v)
-  })
-}
+op.on('-I', '--include PATH', include_help) do |value|
+  $LOAD_PATH.unshift(*value.split(':').map do |v|
+                       File.expand_path(v)
+                     end)
+end
 op.on('--debug',        debug_help)   { $DEBUG = true }
 op.on('--warn',         warn_help)    { $-w = true    }
 
@@ -42,17 +44,7 @@ op.on('-v', '--version') { options[:action] = :version }
 op.separator ''
 op.parse!(ARGV)
 
-#==============================================================================
-# EXECUTE script
-#==============================================================================
-
 require File.expand_path('lib/legion.rb') unless options[:action] == :help
+Legion.start
 require File.expand_path('lib/legion/process.rb') unless options[:action] == :help
-case options[:action]
-when :help    then puts op.to_s
-when :version then puts Legion::VERSION
-else
-  Legion::Process.run!(options)
-end
-
 Legion::Process.new(options).run!

data/legion.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Legion Core runs Legion Framwork'
   spec.homepage      = 'https://bitbucket.org/legion-io/legion/'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -23,35 +24,33 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   if RUBY_ENGINE == 'jruby'
+    spec.add_dependency 'jrjackson'
     spec.add_dependency 'legion-data-java'
-    spec.add_dependency 'legion-json-java'
-    spec.add_dependency 'legion-settings-java'
     spec.add_dependency 'legion-transport-java'
+    spec.add_dependency 'march_hare'
   else
+    spec.add_dependency 'concurrent-ruby-ext'
     spec.add_dependency 'legion-data'
-    spec.add_dependency 'legion-json'
-    spec.add_dependency 'legion-settings'
     spec.add_dependency 'legion-transport'
+    spec.add_dependency 'oj'
   end
 
   spec.add_dependency 'concurrent-ruby'
-  spec.add_dependency 'concurrent-ruby-ext'
   spec.add_dependency 'daemons'
   spec.add_dependency 'hashdiff'
-  spec.add_dependency 'vault'
 
+  spec.add_dependency 'bunny'
   spec.add_dependency 'legion-cache'
   spec.add_dependency 'legion-crypt'
   spec.add_dependency 'legion-exceptions'
+  spec.add_dependency 'legion-json'
   spec.add_dependency 'legion-logging'
+  spec.add_dependency 'legion-settings'
 
-  spec.add_dependency 'sleepiq'
+  spec.add_dependency 'lex-node'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'cli-tree'
   spec.add_development_dependency 'codecov'
-  spec.add_development_dependency 'memory_profiler'
-  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'

data/lib/legion.rb

@@ -1,7 +1,7 @@
 Process.setproctitle('Legion')
-require 'concurrent-ruby'
+require 'concurrent'
 require 'securerandom'
-# require 'legion/exceptions'
+require 'legion/exceptions'
 require 'legion/version'
 require 'legion/process'
 require 'legion/service'

data/lib/legion/exceptions/invalidjson.rb

@@ -1,8 +1,5 @@
-# frozen_string_literal: true
-
 module Legion
   module Exception
-    # Invalid JSON class
     class InvalidJson < StandardError; end
   end
 end

data/lib/legion/exceptions/missingargument.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Legion
   module Exception
     class MissingArgument < StandardError

data/lib/legion/exceptions/wrongtypes/array.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 module Legion
   module Exception
     module WrongType
-      # This thing should be an array
       class Array < TypeError
       end
     end

data/lib/legion/exceptions/wrongtypes/hash.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 module Legion
   module Exception
     module WrongType
-      # This thing should be a hash
       class Hash < TypeError
       end
     end

data/lib/legion/exceptions/wrongtypes/integer.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 module Legion
   module Exception
     module WrongType
-      # This thing should be an int
       class Integer < TypeError
       end
     end

data/lib/legion/exceptions/wrongtypes/string.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 module Legion
   module Exception
     module WrongType
-      # This thing should be a string
       class String < TypeError
       end
     end

data/lib/legion/extensions.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'legion/extensions/core'
 require 'legion/runner'
 
@@ -23,11 +21,13 @@ module Legion
       end
 
       def shutdown
+        return nil if @loaded_extensions.nil?
+
         @subscription_tasks.each do |task|
           task[:threadpool].shutdown
-          task[:threadpool].wait_for_termination(2)
-          task[:threadpool].kill
+          task[:threadpool].kill unless task[:threadpool].wait_for_termination(5)
         end
+
         @loop_tasks.each { |task| task[:running_class].cancel if task[:running_class].respond_to?(:cancel) }
         @once_tasks.each { |task| task[:running_class].cancel if task[:running_class].respond_to?(:cancel) }
         @timer_tasks.each { |task| task[:running_class].cancel if task[:running_class].respond_to?(:cancel) }
@@ -79,7 +79,7 @@ module Legion
           extension.log.debug("hooking literal actor: #{actor}") if has_logger
           hook_actor(**actor)
         end
-        extension.log.info 'Loaded'
+        extension.log.info "Loaded v#{extension::VERSION}"
       rescue StandardError => e
         Legion::Logging.error e.message
         Legion::Logging.error e.backtrace
@@ -87,12 +87,20 @@ module Legion
       end
 
       def hook_actor(extension:, extension_name:, actor_class:, size: 1, **opts)
-        size = 1 unless size.is_a? Integer
+        size = if Legion::Settings[:extensions].key?(extension_name.to_sym) && Legion::Settings[:extensions][extension_name.to_sym].key?(:workers)
+                 Legion::Settings[:extensions][extension_name.to_sym][:workers]
+               elsif size.is_a? Integer
+                 size
+               else
+                 1
+               end
+
         extension_hash = {
-          extension:      extension,
-          extension_name: extension_name,
-          actor_class:    actor_class,
-          size:           size,
+          extension:       extension,
+          extension_name:  extension_name,
+          actor_class:     actor_class,
+          size:            size,
+          fallback_policy: :abort,
           **opts
         }
         extension_hash[:running_class] = if actor_class.ancestors.include? Legion::Extensions::Actors::Subscription
@@ -110,10 +118,15 @@ module Legion
         elsif actor_class.ancestors.include? Legion::Extensions::Actors::Poll
           @poll_tasks.push(extension_hash)
         elsif actor_class.ancestors.include? Legion::Extensions::Actors::Subscription
-          extension_hash[:threadpool] = Concurrent::FixedThreadPool.new(100)
+          extension_hash[:threadpool] = Concurrent::FixedThreadPool.new(size)
           size.times do
             extension_hash[:threadpool].post do
-              actor_class.new.async.subscribe
+              klass = actor_class.new
+              if klass.respond_to?(:async)
+                klass.async.subscribe
+              else
+                klass.subscribe
+              end
             end
           end
           @subscription_tasks.push(extension_hash)