legion-data 0.1.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1201c65f7728a2af01e9b77ea56b2bf5b1f357c246f12cf84e59790d917a314c
-  data.tar.gz: e7a17e1c023b5514a31952fad0898e4048dc89938888ffcb76632403a1aa3a94
+  metadata.gz: '05917a40508eeb0fad578860bb1a13953eddc1eccf23f96792f2cc65fdfd8ee0'
+  data.tar.gz: 394a1c4b2a7c8d022d04b97fb1a300a309b29a4b0a67de24258de75707a5ad9c
 SHA512:
-  metadata.gz: '08530a83befaf49097ffcb3caff420f92d4d2fe942e88dce7b847a854d4241ab5d8370cef6168995e725db5fe26ff7773bb6763b7391992974b39bf444563638'
-  data.tar.gz: cfa8d6055185cbea52085d845058538148f497096e13ff3370cd13086b00a062e4dc9861663f749c58781bc23bb37ea87e588b049a20b884dd1f881025d16a50
+  metadata.gz: 86564da23b0078eeb75d9c10c1810192f0eb7b092bad31645e06946d620a4d5bb0cc5259a3f12ee315289a64c7b137bc524f8ac8d7b13de2b76c01372bd48c04
+  data.tar.gz: a3df723257736474cf2250112fe34732dcc275071ab62af5be3b397b848ac92233a2f31f86a6a0bc7b472727e3548f7cd4086d19734318d421f309dbe1baea6b

data/.circleci/config.yml

@@ -1,21 +1,24 @@
-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
-      - run: bundle install
+      - 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: mysql:5.7
+      - image: circleci/ruby:2.5
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -23,20 +26,20 @@ jobs:
           MYSQL_PASSWORD: 'legion'
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
       - 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 max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.4-node
-      - image: mysql:5.7
+      - image: circleci/ruby:2.6
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -44,19 +47,38 @@ jobs:
           MYSQL_PASSWORD: 'legion'
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
       - 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 max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-seven":
     docker:
-      - image: circleci/ruby:2.5-node
-      - image: mysql:5.7
+      - image: circleci/ruby:2.7
+      - image: circleci/mysql:5.7
+        environment:
+          MYSQL_DATABASE: 'legion'
+          MYSQL_ROOT_PASSWORD: 'legion'
+          MYSQL_USER: 'legion'
+          MYSQL_PASSWORD: 'legion'
+    steps:
+      - checkout
+      - ruby/load-cache
+      - ruby/install-deps
+      - run:
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - ruby/save-cache
+  "jruby-nine-two":
+    docker:
+      - image: circleci/jruby:9.2-jre
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -67,16 +89,18 @@ jobs:
       - run:
           name: Bundle Install
           command: bundle install
+      - run:
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
       - 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":
+      - sonarcloud/scan
+  "jruby-nine-two-e":
     docker:
-      - image: circleci/ruby:2.6-node
-      - image: mysql:5.7
+      - image: circleci/jruby:9.2.13-jre
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -87,16 +111,17 @@ jobs:
       - run:
           name: Bundle Install
           command: bundle install
+      - run:
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
       - 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":
+  "sonarcloud":
     docker:
-      - image: circleci/jruby:9.2
-      - image: mysql:5.7
+      - image: circleci/ruby:2.7
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -104,45 +129,46 @@ jobs:
           MYSQL_PASSWORD: 'legion'
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
+          name: Install Rubocop
+          command: gem install rubocop rubocop-sequel rubocop-performance rubocop-rspec
       - 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: update bundler
+          command: gem update bundler
+      - ruby/install-deps
+      - run:
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - run:
+          name: Run Rubocop
+          command: 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-two-five
+      - sonarcloud:
+          requires:
+            - ruby-two-seven
+            - ruby-two-six
+      - jruby-nine-two:
           requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.6:
+            - ruby-two-seven
+            - ruby-two-six
+      - jruby-nine-two-e:
           requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-#      - jruby-9.2:
-#          requires:
-#            - ruby-2.3
-#            - ruby-2.4
-#            - ruby-2.5
-#            - ruby-2.6
+            - jruby-nine-two

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -1,9 +1,4 @@
-require:
-  - rubocop-sequel
-  - rubocop-md
-  - rubocop-performance
-
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - 'lib/legion/data/migrations/*.rb'
@@ -11,6 +6,8 @@ Metrics/MethodLength:
   Max: 30
 Metrics/ClassLength:
   Max: 1500
+Metrics/AbcSize:
+  Max: 34
 Metrics/BlockLength:
   Max: 50
   Exclude:
@@ -25,6 +22,7 @@ Layout/HashAlignment:
 Style/Documentation:
   Enabled: false
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Legion::Data Changelog
+## v1.1.2
+* Updating connection details to support JDBC
+* Changing default max connections to 10
+* Fixing issue with Legion::Cache always throwing an error
+
+## v0.2.0
+* Redesigning schema
 
 ## v0.1.1
 * Updated `rubocop.yml` with updated syntax

data/Gemfile.lock

@@ -0,0 +1,85 @@
+PATH
+  remote: .
+  specs:
+    legion-data (1.1.5)
+      legion-logging
+      legion-settings
+      mysql2
+      sequel
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.1)
+    codecov (0.2.12)
+      json
+      simplecov
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    json (2.3.1)
+    json_pure (2.3.1)
+    legion-json (1.1.2)
+      json_pure
+      multi_json
+    legion-logging (1.1.3)
+      rainbow (~> 3)
+    legion-settings (1.1.2)
+      legion-json
+      legion-logging
+    multi_json (1.15.0)
+    mysql2 (0.5.3)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (1.0.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    sequel (5.37.0)
+    simplecov (0.19.1)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  codecov
+  legion-data!
+  rake
+  rspec
+  rspec_junit_formatter
+  rubocop
+
+BUNDLED WITH
+   2.1.4

data/legion-data.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Used by Legion to connect to the database'
   spec.description   = 'The Legion connect gem'
   spec.homepage = 'https://bitbucket.org/legion-io/legion-data'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['bug_tracker_uri'] = 'https://bitbucket.org/legion-io/legion-data/issues?status=new&status=open'
   spec.metadata['changelog_uri'] = 'https://bitbucket.org/legion-io/legion-data/src/CHANGELOG.md'
@@ -32,13 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-md'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'rubocop-sequel'
 
-  spec.add_dependency 'legion-logging', '~>0.1'
-  spec.add_dependency 'legion-settings', '~>0.1'
+  spec.add_dependency 'legion-logging'
+  spec.add_dependency 'legion-settings'
 
   if RUBY_ENGINE == 'jruby'
     spec.add_dependency 'jdbc-mysql'

data/lib/legion/data.rb

@@ -1,43 +1,61 @@
 require 'legion/data/version'
+require 'legion/data/settings'
 require 'sequel'
+
 require 'legion/data/connection'
-require 'legion/data/migration'
 require 'legion/data/model'
+require 'legion/data/migration'
 
 module Legion
   module Data
-    def build(options = {})
-      @connected = false
-      options.merge!(default_options) { |_key, v1, _v2| v1 }
-      @connection = connect(options[:connection]) if options[:connection][:auto_connect]
-      return unless options[:connection][:auto_connect]
-
-      migrate(@connection, options[:migration])
-      model(options[:model]) if options[:model][:auto_load]
-    end
-
-    def connect(_options = {})
-      Legion::Data::Connection.new
-    end
-
-    def migrate(connection, options = {})
-      return false if options.key?(:auto_migrate) && options[:auto_migrate]
-
-      Legion::Data::Migration.new(connection.database.connection)
-    end
-
-    def model(_options = {})
-      Legion::Data::Models.new
-    end
-
-    def default_options
-      { migration:  { auto_migrate: true },
-        model:      { auto_load: true },
-        connection: { auto_connect: true } }
-    end
-
-    def merge_options(options, default = default_options)
-      options.merge!(default) { |_key, v1, _v2| v1 }
+    class << self
+      def setup
+        connection_setup
+        migrate
+        load_models
+        setup_cache
+      end
+
+      def connection_setup
+        return if Legion::Settings[:data][:connected]
+
+        Legion::Data::Connection.setup
+      end
+
+      def migrate
+        Legion::Data::Migration.migrate
+      end
+
+      def load_models
+        Legion::Data::Models.load
+      end
+
+      def connection
+        Legion::Data::Connection.sequel
+      end
+
+      def setup_cache
+        return if Legion::Settings[:data][:cache][:enabled]
+
+        return unless defined?(::Legion::Cache)
+
+        Legion::Data::Model::Relationship.plugin :caching, Legion::Cache, ttl: 10
+        Legion::Data::Model::Runner.plugin :caching, Legion::Cache, ttl: 60
+        Legion::Data::Model::Chain.plugin :caching, Legion::Cache, ttl: 60
+        Legion::Data::Model::Datacenter.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Function.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Extension.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Node.plugin :caching, Legion::Cache, ttl: 10
+        Legion::Data::Model::TaskLog.plugin :caching, Legion::Cache, ttl: 12
+        Legion::Data::Model::Task.plugin :caching, Legion::Cache, ttl: 10
+        Legion::Data::Model::User.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Group.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Logging.info 'Legion::Data connected to Legion::Cache'
+      end
+
+      def shutdown
+        Legion::Data::Connection.shutdown
+      end
     end
   end
 end