legion-settings 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +64 -42
  3. data/.rubocop.yml +0 -9
  4. data/Gemfile.lock +37 -33
  5. data/README.md +0 -6
  6. data/bitbucket-pipelines.yml +13 -35
  7. data/legion-settings.gemspec +1 -2
  8. data/lib/legion/settings/loader.rb +19 -17
  9. data/lib/legion/settings/validator.rb +1 -1
  10. data/lib/legion/settings/version.rb +1 -1
  11. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e6ef2af16df9264f460351d3252b5c825d999fe16396bda55777563eac1ac6f8
4
- data.tar.gz: 63e355e73008164ba95d5a534d78d170adf870c272dee4931fff1671924dcf5c
3
+ metadata.gz: 529dce8673be8547c77e62f9d2959758ae68d9a0d8382d874063368623db02dc
4
+ data.tar.gz: 471de7964faedf593e596303d46cc1cefd4af912881faf088570e2e0487125db
5
5
  SHA512:
6
- metadata.gz: c1166390d81f276d918cbcfe18df028f3b57c9474758b4aadcea2fc61f17cd04f2080c0cf16002be2eacdeb15f7f690627bc917f0830580c1f14d7ca8a3f0fad
7
- data.tar.gz: 55e43c7d62f8bd9623de2bb0618b7a144330058814c13c7c05c507edbdf9d241f2c7ce55de1efd1d67133ad7ba4d0f3af2dd59c083f871022d39596a80da841e
6
+ metadata.gz: 42ae3ce45017c9a25b82455c59511a549d54092b59126abbc9917ec334edbb486b4f7aaa2d2066d14b078a1fb7547b262ce50fe26873c82040a47a8b5a123406
7
+ data.tar.gz: dae138c40d98e99fcfdc33a38276e35fc9e936dd06c5d5f543dff0e2f158ce892dc5cd6ce9976dd290dab6bf8b0c1abff5d7c1ba4caf8be7b973b87d598e5d85
data/.circleci/config.yml CHANGED
@@ -1,67 +1,90 @@
1
1
  version: 2.1
2
2
  orbs:
3
- ruby: circleci/ruby@0.2.1
4
- sonarcloud: sonarsource/sonarcloud@1.0.1
3
+ ruby: circleci/ruby@1.1.2
4
+ sonarcloud: sonarsource/sonarcloud@1.0.2
5
5
 
6
6
  jobs:
7
7
  "rubocop":
8
8
  docker:
9
- - image: circleci/ruby:2.7-node
9
+ - image: cimg/ruby:2.7
10
10
  steps:
11
11
  - checkout
12
- - ruby/load-cache
13
- - ruby/install-deps
14
- - run:
15
- name: Run Rubocop
16
- command: bundle exec rubocop
17
- - ruby/save-cache
12
+ - restore_cache:
13
+ key: "bundler cache mri"
14
+ - run: bundle update
15
+ - run: bundle exec rubocop --format=json --out=rubocop-result.json
16
+ - store_test_results:
17
+ path: rubocop-result.json
18
+ - sonarcloud/scan
19
+ - run: bundle exec rubocop
20
+ - save_cache:
21
+ key: "bundler cache mri"
22
+ paths:
23
+ - "/usr/local/bundle"
18
24
  "ruby-two-five":
19
25
  docker:
20
- - image: circleci/ruby:2.5
26
+ - image: cimg/ruby:2.5
21
27
  steps:
22
28
  - checkout
23
- - ruby/load-cache
24
- - run:
25
- name: update bundler
26
- command: gem update bundler
27
- - ruby/install-deps
28
- - ruby/run-tests
29
- - ruby/save-cache
29
+ - restore_cache:
30
+ key: "bundler cache mri"
31
+ - run: bundle update
32
+ - save_cache:
33
+ key: "bundler cache mri"
34
+ paths:
35
+ - "/usr/local/bundle"
36
+ - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
37
+ - store_test_results:
38
+ path: rspec-results.xml
39
+ - sonarcloud/scan
30
40
  "ruby-two-six":
31
41
  docker:
32
- - image: circleci/ruby:2.6
42
+ - image: cimg/ruby:2.6
33
43
  steps:
34
44
  - checkout
35
- - ruby/load-cache
36
- - run:
37
- name: update bundler
38
- command: gem update bundler
39
- - ruby/install-deps
40
- - ruby/run-tests
41
- - ruby/save-cache
45
+ - restore_cache:
46
+ key: "bundler cache mri"
47
+ - run: bundle update
48
+ - save_cache:
49
+ key: "bundler cache mri"
50
+ paths:
51
+ - "/usr/local/bundle"
52
+ - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
53
+ - store_test_results:
54
+ path: rspec-results.xml
55
+ - sonarcloud/scan
42
56
  "ruby-two-seven":
43
57
  docker:
44
58
  - image: circleci/ruby:2.7
45
- - image: memcached:1.5-alpine
46
59
  steps:
47
60
  - checkout
48
- - ruby/load-cache
49
- - ruby/install-deps
50
- - ruby/run-tests
51
- - ruby/save-cache
52
- "sonarcloud":
61
+ - restore_cache:
62
+ key: "bundler cache mri"
63
+ - run: bundle update
64
+ - save_cache:
65
+ key: "bundler cache mri"
66
+ paths:
67
+ - "/usr/local/bundle"
68
+ - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
69
+ - store_test_results:
70
+ path: rspec-results.xml
71
+ - sonarcloud/scan
72
+ "ruby-three":
53
73
  docker:
54
- - image: circleci/ruby:2.7
74
+ - image: circleci/ruby:3
55
75
  steps:
56
76
  - checkout
57
- - ruby/load-cache
58
- - ruby/install-deps
59
- - ruby/run-tests
60
- - run:
61
- name: Run Rubocop
62
- command: bundle exec rubocop --format=json --out=rubocop-result.json
77
+ - restore_cache:
78
+ key: "bundler cache mri"
79
+ - run: bundle update
80
+ - save_cache:
81
+ key: "bundler cache mri"
82
+ paths:
83
+ - "/usr/local/bundle"
84
+ - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
85
+ - store_test_results:
86
+ path: rspec-results.xml
63
87
  - sonarcloud/scan
64
- - ruby/save-cache
65
88
 
66
89
  workflows:
67
90
  version: 2
@@ -77,7 +100,6 @@ workflows:
77
100
  - ruby-two-seven:
78
101
  requires:
79
102
  - ruby-two-five
80
- - sonarcloud:
103
+ - ruby-three:
81
104
  requires:
82
- - ruby-two-seven
83
- - ruby-two-six
105
+ - ruby-two-five
data/.rubocop.yml CHANGED
@@ -6,13 +6,6 @@ Metrics/ClassLength:
6
6
  Max: 1500
7
7
  Metrics/BlockLength:
8
8
  Max: 50
9
- Layout/SpaceAroundEqualsInParameterDefault:
10
- EnforcedStyle: space
11
- Style/SymbolArray:
12
- Enabled: true
13
- Layout/HashAlignment:
14
- EnforcedHashRocketStyle: table
15
- EnforcedColonStyle: table
16
9
  Style/Documentation:
17
10
  Enabled: false
18
11
  AllCops:
@@ -20,5 +13,3 @@ AllCops:
20
13
  NewCops: enable
21
14
  Style/FrozenStringLiteralComment:
22
15
  Enabled: false
23
- Naming/FileName:
24
- Enabled: false
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- legion-settings (1.1.2)
4
+ legion-settings (1.1.3)
5
5
  legion-json
6
6
  legion-logging
7
7
 
@@ -10,53 +10,57 @@ GEM
10
10
  specs:
11
11
  ast (2.4.1)
12
12
  diff-lcs (1.4.4)
13
- docile (1.3.2)
14
- json_pure (2.3.1)
15
- legion-json (1.1.2)
13
+ docile (1.3.4)
14
+ json (2.5.1)
15
+ json_pure (2.5.1)
16
+ legion-exceptions (1.1.5)
17
+ legion-json (1.1.4)
16
18
  json_pure
19
+ legion-exceptions (>= 1.1.5)
17
20
  multi_json
18
- legion-logging (1.1.1)
21
+ legion-logging (1.1.3)
19
22
  rainbow (~> 3)
20
23
  multi_json (1.15.0)
21
- parallel (1.19.2)
22
- parser (2.7.2.0)
24
+ parallel (1.20.1)
25
+ parser (3.0.0.0)
23
26
  ast (~> 2.4.1)
24
27
  rainbow (3.0.0)
25
- rake (13.0.1)
26
- regexp_parser (1.8.2)
28
+ rake (13.0.3)
29
+ regexp_parser (2.0.3)
27
30
  rexml (3.2.4)
28
- rspec (3.9.0)
29
- rspec-core (~> 3.9.0)
30
- rspec-expectations (~> 3.9.0)
31
- rspec-mocks (~> 3.9.0)
32
- rspec-core (3.9.3)
33
- rspec-support (~> 3.9.3)
34
- rspec-expectations (3.9.2)
31
+ rspec (3.10.0)
32
+ rspec-core (~> 3.10.0)
33
+ rspec-expectations (~> 3.10.0)
34
+ rspec-mocks (~> 3.10.0)
35
+ rspec-core (3.10.1)
36
+ rspec-support (~> 3.10.0)
37
+ rspec-expectations (3.10.1)
35
38
  diff-lcs (>= 1.2.0, < 2.0)
36
- rspec-support (~> 3.9.0)
37
- rspec-mocks (3.9.1)
39
+ rspec-support (~> 3.10.0)
40
+ rspec-mocks (3.10.1)
38
41
  diff-lcs (>= 1.2.0, < 2.0)
39
- rspec-support (~> 3.9.0)
40
- rspec-support (3.9.3)
42
+ rspec-support (~> 3.10.0)
43
+ rspec-support (3.10.1)
41
44
  rspec_junit_formatter (0.4.1)
42
45
  rspec-core (>= 2, < 4, != 2.12.0)
43
- rubocop (0.93.1)
46
+ rubocop (1.8.0)
44
47
  parallel (~> 1.10)
45
- parser (>= 2.7.1.5)
48
+ parser (>= 3.0.0.0)
46
49
  rainbow (>= 2.2.2, < 4.0)
47
- regexp_parser (>= 1.8)
50
+ regexp_parser (>= 1.8, < 3.0)
48
51
  rexml
49
- rubocop-ast (>= 0.6.0)
52
+ rubocop-ast (>= 1.2.0, < 2.0)
50
53
  ruby-progressbar (~> 1.7)
51
- unicode-display_width (>= 1.4.0, < 2.0)
52
- rubocop-ast (0.8.0)
54
+ unicode-display_width (>= 1.4.0, < 3.0)
55
+ rubocop-ast (1.4.0)
53
56
  parser (>= 2.7.1.5)
54
- ruby-progressbar (1.10.1)
55
- simplecov (0.19.0)
57
+ ruby-progressbar (1.11.0)
58
+ simplecov (0.17.1)
56
59
  docile (~> 1.1)
57
- simplecov-html (~> 0.11)
58
- simplecov-html (0.12.3)
59
- unicode-display_width (1.7.0)
60
+ json (>= 1.8, < 3)
61
+ simplecov-html (~> 0.10.0)
62
+ simplecov-html (0.10.2)
63
+ unicode-display_width (2.0.0)
60
64
 
61
65
  PLATFORMS
62
66
  ruby
@@ -68,7 +72,7 @@ DEPENDENCIES
68
72
  rspec
69
73
  rspec_junit_formatter
70
74
  rubocop
71
- simplecov
75
+ simplecov (< 0.18.0)
72
76
 
73
77
  BUNDLED WITH
74
- 2.1.4
78
+ 2.2.4
data/README.md CHANGED
@@ -40,12 +40,6 @@ This library is utilized by Legion to load config files
40
40
 
41
41
  This gem can be viewed and download from [RubyGems - Legion-Settings](https://rubygems.org/gems/legion-settings)
42
42
 
43
- ## Development
44
-
45
- After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
46
-
47
- To install this gem onto your local machine, run `bundle exec install`.
48
-
49
43
  ## Contributing
50
44
 
51
45
  Bug reports and pull requests are welcome on GitHub at https://bitbucket.org/legion-io/legion-settings/issues This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
data/bitbucket-pipelines.yml CHANGED
@@ -1,39 +1,17 @@
1
- image: ruby:2.4.0
1
+ image: ruby:2.7
2
2
 
3
3
  pipelines:
4
- branches:
5
- master:
6
- - step:
7
- caches:
8
- - bundler
9
- script:
10
- - gem install bundle rubocop
11
- - bundle install
12
- - rubocop
13
- - rake
14
- - step:
15
- name: Deploy to test gem server
16
- deployment: test
17
- script:
18
- - gem install bundle geminabox
19
- - bundle install
20
- - gem build legion-settings.gemspec
21
- - gem inabox legion-settings*.gem -g https://gems.whonodes.org/ -o
22
- - step:
23
- name: Deploy to RubyGems
24
- deployment: production
25
- trigger: manual
26
- script:
27
- - gem build legion-settings.gemspec
28
- default:
29
- - step:
30
- caches:
31
- - bundler
32
- script:
33
- - gem install bundle rubocop
34
- - bundle install
35
- - rubocop
36
- - rake
4
+ tags:
5
+ "v*":
6
+ - step:
7
+ name: Push to RubyGems
8
+ deployment: RubyGems
9
+ script:
10
+ - gem install gem-release
11
+ - (umask 077 ; echo $gem_creds | base64 --decode > ~/.gem/credentials)
12
+ - gem release
13
+ artifacts:
14
+ - pkg/**
37
15
  definitions:
38
16
  caches:
39
- bundler: vendor/bundle
17
+ bundler: /usr/local/bundle
data/legion-settings.gemspec CHANGED
@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
17
17
  spec.files = `git ls-files -z`.split("\x0").reject do |f|
18
18
  f.match(%r{^(test|spec|features)/})
19
19
  end
20
- spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
21
20
  spec.require_paths = ['lib']
22
21
 
23
22
  spec.add_development_dependency 'bundler'
@@ -25,7 +24,7 @@ Gem::Specification.new do |spec|
25
24
  spec.add_development_dependency 'rspec'
26
25
  spec.add_development_dependency 'rspec_junit_formatter'
27
26
  spec.add_development_dependency 'rubocop'
28
- spec.add_development_dependency 'simplecov'
27
+ spec.add_development_dependency 'simplecov', '< 0.18.0'
29
28
  spec.add_dependency 'legion-json'
30
29
  spec.add_dependency 'legion-logging'
31
30
  end
data/lib/legion/settings/loader.rb CHANGED
@@ -17,35 +17,37 @@ module Legion
17
17
  def client_defaults
18
18
  {
19
19
  hostname: system_hostname,
20
- address: system_address,
21
- name: "#{::Socket.gethostname.tr('.', '_')}.#{::Process.pid}",
22
- ready: false
20
+ address: system_address,
21
+ name: "#{::Socket.gethostname.tr('.', '_')}.#{::Process.pid}",
22
+ ready: false
23
23
  }
24
24
  end
25
25
 
26
26
  def default_settings
27
27
  {
28
- client: client_defaults,
29
- cluster: { public_keys: {} },
30
- crypt: {
31
- cluster_secret: nil,
28
+ client: client_defaults,
29
+ cluster: { public_keys: {} },
30
+ crypt: {
31
+ cluster_secret: nil,
32
32
  cluster_secret_timeout: 5,
33
- vault: { connected: false }
33
+ vault: { connected: false }
34
34
  },
35
- cache: { enabled: true, connected: false, driver: 'dalli' },
36
- extensions: {},
37
- auto_install_missing_lex: true,
35
+ cache: { enabled: true, connected: false, driver: 'dalli' },
36
+ extensions: {},
37
+ reload: false,
38
+ reloading: false,
39
+ auto_install_missing_lex: true,
38
40
  default_extension_settings: {
39
41
  logger: { level: 'info', trace: false, extended: false }
40
42
  },
41
- logging: {
42
- level: 'info',
43
- location: 'stdout',
44
- trace: true,
43
+ logging: {
44
+ level: 'info',
45
+ location: 'stdout',
46
+ trace: true,
45
47
  backtrace_logging: true
46
48
  },
47
- transport: { connected: false },
48
- data: { connected: false }
49
+ transport: { connected: false },
50
+ data: { connected: false }
49
51
  }
50
52
  end
51
53
 
data/lib/legion/settings/validator.rb CHANGED
@@ -54,7 +54,7 @@ module Legion
54
54
 
55
55
  def invalid(object, message)
56
56
  @failures << {
57
- object: object,
57
+ object: object,
58
58
  message: message
59
59
  }
60
60
  end
data/lib/legion/settings/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Legion
2
2
  module Settings
3
- VERSION = '1.1.2'.freeze
3
+ VERSION = '1.1.3'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: legion-settings
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Esity
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-10-15 00:00:00.000000000 Z
11
+ date: 2021-01-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -84,16 +84,16 @@ dependencies:
84
84
  name: simplecov
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - "<"
88
88
  - !ruby/object:Gem::Version
89
- version: '0'
89
+ version: 0.18.0
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - "<"
95
95
  - !ruby/object:Gem::Version
96
- version: '0'
96
+ version: 0.18.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: legion-json
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -153,7 +153,7 @@ homepage: https://bitbucket.org/whonodes/legion-settings
153
153
  licenses:
154
154
  - MIT
155
155
  metadata: {}
156
- post_install_message:
156
+ post_install_message:
157
157
  rdoc_options: []
158
158
  require_paths:
159
159
  - lib
@@ -168,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
168
168
  - !ruby/object:Gem::Version
169
169
  version: '0'
170
170
  requirements: []
171
- rubygems_version: 3.1.2
172
- signing_key:
171
+ rubygems_version: 3.1.4
172
+ signing_key:
173
173
  specification_version: 4
174
174
  summary: Used to load the json settings files
175
175
  test_files: []