legionio 0.4.1 → 1.2.1

data/legionio.gemspec

@@ -10,22 +10,29 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Esity']
   spec.email         = ['matthewdiverson@gmail.com']
 
-  spec.summary       = 'Legion Core Software to string it all together'
-  spec.description   = 'Legion Core runs Legion Framwork'
-  spec.homepage      = 'https://bitbucket.org/legion-io/legion/'
-  spec.metadata['source_code_uri'] = 'https://bitbucket.org/legion-io/legion/src/master/'
-  spec.metadata['documentation_uri'] = 'https://legionio.atlassian.net/wiki/spaces/LEGION/overview'
-  spec.metadata['bug_tracker_uri'] = 'https://legionio.atlassian.net/browse/LEG'
-  spec.license = 'MIT'
+  spec.summary       = 'The primary gem to run the LegionIO Framework'
+  spec.description   = 'LegionIO is an extensible framework for running, scheduling and building relationships of tasks in a concurrent matter'
+  spec.homepage      = 'https://github.com/Optum/LegionIO'
+  spec.license       = 'Apache-2.0'
+  spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5.0'
 
+  spec.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/Optum/LegionIO/issues',
+    'changelog_uri'     => 'https://github.com/Optum/LegionIO/src/main/CHANGELOG.md',
+    'documentation_uri' => 'https://github.com/Optum/LegionIO',
+    'homepage_uri'      => 'https://github.com/Optum/LegionIO',
+    'source_code_uri'   => 'https://github.com/Optum/LegionIO',
+    'wiki_uri'          => 'https://github.com/Optum/LegionIO'
+  }
+
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+  spec.test_files = spec.files.select { |p| p =~ %r{^test/.*_test.rb} }
 
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
 
   spec.add_dependency 'concurrent-ruby', '>= 1.1.7'
   spec.add_dependency 'concurrent-ruby-ext', '>= 1.1.7'
@@ -33,32 +40,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oj', '>= 3.10'
   spec.add_dependency 'thor', '>= 1'
 
-  spec.add_dependency 'legion-cache'
+  spec.add_dependency 'legion-cache', '>= 0.2.0'
   spec.add_dependency 'legion-crypt', '>= 0.2.0'
-  spec.add_dependency 'legion-exceptions'
-  spec.add_dependency 'legion-json'
-  spec.add_dependency 'legion-logging'
-  spec.add_dependency 'legion-settings'
-  spec.add_dependency 'legion-transport', '>= 1.1.8'
+  spec.add_dependency 'legion-json', '>= 0.2.0'
+  spec.add_dependency 'legion-logging', '>= 0.2.0'
+  spec.add_dependency 'legion-settings', '>= 0.2.0'
+  spec.add_dependency 'legion-transport', '>= 1.1.9'
 
   spec.add_dependency 'lex-node'
 
-  spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'legion-data'
-  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 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
-
-  spec.add_development_dependency 'lex-conditioner'
-  spec.add_development_dependency 'lex-health'
-  spec.add_development_dependency 'lex-http'
-  spec.add_development_dependency 'lex-lex'
-  spec.add_development_dependency 'lex-log'
-  spec.add_development_dependency 'lex-scheduler'
-  spec.add_development_dependency 'lex-tasker'
-  spec.add_development_dependency 'lex-transformer'
 end

data/lib/legion/cli/lex/templates/base/dockerfile.erb

@@ -0,0 +1,5 @@
+FROM legionio/legion:latest
+LABEL maintainer="Matthew Iverson <matthewdiverson@gmail.com>"
+
+RUN gem install lex-<%= config[:lex] %> legion-data --no-document --no-prerelease
+CMD ruby $(which legionio)

data/lib/legion/cli/lex/templates/base/gemfile.erb

@@ -1,3 +1,10 @@
 source 'https://rubygems.org'
-
 gemspec
+
+group :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'rspec_junit_formatter'
+  gem 'rubocop'
+  gem 'simplecov'
+end

data/lib/legion/cli/lex/templates/base/gemspec.erb

@@ -3,24 +3,22 @@ require_relative 'lib/legion/extensions/<%= config[:lex] %>/version'
 Gem::Specification.new do |spec|
   spec.name          = 'lex-<%= config[:lex] %>'
   spec.version       = Legion::Extensions::<%= config[:class_name] %>::VERSION
-  spec.authors       = ['Esity']
-  spec.email         = ['matthewdiverson@gmail.com']
+  spec.authors       = []
+  spec.email         = []
 
   spec.summary       = 'LEX::<%= config[:class_name] %>'
   spec.description   = 'Connects Legion to <%= config[:class_name] %>'
-  spec.homepage      = 'https://bitbucket.org/legion-io/lex-<%= config[:lex] %>'
+  spec.homepage      = 'https://github.com/LegionIO/lex-<%= config[:lex] %>'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://bitbucket.org/legion-io/lex-<%= config[:lex] %>/src'
-  spec.metadata['documentation_uri'] = 'https://legionio.atlassian.net/wiki/spaces/LEX/pages/'
-  spec.metadata['changelog_uri'] = 'https://legionio.atlassian.net/wiki/spaces/LEX/pages/'
-  spec.metadata['bug_tracker_uri'] = 'https://bitbucket.org/legion-io/lex-<%= config[:lex] %>/issues'
+  spec.metadata['source_code_uri'] = 'https://github.com/LegionIO/lex-<%= config[:lex] %>/src'
+  spec.metadata['documentation_uri'] = 'https://github.com/LegionIO/lex-<%= config[:lex] %>/wiki'
+  spec.metadata['changelog_uri'] = 'https://github.com/LegionIO/lex-<%= config[:lex] %>'
+  spec.metadata['bug_tracker_uri'] = 'https://github.com/LegionIO/lex-<%= config[:lex] %>'
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
 end

data/lib/legion/cli/lex/templates/base/github_rspec.yml.erb

@@ -0,0 +1,23 @@
+name: RSpec
+on: [push, pull_request]
+
+jobs:
+  rspec:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: [2.7]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: RSpec run
+        run: |
+          bash -c "
+            bundle exec rspec
+            [[ $? -ne 2 ]]
+          "

data/lib/legion/cli/lex/templates/base/github_rubocop.yml.erb

@@ -0,0 +1,28 @@
+name: Rubocop
+on: [push, pull_request]
+jobs:
+  rubocop:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: [2.7]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install Rubocop
+        run: gem install rubocop code-scanning-rubocop
+      - name: Rubocop run --no-doc
+        run: |
+          bash -c "
+            rubocop --require code_scanning --format CodeScanning::SarifFormatter -o rubocop.sarif
+            [[ $? -ne 2 ]]
+          "
+      - name: Upload Sarif output
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: rubocop.sarif

data/lib/legion/cli/lex/templates/base/lic.erb

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Esity
+Copyright (c) 2021
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/legion/cli/lex/templates/base/rubocop.yml.erb

@@ -9,6 +9,7 @@ Style/Documentation:
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
+  SuggestExtensions: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

data/lib/legion/cli/lex/templates/base/version.erb

@@ -1,7 +1,7 @@
 module Legion
   module Extensions
     module <%= config[:class_name] %>
-      VERSION = '0.1.1'.freeze
+      VERSION = '0.1.0'.freeze
     end
   end
 end

data/lib/legion/cli/trigger.rb

@@ -65,7 +65,7 @@ module Legion
 
         status = options[:delay].zero? ? 'task.queued' : 'task.delayed'
         task = generate_task_id(function_id: trigger_function.values[:id], status: status, runner_id: trigger_runner.values[:id], args: payload,
-delay: options[:delay])
+                                delay: options[:delay])
 
         unless options[:delay].zero?
           say "Task: #{task[:task_id]} is queued and will be run in #{options[:delay]}s"
@@ -74,7 +74,7 @@ delay: options[:delay])
 
         routing_key = "#{trigger_extension.values[:exchange]}.#{trigger_runner.values[:queue]}.#{trigger_function.values[:name]}"
         exchange = Legion::Transport::Messages::Dynamic.new(function: trigger_function.values[:name], function_id: trigger_function.values[:id],
-routing_key: routing_key, args: payload)
+                                                            routing_key: routing_key, args: payload)
         exchange.options[:task_id] = task[:task_id]
         exchange.publish if options[:delay].zero?
 

data/lib/legion/extensions/actors/defaults.rb

@@ -0,0 +1,28 @@
+module Legion
+  module Extensions
+    module Actors
+      module Defaults
+        def use_runner?
+          true
+        end
+        # module_function :use_runner?
+
+        def check_subtask?
+          true
+        end
+        # module_function :check_subtask?
+
+        def generate_task?
+          false
+        end
+        # module_function :generate_task?
+
+        def enabled?
+          true
+        end
+        # module_function :enabled?
+        # extend self
+      end
+    end
+  end
+end

data/lib/legion/extensions/actors/once.rb

@@ -7,18 +7,18 @@ module Legion
         include Legion::Extensions::Actors::Base
 
         def initialize
-          return if disabled?
+          return unless enabled?
 
           if respond_to? :functions
             functions.each do
               function
               @task = Concurrent::ScheduledTask.execute(delay) do
-                use_runner ? runner : manual
+                use_runner? ? runner : manual
               end
             end
           else
             @task = Concurrent::ScheduledTask.execute(delay) do
-              use_runner ? runner : manual
+              use_runner? ? runner : manual
             end
           end
         rescue StandardError => e
@@ -30,7 +30,7 @@ module Legion
         end
 
         def cancel
-          return if disabled?
+          return unless enabled?
 
           @task.cancel unless @task.cancelled?
         end

data/lib/legion/extensions/builders/base.rb

@@ -21,7 +21,7 @@ module Legion
         end
 
         def define_constant_two(item, root: Kernel, type: Module)
-          return true if const_defined?(item, root: root)
+          return true if root.const_defined?(item)
 
           root.const_set(item.to_s, type.new)
         end

data/lib/legion/extensions/builders/runners.rb

@@ -31,6 +31,8 @@ module Legion
               class_methods:   {}
             }
 
+            @runners[runner_name.to_sym][:scheduled_tasks] = loaded_runner.scheduled_tasks if loaded_runner.method_defined? :scheduled_tasks
+
             if settings.key?(:runners) && settings[:runners].key?(runner_name.to_sym)
               @runners[runner_name.to_sym][:desc] = settings[:runners][runner_name.to_sym][:desc]
             end
@@ -42,6 +44,8 @@ module Legion
             end
 
             loaded_runner.methods(false).each do |runner_method|
+              next if %i[scheduled_tasks runner_description].include? runner_method
+
               @runners[runner_name.to_sym][:class_methods][runner_method] = {
                 args: loaded_runner.method(runner_method).parameters
               }

data/lib/legion/extensions/core.rb

@@ -84,7 +84,7 @@ module Legion
         end
       end
 
-      def build_settings # rubocop:disable Metrics/AbcSize
+      def build_settings
         if Legion::Settings[:extensions].key?(lex_name.to_sym)
           Legion::Settings[:default_extension_settings].each do |key, value|
             Legion::Settings[:extensions][lex_name.to_sym][key.to_sym] = if Legion::Settings[:extensions][lex_name.to_sym].key?(key.to_sym)

data/lib/legion/extensions/data/migrator.rb

@@ -4,9 +4,11 @@ module Legion
   module Extensions
     module Data
       class Migrator < Sequel::IntegerMigrator
-        def initialize(path, extension, **)
+        def initialize(path, extension, lex_name, **)
           @path = path
           @extension = extension
+          @lex_name = lex_name
+          schema_dataset
           super(Legion::Data::Connection.sequel, path)
         end
 
@@ -19,6 +21,10 @@ module Legion
         end
 
         def schema_dataset
+          dataset = Legion::Data::Connection.sequel.from(default_schema_table).where(namespace: @extension)
+          return dataset if dataset.count.positive?
+
+          Legion::Data::Model::Extension.insert(active: 1, namespace: @extension, name: @lex_name)
           Legion::Data::Connection.sequel.from(default_schema_table).where(namespace: @extension)
         end
         alias ds schema_dataset

data/lib/legion/extensions/data.rb

@@ -8,6 +8,7 @@ module Legion
       include Legion::Extensions::Helpers::Logger
 
       def build
+        Legion::Logging.fatal 'testing inside run'
         @models = []
         @migrations = []
         if Dir[File.expand_path("#{data_path}/migrations/*.rb")].count.positive?
@@ -43,10 +44,12 @@ module Legion
       end
 
       def migrate_class
-        @migrate_class ||= Legion::Extensions::Data::Migrator.new(migrations_path, lex_class.to_s)
+        @migrate_class ||= Legion::Extensions::Data::Migrator.new(migrations_path, lex_class.to_s, lex_name)
       end
 
       def run
+        Legion::Logging.fatal 'testing inside run'
+
         return true if migrate_class.is_current?
 
         log.debug('Running LEX schema migrator')

data/lib/legion/extensions/helpers/task.rb

@@ -20,11 +20,11 @@ module Legion
           Legion::Transport::Messages::TaskLog.new(task_id: task_id, runner_class: runner_class, function: function, entry: payload).publish
         end
 
-        def task_update(task_id, status, **opts)
+        def task_update(task_id, status, use_database: true, **opts)
           return if task_id.nil? || status.nil?
 
           begin
-            if Legion::Settings[:data][:connected]
+            if Legion::Settings[:data][:connected] && use_database
               task = Legion::Data::Model::Task[task_id]
               task.update(status: status)
               return true

data/lib/legion/extensions/transport.rb

@@ -34,7 +34,7 @@ module Legion
       end
 
       def require_transport_items
-        { 'exchanges': @exchanges, 'queues': @queues, 'consumers': @consumers, 'messages': @messages }.each do |item, obj|
+        { exchanges: @exchanges, queues: @queues, consumers: @consumers, messages: @messages }.each do |item, obj|
           Dir[File.expand_path("#{transport_path}/#{item}/*.rb")].sort.each do |file|
             require file
             file_name = file.to_s.split('/').last.split('.').first

data/lib/legion/extensions.rb

@@ -59,10 +59,15 @@ module Legion
         Legion::Logging.info "#{@extensions.count} extensions loaded with subscription:#{@subscription_tasks.count},every:#{@timer_tasks.count},poll:#{@poll_tasks.count},once:#{@once_tasks.count},loop:#{@loop_tasks.count}"
       end
 
-      def load_extension(extension, values)
+      def load_extension(extension, values) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/AbcSize
         return unless gem_load(values[:gem_name], extension)
 
         extension = Kernel.const_get(values[:extension_class])
+        extension.extend Legion::Extensions::Core unless extension.singleton_class.included_modules.include? Legion::Extensions::Core
+
+        min_version = Legion::Settings[:extensions][values[:extension_name]][:min_version] || nil
+        Legion::Logging.fatal values if min_version.is_a?(String) && Gem::Version.new(values[:version]) >= Gem::Version.new(min_version)
+
         if extension.data_required? && Legion::Settings[:data][:connected] == false
           Legion::Logging.warn "#{values[:extension_name]} requires Legion::Data but isn't enabled, skipping"
           return false
@@ -73,6 +78,11 @@ module Legion
           return false
         end
 
+        if extension.crypt_required? && Legion::Settings[:crypt][:cs].nil?
+          Legion::Logging.warn "#{values[:extension_name]} requires Legion::Crypt but isn't ready, skipping"
+          return false
+        end
+
         if extension.vault_required? && Legion::Settings[:crypt][:vault][:connected] == false
           Legion::Logging.warn "#{values[:extension_name]} requires Legion::Crypt::Vault but isn't enabled, skipping"
           return false

data/lib/legion/lex.rb

@@ -63,16 +63,17 @@ module Legion
         template('cli/lex/templates/base/gemspec.erb', "#{filename}/#{filename}.gemspec", vars)
         template('cli/lex/templates/base/gemfile.erb', "#{filename}/Gemfile", vars)
         template('cli/lex/templates/base/gitignore.erb', "#{filename}/.gitignore", vars)
-        template('cli/lex/templates/base/lic.erb', "#{filename}/LICENSE.txt", vars)
-        template('cli/lex/templates/base/rakefile.erb', "#{filename}/Rakefile", vars)
+        template('cli/lex/templates/base/lic.erb', "#{filename}/LICENSE", vars)
         template('cli/lex/templates/base/rubocop.yml.erb', "#{filename}/.rubocop.yml", vars)
         template('cli/lex/templates/base/readme.md.erb', "#{filename}/README.md", **vars)
         template('cli/lex/templates/base/lex.erb', "#{filename}/lib/legion/extensions/#{name}.rb", vars)
         template('cli/lex/templates/base/version.erb', "#{filename}/lib/legion/extensions/#{name}/version.rb", vars)
-        template('cli/lex/templates/base/bitbucket.yml.erb', "#{filename}/bitbucket-pipelines.yml", vars) if options[:pipeline]
         template('cli/lex/templates/base/spec_helper.rb.erb', "#{filename}/spec/spec_helper.rb", vars)
         template('cli/lex/templates/base/lex_spec.erb', "#{filename}/spec/legion/#{name}_spec.rb", vars)
 
+        template('cli/lex/templates/base/github_rspec.yml.erb', "#{filename}/.github/workflows/rspec.yml", vars)
+        template('cli/lex/templates/base/github_rubocop.yml.erb', "#{filename}/.github/workflows/rubocop.yml", vars)
+
         return if !options[:git_init] && !options[:bundle_install]
 
         run("cd lex_gen-#{filename}")
@@ -84,6 +85,28 @@ module Legion
 
         run('bundle update') if options[:bundle_install]
       end
+
+      method_option github: true
+      method_option rubygems: true
+      method_option docker: true
+      desc 'deploy a lex to multiple places', 'deploys a lex'
+      def deploy
+        system 'gem build'
+        if options[:github_gem]
+          system "gh release create v#{version} '#{long_name}-#{version}.gem'"
+          system 'gh release create v1.1.1 lex-node-1.1.1.gem -n v1.1.1 -t v1.1.1'
+          system "gem push --key github --host https://rubygems.pkg.github.com/LegionIO"
+        end
+
+        if options[:rubygems]
+          system "gem push .gem"
+        end
+
+        if options[:docker]
+
+        end
+
+      end
     end
   end
 end