erb_lint 0.0.23 → 0.0.24

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 11a6c2e365195f4de61cc8c922ba47cf085a752d
4
- data.tar.gz: 2971a21c126ebb55a7967eab594640241c18f95e
3
+ metadata.gz: 3c5a2e7e97fe4a4c7d38c32b5d663e7df68e0060
4
+ data.tar.gz: 21124a47352a859d281c2a2ede71df784480dc08
5
5
  SHA512:
6
- metadata.gz: 2ce2e0316264a8faed982c6158a7b1a5853019f9c071b8d026b0dedd1e14d9270cc1d56734053b196f756c339e20af4a08904a168845c2e3d716e61e7a2e7eaa
7
- data.tar.gz: cfe7c1f1b533427a56bcaabba1b46322ab1a5a22922ba15af6495b1e08715111914f29fe93008dfd09469e96c616bd7c4306212c4f1dc4e4a3632a925dd0e16a
6
+ metadata.gz: 9b52e7f82e28e0da22fdaa2124e97cb0f7b82ddbeb6e45a257c38078421d889a96bed05e0af5aa378838ad638cd0c8649b7dba0ab3115140983be879c995b621
7
+ data.tar.gz: 932439392b2a80444544ee332ad67715d51910983c7b255b695d91f62afcf4619d603fb3c7dac5649027ec492fb489690dac3b921b25a882e40376cbcb8401e9
data/lib/erb_lint/cli.rb CHANGED
@@ -139,7 +139,8 @@ module ERBLint
139
139
 
140
140
  def load_config
141
141
  if File.exist?(config_filename)
142
- @config = RunnerConfig.new(file_loader.yaml(config_filename))
142
+ config = RunnerConfig.new(file_loader.yaml(config_filename))
143
+ @config = RunnerConfig.default.merge(config)
143
144
  else
144
145
  warn "#{config_filename} not found: using default config".yellow
145
146
  @config = RunnerConfig.default
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ERBLint
4
- VERSION = '0.0.23'
4
+ VERSION = '0.0.24'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: erb_lint
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.23
4
+ version: 0.0.24
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Chan
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-04-02 00:00:00.000000000 Z
11
+ date: 2018-04-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: better_html