legion-settings 0.2.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c48b0708d96f97993a42390a6c6d6d17a8e24394dee86b42d876b37ea26698
-  data.tar.gz: 04e4a033cb797c6bee0a9e63062ad8a43dc0cbaeeaee4a8a7124f90dee608967
+  metadata.gz: e6ef2af16df9264f460351d3252b5c825d999fe16396bda55777563eac1ac6f8
+  data.tar.gz: 63e355e73008164ba95d5a534d78d170adf870c272dee4931fff1671924dcf5c
 SHA512:
-  metadata.gz: 3f4a84d333b9fda8e729f2090eb68da8a65d79e01a4a17286eb97ebb2dd13836746afcd8ec4ef012857599539b23a5de71d313010178cfc650f862c40e2dddc6
-  data.tar.gz: 50afc947274be3acbe9d56fb359f51ee044e93a3c7fcfb8ff53d9c05c2a888ed9d97aa375ff6d4691e8f5ed10a32d0deab66a96cf8ea4d3b3a4cb2def6282e5a
+  metadata.gz: c1166390d81f276d918cbcfe18df028f3b57c9474758b4aadcea2fc61f17cd04f2080c0cf16002be2eacdeb15f7f690627bc917f0830580c1f14d7ca8a3f0fad
+  data.tar.gz: 55e43c7d62f8bd9623de2bb0618b7a144330058814c13c7c05c507edbdf9d241f2c7ce55de1efd1d67133ad7ba4d0f3af2dd59c083f871022d39596a80da841e

data/.circleci/config.yml

@@ -1,11 +1,12 @@
 version: 2.1
 orbs:
   ruby: circleci/ruby@0.2.1
+  sonarcloud: sonarsource/sonarcloud@1.0.1
 
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: circleci/ruby:2.7-node
     steps:
       - checkout
       - ruby/load-cache
@@ -17,20 +18,24 @@ jobs:
   "ruby-two-five":
     docker:
       - image: circleci/ruby:2.5
-      - image: memcached:1.5-alpine
     steps:
       - checkout
       - ruby/load-cache
+      - run:
+          name: update bundler
+          command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
   "ruby-two-six":
     docker:
       - image: circleci/ruby:2.6
-      - image: memcached:1.5-alpine
     steps:
       - checkout
       - ruby/load-cache
+      - run:
+          name: update bundler
+          command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
@@ -44,6 +49,19 @@ jobs:
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
+  "sonarcloud":
+    docker:
+      - image: circleci/ruby:2.7
+    steps:
+      - checkout
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop --format=json --out=rubocop-result.json
+      - sonarcloud/scan
+      - ruby/save-cache
 
 workflows:
   version: 2
@@ -58,4 +76,8 @@ workflows:
             - ruby-two-five
       - ruby-two-seven:
           requires:
-            - ruby-two-five
+            - ruby-two-five
+      - sonarcloud:
+          requires:
+            - ruby-two-seven
+            - ruby-two-six

data/.gitignore

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

data/.rubocop.yml

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

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in legion-settings.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: .
+  specs:
+    legion-settings (1.1.2)
+      legion-json
+      legion-logging
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.1)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    json_pure (2.3.1)
+    legion-json (1.1.2)
+      json_pure
+      multi_json
+    legion-logging (1.1.1)
+      rainbow (~> 3)
+    multi_json (1.15.0)
+    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.2)
+      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.3)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.93.1)
+      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 (0.8.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    simplecov (0.19.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  legion-settings!
+  rake
+  rspec
+  rspec_junit_formatter
+  rubocop
+  simplecov
+
+BUNDLED WITH
+   2.1.4

data/legion-settings.gemspec

@@ -12,24 +12,20 @@ Gem::Specification.new do |spec|
   spec.description   = "Based on Sensu's implementation of settings"
   spec.homepage      = 'https://bitbucket.org/whonodes/legion-settings'
   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)/})
   end
-  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
-  # spec.add_development_dependency 'codecov', '~> 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
-    spec.add_dependency('legion-json', '~> 0.1')
-  end
-  spec.add_dependency 'legion-logging', '~> 0.1'
+  spec.add_development_dependency 'simplecov'
+  spec.add_dependency 'legion-json'
+  spec.add_dependency 'legion-logging'
 end

data/lib/legion/settings.rb

@@ -7,6 +7,7 @@ module Legion
   module Settings
     class << self
       attr_accessor :loader
+
       def load(options = {})
         @loader = Legion::Settings::Loader.new
         @loader.load_env
@@ -40,7 +41,7 @@ module Legion
         @loader = load if @loader.nil?
         thing = {}
         thing[key.to_sym] = hash
-        @loader.load_module_default(thing)
+        @loader.load_module_settings(thing)
       end
     end
   end

data/lib/legion/settings/loader.rb

@@ -4,11 +4,7 @@ module Legion
   module Settings
     class Loader
       class Error < RuntimeError; end
-
-      attr_reader :warnings
-      attr_reader :errors
-      attr_reader :loaded_files
-      attr_reader :settings
+      attr_reader :warnings, :errors, :loaded_files, :settings
 
       def initialize
         @warnings = []
@@ -16,14 +12,14 @@ module Legion
         @settings = default_settings
         @indifferent_access = false
         @loaded_files = []
-        self.class.create_category_methods
       end
 
       def client_defaults
         {
           hostname: system_hostname,
           address:  system_address,
-          name:     "#{::Socket.gethostname.gsub('.', '_')}.#{::Process.pid}"
+          name:     "#{::Socket.gethostname.tr('.', '_')}.#{::Process.pid}",
+          ready:    false
         }
       end
 
@@ -38,11 +34,12 @@ module Legion
           },
           cache:                      { enabled: true, connected: false, driver: 'dalli' },
           extensions:                 {},
+          auto_install_missing_lex:   true,
           default_extension_settings: {
             logger: { level: 'info', trace: false, extended: false }
           },
           logging:                    {
-            level:             'debug',
+            level:             'info',
             location:          'stdout',
             trace:             true,
             backtrace_logging: true
@@ -52,18 +49,6 @@ module Legion
         }
       end
 
-      def self.create_category_methods
-        # CATEGORIES.each do |category|
-        #   define_method(category) do
-        #     setting_category(category)
-        #   end
-        #   method_name = category.to_s.chop + "_exists?"
-        #   define_method(method_name.to_sym) do |name|
-        #     definition_exists?(category, name)
-        #   end
-        # end
-      end
-
       def to_hash
         unless @indifferent_access
           indifferent_access!
@@ -96,13 +81,17 @@ module Legion
         load_api_env
       end
 
+      def load_module_settings(config)
+        @settings = deep_merge(config, @settings)
+      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
+      def load_file(file)
         Legion::Logging.debug("Trying to load file #{file}")
         if File.file?(file) && File.readable?(file)
           begin
@@ -123,7 +112,6 @@ module Legion
       end
 
       def load_directory(directory)
-        warning('loading config files from directory', directory: directory)
         path = directory.gsub(/\\(?=\S)/, '/')
         if File.readable?(path) && File.executable?(path)
           Dir.glob(File.join(path, '**{,/*/**}/*.json')).uniq.each do |file|

data/lib/legion/settings/validator.rb

@@ -42,7 +42,7 @@ module Legion
       def validate_categories(settings)
         CATEGORIES.each do |category|
           if is_a_hash?(settings[category])
-            validate_method = ('validate_' + category.to_s.chop).to_sym
+            validate_method = "validate_#{category.to_s.chop}".to_sym
             settings[category].each do |name, details|
               send(validate_method, details.merge(name: name.to_s))
             end

data/lib/legion/settings/version.rb

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

data/sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.projectKey=legion-io_legion-settings
+sonar.organization=legion-io
+sonar.projectName=Legion::Settings
+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-settings
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Esity
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,34 +80,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: legion-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: legion-logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 description: Based on Sensu's implementation of settings
 email:
 - matthewdiverson@gmail.com
@@ -120,11 +134,10 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bitbucket-pipelines.yml
 - legion-settings.gemspec
 - lib/legion/settings.rb
@@ -135,11 +148,12 @@ files:
 - lib/legion/settings/validators.rb
 - lib/legion/settings/validators/legion.rb
 - lib/legion/settings/version.rb
+- sonar-project.properties
 homepage: https://bitbucket.org/whonodes/legion-settings
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +161,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 to load the json settings files
 test_files: []

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'legion/settings'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here