legion-settings 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e632a79686eed42021f36c2d95cafea8c963bd8afac3ca62cc3eb78eb75557a
-  data.tar.gz: 92d444574391b074f13d1bf46f7397fc1db204d98121289dba836a6c3e624a0c
+  metadata.gz: 88c48b0708d96f97993a42390a6c6d6d17a8e24394dee86b42d876b37ea26698
+  data.tar.gz: 04e4a033cb797c6bee0a9e63062ad8a43dc0cbaeeaee4a8a7124f90dee608967
 SHA512:
-  metadata.gz: 30a526f2b17b1411df5bf07c317e78b8951f0c8b687d0eddc139c901b77782163c06859f516780f1d2dde862e1c96846dedbe1c250b895dc4daf413e69f69177
-  data.tar.gz: 8b2675306320ac65631849e9e6ba3a39f3e751c1e110e62bf55b576485dfc1b44d8de5276bbc7caaddd1c5e65ef5c44e9802d66f5e47f751d12029a86dca470a
+  metadata.gz: 3f4a84d333b9fda8e729f2090eb68da8a65d79e01a4a17286eb97ebb2dd13836746afcd8ec4ef012857599539b23a5de71d313010178cfc650f862c40e2dddc6
+  data.tar.gz: 50afc947274be3acbe9d56fb359f51ee044e93a3c7fcfb8ff53d9c05c2a888ed9d97aa375ff6d4691e8f5ed10a32d0deab66a96cf8ea4d3b3a4cb2def6282e5a

data/.circleci/config.yml

@@ -1,167 +1,61 @@
-version: 2.1 # use CircleCI 2.0
+version: 2.1
+orbs:
+  ruby: circleci/ruby@0.2.1
+
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.4-node
+      - image: circleci/ruby:2.5-node
     steps:
       - checkout
-      - run: gem install rubocop
+      - ruby/load-cache
+      - ruby/install-deps
       - run:
           name: Run Rubocop
-          command: rubocop
-      - store_test_results:
-          path: test_results
-  "ruby-two-zero":
-    docker:
-      - image: circleci/ruby:2.0
-    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
-  "ruby-two-one":
-    docker:
-      - image: circleci/ruby:2.1
-    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
-  "ruby-two-two":
-    docker:
-      - image: circleci/ruby:2.2
-    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
-
-  "ruby-two-three":
-    docker:
-      - image: circleci/ruby:2.3
-    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
-
-  "ruby-two-four":
-    docker:
-      - image: circleci/ruby:2.4-node
-    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
+          command: bundle exec rubocop
+      - ruby/save-cache
   "ruby-two-five":
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: circleci/ruby:2.5
+      - image: memcached:1.5-alpine
     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
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
   "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.6-node
+      - image: circleci/ruby:2.6
+      - image: memcached:1.5-alpine
     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
-  "jruby-nine-two":
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-seven":
     docker:
-      - image: circleci/jruby:9.2
+      - image: circleci/ruby:2.7
+      - image: memcached:1.5-alpine
     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
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
 
 workflows:
   version: 2
-  cop_rake_deploy:
+  rubocop-rspec:
     jobs:
       - rubocop
-      #      - ruby-two-two:
-      #          requires:
-      #            - ruby-two-four
-      #          filters:
-      #            branches:
-      #              only: /\bdevelop\b|\bmaster\b/
-      - ruby-two-three:
-          requires:
-            - ruby-two-four
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-two-four:
-          requires:
-            - rubocop
       - ruby-two-five:
           requires:
-            - ruby-two-four
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
+            - rubocop
       - ruby-two-six:
           requires:
-            - ruby-two-four
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-#      - jruby-nine-two:
-#          requires:
-#            - ruby-two-two
-#            - ruby-two-three
-#            - ruby-two-four
-#            - ruby-two-five
-#            - ruby-two-six
+            - ruby-two-five
+      - ruby-two-seven:
+          requires:
+            - ruby-two-five

data/.rubocop.yml

@@ -1,4 +1,4 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
   Max: 30
@@ -10,15 +10,13 @@ Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:
   Enabled: true
-Layout/AlignHash:
+Layout/HashAlignment:
   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/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Legion::Settings Changelog
 
+## v0.2.0
+* Adding merge settings method
+* Updating default settings
+
 ## v0.1.1
 * Updating default hash to include legion:{extensions:{}}
 * Fixing rubocop errors

data/legion-settings.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |spec|
   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', '~> 0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'rubocop'
   if RUBY_ENGINE == 'jruby'
     spec.add_dependency('legion-json-jruby', '~> 0.1')
   else

data/lib/legion/settings.rb

@@ -26,13 +26,22 @@ module Legion
         Legion::Logging.info('Legion::Settings was not loading, auto loading now!') if @loader.nil?
         @loader = load if @loader.nil?
         @loader[key]
+      rescue NoMethodError, TypeError
+        Legion::Logging.fatal 'rescue inside [](key)'
+        nil
       end
 
       def set_prop(key, value)
-        Legion::Logging.info('Legion::Settings was not loading, auto loading now!') if @loader.nil?
         @loader = load if @loader.nil?
         @loader[key] = value
       end
+
+      def merge_settings(key, hash)
+        @loader = load if @loader.nil?
+        thing = {}
+        thing[key.to_sym] = hash
+        @loader.load_module_default(thing)
+      end
     end
   end
 end

data/lib/legion/settings/loader.rb

@@ -1,13 +1,14 @@
+require 'socket'
+
 module Legion
   module Settings
-    # This is the main settings class, needs refactor
     class Loader
-      # This is the standard error
       class Error < RuntimeError; end
 
       attr_reader :warnings
       attr_reader :errors
       attr_reader :loaded_files
+      attr_reader :settings
 
       def initialize
         @warnings = []
@@ -20,43 +21,35 @@ module Legion
 
       def client_defaults
         {
-          name:    system_hostname,
-          address: system_address
+          hostname: system_hostname,
+          address:  system_address,
+          name:     "#{::Socket.gethostname.gsub('.', '_')}.#{::Process.pid}"
         }
       end
 
-      def default_settings # rubocop:disable Metrics/MethodLength
-        default = {
-          client:    {},
-          legion:    {
-            spawn:      {
-              limit: 12
-            },
-            extensions: {}
+      def default_settings
+        {
+          client:                     client_defaults,
+          cluster:                    { public_keys: {} },
+          crypt:                      {
+            cluster_secret:         nil,
+            cluster_secret_timeout: 5,
+            vault:                  { connected: false }
+          },
+          cache:                      { enabled: true, connected: false, driver: 'dalli' },
+          extensions:                 {},
+          default_extension_settings: {
+            logger: { level: 'info', trace: false, extended: false }
           },
-          transport: {
-            rabbitmq: {
-              user:     'guest',
-              password: 'guest',
-              host:     '127.0.0.1'
-            }
+          logging:                    {
+            level:             'debug',
+            location:          'stdout',
+            trace:             true,
+            backtrace_logging: true
           },
-          data:      {
-            mysql:      {
-              user:            'legion',
-              password:        'legion',
-              max_connections: 20,
-              database:        'legion',
-              host:            '127.0.0.1',
-              debug:           false
-            },
-            models:     {},
-            connection: {},
-            migrations: { continue_on_fail: false }
-          }
+          transport:                  { connected: false },
+          data:                       { connected: false }
         }
-        default[:client] = client_defaults if %w[client rspec].include?(legion_service_name)
-        default
       end
 
       def self.create_category_methods
@@ -103,6 +96,12 @@ module Legion
         load_api_env
       end
 
+      def load_module_default(config)
+        merged = deep_merge(@settings, config)
+        deep_diff(@settings, merged) unless @loaded_files.empty?
+        @settings = merged
+      end
+
       def load_file(file) # rubocop:disable Metrics/AbcSize
         Legion::Logging.debug("Trying to load file #{file}")
         if File.file?(file) && File.readable?(file)

data/lib/legion/settings/rules.rb

@@ -1,120 +1,62 @@
 module Legion
   module Settings
     module Rules
-      # Check that a value is a hash.
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_a_hash(value)
         value.is_a?(Hash)
       end
       alias is_a_hash? must_be_a_hash
 
-      # Check that a value is a hash, if set (not nil).
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_a_hash_if_set(value)
         value.nil? ? true : must_be_a_hash(value)
       end
 
-      # Check that a value is an array.
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_an_array(value)
         value.is_a?(Array)
       end
       alias is_an_array? must_be_an_array
 
-      # Check that a value is an array, if set (not nil).
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_an_array_if_set(value)
         value.nil? ? true : must_be_an_array(value)
       end
 
-      # Check that a value is a string.
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_a_string(value)
         value.is_a?(String)
       end
       alias is_a_string? must_be_a_string
 
-      # Check that a value is a string, if set (not nil).
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_a_string_if_set(value)
         value.nil? ? true : must_be_a_string(value)
       end
 
-      # Check that a value is an integer.
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_an_integer(value)
         value.is_a?(Integer)
       end
       alias is_an_integer? must_be_an_integer
 
-      # Check that a value is an integer, if set (not nil).
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_an_integer_if_set(value)
         value.nil? ? true : must_be_an_integer(value)
       end
 
-      # Check that a value is numeric.
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_a_numeric(value)
         value.is_a?(Numeric)
       end
 
-      # Check that a value is numeric, if set (not nil).
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_a_numeric_if_set(value)
         value.nil? ? true : must_be_a_numeric(value)
       end
 
-      # Check that a value matches a regular expression.
-      #
-      # @param regex [Regexp] pattern to compare with value.
-      # @param value [Object] to check if matches pattern.
-      # @return [TrueClass, FalseClass]
       def must_match_regex(regex, value)
         (value =~ regex).zero?
       end
 
-      # Check if a value is boolean.
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_boolean(value)
         !value.nil?
       end
 
-      # Check if a value is boolean, if set (no nil).
-      #
-      # @param value [Object] to check.
-      # @return [TrueClass, FalseClass]
       def must_be_boolean_if_set(value)
         value.nil? ? true : must_be_boolean(value)
       end
 
-      # Check that value items are all strings and not empty.
-      #
-      # @param value [Array] with items to check.
-      # @param regex [Regexp] to validate string items with.
-      # @return [TrueClass, FalseClass]
       def items_must_be_strings(value, regex = nil)
         value.all? do |item|
           item.is_a?(String) && !item.empty? &&
@@ -122,46 +64,26 @@ module Legion
         end
       end
 
-      # Check if either of the values are set (not nil).
-      #
-      # @param values [Array<Object>] to check if not nil.
-      # @return [TrueClass, FalseClass]
       def either_are_set?(*values)
         values.any? do |value|
           !value.nil?
         end
       end
 
-      # Check if values are valid times (can be parsed).
-      #
-      # @param values [Array<Object>] to check if valid time.
-      # @return [TrueClass, FalseClass]
       def must_be_time(*values)
         values.all? do |value|
-          begin
-            Time.parse(value)
-          rescue StandardError
-            false
-          end
+          Time.parse(value)
+        rescue StandardError
+          false
         end
       end
 
-      # Check if values are allowed.
-      #
-      # @param allowed [Array<Object>] allowed values.
-      # @param values [Array<Object>] to check if allowed.
-      # @return [TrueClass, FalseClass]
       def must_be_either(allowed, *values)
         values.flatten.all? do |value|
           allowed.include?(value)
         end
       end
 
-      # Check if values are allowed, if set (not nil).
-      #
-      # @param allowed [Array<Object>] allowed values.
-      # @param values [Array<Object>] to check if allowed.
-      # @return [TrueClass, FalseClass]
       def must_be_either_if_set(allowed, *values)
         values[0].nil? ? true : must_be_either(allowed, values)
       end

data/lib/legion/settings/validator.rb

@@ -8,19 +8,12 @@ module Legion
       include Rules
       include Validators
 
-      # @!attribute [r] failures
-      #   @return [Array] validation failures.
       attr_reader :failures
 
       def initialize
         @failures = []
       end
 
-      # Run the validator.
-      #
-      # @param settings [Hash] legion settings to validate.
-      # @param service [String] legion service to validate for.
-      # @return [Array] validation failures.
       def run(settings, service = nil)
         validate_legion(settings[:legion])
         validate_transport(settings[:transport])
@@ -46,10 +39,6 @@ module Legion
 
       private
 
-      # Validate setting categories: checks, filters, mutators, and
-      # handlers.
-      #
-      # @param settings [Hash] legion settings to validate.
       def validate_categories(settings)
         CATEGORIES.each do |category|
           if is_a_hash?(settings[category])
@@ -63,12 +52,6 @@ module Legion
         end
       end
 
-      # Record an invalid object with a message.
-      #
-      # @param object [Object] invalid object.
-      # @param message [String] message explaining why the object is
-      #   invalid.
-      # @return [Array] current validation failures.
       def invalid(object, message)
         @failures << {
           object:  object,

data/lib/legion/settings/validators/legion.rb

@@ -2,10 +2,6 @@ module Legion
   module Settings
     module Validators
       module Legion
-        # Validate Legion spawn.
-        # Validates: limit
-        #
-        # @param legion [Hash] legion definition.
         def validate_legion_spawn(legion)
           spawn = legion[:spawn]
           if is_a_hash?(spawn)
@@ -20,10 +16,6 @@ module Legion
           end
         end
 
-        # Validate a Legion definition.
-        # Validates: spawn
-        #
-        # @param legion [Hash] legion definition.
         def validate_legion(legion)
           if is_a_hash?(legion)
             validate_legion_spawn(legion)

data/lib/legion/settings/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Settings
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: legion-settings
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Esity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   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
+  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