legion-data 0.1.1 → 1.1.5

data/lib/legion/data/migrations/015_add_default_extensions.rb

@@ -0,0 +1,24 @@
+Sequel.migration do
+  up do
+    lex = from(:extensions).insert(namespace: 'Legion::Extensions::Lex', name: 'lex', exchange: 'lex', uri: 'lex')
+    [
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Register', name: 'register', queue: 'register', uri: 'register' },
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Function', name: 'function', queue: 'function', uri: 'function' },
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Runner', name: 'runner', queue: 'runner', uri: 'runner' },
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Extension', name: 'extension', queue: 'extension', uri: 'extension' }
+    ].each do |row|
+      from(:runners).insert row
+    end
+
+    lex = from(:extensions).insert(namespace: 'Legion::Extensions::Node', name: 'node', exchange: 'node', uri: 'node')
+    [
+      { extension_id: lex, namespace: 'Legion::Extensions::Node::Runners::Crypt', name: 'crypt', queue: 'crypt', uri: 'crypt' }
+    ].each do |row|
+      from(:runners).insert row
+    end
+  end
+  down do
+    from(:extensions).where(namespace: 'Legion::Extensions::Lex').delete
+    from(:extensions).where(namespace: 'Legion::Extensions::Node').delete
+  end
+end

data/lib/legion/data/migrations/016_change_task_args.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:tasks) do
+      rename_column :args, :function_args
+    end
+  end
+end

data/lib/legion/data/migrations/017_add_payload_task.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:tasks) do
+      add_column :payload, :text
+    end
+  end
+end

data/lib/legion/data/migrations/018_add_migration_column.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:extensions) do
+      add_column :schema_version, Integer, null: false, default: 0, index: true
+    end
+  end
+end

data/lib/legion/data/migrations/019_add_debug_to_relationships.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:relationships) do
+      add_column :debug, Integer, null: false, default: 0, index: true
+    end
+  end
+end

data/lib/legion/data/migrations/020_add_delay_debug_to_tasks.rb

@@ -0,0 +1,8 @@
+Sequel.migration do
+  change do
+    alter_table(:tasks) do
+      add_column :delay, Integer, limit: 1, null: false, default: 0, index: true
+      add_column :debug, Integer, limit: 1, null: false, default: 0, index: true
+    end
+  end
+end

data/lib/legion/data/model.rb

@@ -1,34 +1,35 @@
 module Legion
   module Data
-    class Models
-      attr_reader :loaded_models
-      def initialize(options = {})
-        options.merge!(default_options) { |_key, v1, _v2| v1 }
-        @loaded_models = []
-        require_sequel_models if options[:auto_load]
-      end
+    module Models
+      class << self
+        attr_reader :loaded_models
 
-      def default_options
-        { continue_on_model_fail: false,
-          auto_load:              true }
-      end
+        def models
+          %w[user group extension chain relationship function task runner task_log datacenter environment node setting]
+        end
 
-      def models
-        %w[chain relationship function task namespace task_log datacenter environment node]
-      end
+        def load
+          Legion::Logging.info 'Loading Legion::Data::Models'
+          @loaded_models ||= []
+          require_sequel_models(models)
+          Legion::Settings[:data][:models][:loaded] = true
+        end
 
-      def require_sequel_models(files = models)
-        files.each { |file| load_sequel_model(file) }
-      end
+        def require_sequel_models(files = models)
+          Dir["#{File.dirname(__FILE__)}models/*.rb"].each { |file| puts file }
+          files.each { |file| load_sequel_model(file) }
+        end
 
-      def load_sequel_model(model)
-        Legion::Logging.debug("Trying to load #{model}.rb")
-        require_relative "models/#{model}"
-        @loaded_models << model
-        Legion::Logging.debug("Successfully loaded #{model}")
-      rescue LoadError => e
-        Legion::Logging.fatal("Failed to load #{model}")
-        raise e unless Legion::Settings[:data][:models][:continue_on_fail]
+        def load_sequel_model(model)
+          Legion::Logging.debug("Trying to load #{model}.rb")
+          require_relative "models/#{model}"
+          @loaded_models << model
+          Legion::Logging.debug("Successfully loaded #{model}")
+          model
+        rescue LoadError => e
+          Legion::Logging.fatal("Failed to load #{model}")
+          raise e unless Legion::Settings[:data][:models][:continue_on_fail]
+        end
       end
     end
   end

data/lib/legion/data/models/chain.rb

@@ -3,7 +3,6 @@
 module Legion
   module Data
     module Model
-      # Used for accessing legion.chains
       class Chain < Sequel::Model
         one_to_many :relationship
       end

data/lib/legion/data/models/datacenter.rb

@@ -3,7 +3,6 @@
 module Legion
   module Data
     module Model
-      # Used for accessing legion.datacenters
       class Datacenter < Sequel::Model
         one_to_many :node
       end

data/lib/legion/data/models/environment.rb

@@ -3,7 +3,6 @@
 module Legion
   module Data
     module Model
-      # Used for accessing legion.environments
       class Environment < Sequel::Model
         one_to_many :node
       end

data/lib/legion/data/models/extension.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Legion
+  module Data
+    module Model
+      class Extension < Sequel::Model
+        one_to_many :runners
+      end
+    end
+  end
+end

data/lib/legion/data/models/function.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'relationship'
+
 module Legion
   module Data
     module Model
-      # Used for accessing legion.functions
       class Function < Sequel::Model
-        many_to_one :namespace
-        one_to_many :trigger_functions, class: :Relationship, key: :trigger_id
-        one_to_many :action_functions, class: :Relationship, key: :action_id
+        many_to_one :runner
+        one_to_many :trigger_relationships, class: 'Legion::Data::Model::Relationship', key: :trigger_id
+        one_to_many :action_relationships, class: 'Legion::Data::Model::Relationship', key: :action_id
       end
     end
   end

data/lib/legion/data/models/group.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Legion
+  module Data
+    module Model
+      class Group < Sequel::Model
+      end
+    end
+  end
+end

data/lib/legion/data/models/node.rb

@@ -3,10 +3,10 @@
 module Legion
   module Data
     module Model
-      # Used for accessing legion.nodes
       class Node < Sequel::Model
         many_to_one :environment
         many_to_one :datacenter
+        one_to_many :task_log
       end
     end
   end

data/lib/legion/data/models/relationship.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require_relative 'function'
+
 module Legion
   module Data
     module Model
-      # Used for access legion.relationships
       class Relationship < Sequel::Model
         many_to_one :chain
         one_to_many :task

data/lib/legion/data/models/runner.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'function'
+module Legion
+  module Data
+    module Model
+      class Runner < Sequel::Model
+        many_to_one :chain
+        one_to_many :task
+        one_to_many :functions
+        many_to_one :extension
+      end
+    end
+  end
+end

data/lib/legion/data/models/setting.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Legion
+  module Data
+    module Model
+      class Setting < Sequel::Model
+      end
+    end
+  end
+end

data/lib/legion/data/models/task.rb

@@ -3,7 +3,6 @@
 module Legion
   module Data
     module Model
-      # Used for accessing legion.tasks
       class Task < Sequel::Model
         many_to_one :relationship
         one_to_many :task_log

data/lib/legion/data/models/task_log.rb

@@ -3,7 +3,6 @@
 module Legion
   module Data
     module Model
-      # Used for accessing legion.task_logs
       class TaskLog < Sequel::Model
         many_to_one :task
         many_to_one :node

data/lib/legion/data/models/user.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Legion
+  module Data
+    module Model
+      class User < Sequel::Model
+      end
+    end
+  end
+end

data/lib/legion/data/settings.rb

@@ -0,0 +1,68 @@
+module Legion
+  module Data
+    module Settings
+      def self.default
+        {
+          connected:        false,
+          cache:            cache,
+          connection:       connection,
+          creds:            creds,
+          migrations:       migrations,
+          models:           models,
+          connect_on_start: true
+        }
+      end
+
+      def self.models
+        {
+          continue_on_load_fail: false,
+          autoload:              true
+        }
+      end
+
+      def self.migrations
+        {
+          continue_on_fail: false,
+          auto_migrate:     true,
+          ran:              false,
+          version:          nil
+        }
+      end
+
+      def self.connection
+        {
+          log:                 false,
+          log_connection_info: false,
+          log_warn_duration:   1,
+          sql_log_level:       'debug',
+          max_connections:     10,
+          preconnect:          false
+        }
+      end
+
+      def self.creds
+        {
+          username: 'legion',
+          password: 'legion',
+          database: 'legion',
+          host:     '127.0.0.1',
+          port:     3306
+        }
+      end
+
+      def self.cache
+        {
+          connected:   false,
+          auto_enable: Legion::Settings[:cache][:connected],
+          ttl:         60
+        }
+      end
+    end
+  end
+end
+
+begin
+  Legion::Settings.merge_settings('data', Legion::Data::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/data/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Data
-    VERSION = '0.1.1'.freeze
+    VERSION = '1.1.5'.freeze
   end
 end

data/sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.projectKey=legion-io_legion-data
+sonar.organization=legion-io
+sonar.projectName=Legion::Data
+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-data
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Esity
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,41 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-md
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: legion-logging
   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:
@@ -137,47 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-sequel
+  name: legion-settings
   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:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: legion-logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: legion-settings
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +163,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -227,40 +172,44 @@ files:
 - legion-data.gemspec
 - lib/legion/data.rb
 - lib/legion/data/connection.rb
-- lib/legion/data/connections/base.rb
-- lib/legion/data/connections/jdbc.rb
-- lib/legion/data/connections/mysql.rb
-- lib/legion/data/connections/mysql2.rb
-- lib/legion/data/connections/mysql_base.rb
 - lib/legion/data/migration.rb
 - lib/legion/data/migrations/001_add_schema_columns.rb
-- lib/legion/data/migrations/002_add_chains_table.rb
-- lib/legion/data/migrations/003_add_datacenters_table.rb
-- lib/legion/data/migrations/004_add_envs_table.rb
-- lib/legion/data/migrations/005_add_functions_table.rb
-- lib/legion/data/migrations/006_add_namespaces_table.rb
-- lib/legion/data/migrations/007_add_nodes_table.rb
-- lib/legion/data/migrations/008_add_relationships_table.rb
-- lib/legion/data/migrations/009_add_task_logs_table.rb
-- lib/legion/data/migrations/010_add_tasks_table.rb
-- lib/legion/data/migrations/011_add_users_and_groups.rb
-- lib/legion/data/migrations/012_foreign_keys_users_and_groups.rb
-- lib/legion/data/migrations/013_function_foreign_keys.rb
-- lib/legion/data/migrations/014_nodes_foreign_keys.rb
-- lib/legion/data/migrations/015_relationships_foreign_keys.rb
-- lib/legion/data/migrations/016_tasks_foreign_keys.rb
-- lib/legion/data/migrations/017_add_relationship_to_tasks.rb
+- lib/legion/data/migrations/002_add_users.rb
+- lib/legion/data/migrations/003_add_groups.rb
+- lib/legion/data/migrations/004_add_chains.rb
+- lib/legion/data/migrations/005_add_envs.rb
+- lib/legion/data/migrations/006_add_dcs.rb
+- lib/legion/data/migrations/007_add_nodes.rb
+- lib/legion/data/migrations/008_add_settings.rb
+- lib/legion/data/migrations/009_add_extensions.rb
+- lib/legion/data/migrations/010_add_runners.rb
+- lib/legion/data/migrations/011_add_functions.rb
+- lib/legion/data/migrations/012_add_tasks.rb
+- lib/legion/data/migrations/013_add_task_logs.rb
+- lib/legion/data/migrations/014_add_relationships.rb
+- lib/legion/data/migrations/015_add_default_extensions.rb
+- lib/legion/data/migrations/016_change_task_args.rb
+- lib/legion/data/migrations/017_add_payload_task.rb
+- lib/legion/data/migrations/018_add_migration_column.rb
+- lib/legion/data/migrations/019_add_debug_to_relationships.rb
+- lib/legion/data/migrations/020_add_delay_debug_to_tasks.rb
 - lib/legion/data/model.rb
 - lib/legion/data/models/chain.rb
 - lib/legion/data/models/datacenter.rb
 - lib/legion/data/models/environment.rb
+- lib/legion/data/models/extension.rb
 - lib/legion/data/models/function.rb
-- lib/legion/data/models/namespace.rb
+- lib/legion/data/models/group.rb
 - lib/legion/data/models/node.rb
 - lib/legion/data/models/relationship.rb
+- lib/legion/data/models/runner.rb
+- lib/legion/data/models/setting.rb
 - lib/legion/data/models/task.rb
 - lib/legion/data/models/task_log.rb
+- lib/legion/data/models/user.rb
+- lib/legion/data/settings.rb
 - lib/legion/data/version.rb
+- sonar-project.properties
 homepage: https://bitbucket.org/legion-io/legion-data
 licenses: []
 metadata:
@@ -270,7 +219,7 @@ metadata:
   homepage_uri: https://bitbucket.org/legion-io/legion-data
   source_code_uri: https://bitbucket.org/legion-io/legion-data
   wiki_uri: https://bitbucket.org/legion-io/legion-data/wiki/Home
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -278,15 +227,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.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Used by Legion to connect to the database
 test_files: []