rails_config_validator 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 924b5eae765672ce30b8818688ef0bc21548f37c
-  data.tar.gz: 1bfc42fdc79a01f93a2e51013635272c08415791
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWQ5NjU1NzU1MDdmOTRlM2U1YzQwMDg2NmFmODhlOTJmMDI3N2NjYw==
+  data.tar.gz: !binary |-
+    ZjVhNTM2OTU1YTI2NDRlOTMwZjc0YjQ0MTZmZDRiNjhiNmYyOWNlZQ==
 SHA512:
-  metadata.gz: 28e23fa6df7b7324d2c597c71ca418c0871826e064dbfdec5f0ee6a75f3be7834e3c0ea025d912de2136d7e5e0d1c0762644171cee2a183ac2337d5158a09962
-  data.tar.gz: c94db5ba87ce99be47b1108a94353670ba7fe853476cb1509724d33af685cb27c3701990da0e04a2e7bd0accdea879eda95efcb13a504637c55f0e43c2506a2b
+  metadata.gz: !binary |-
+    YTcwMGY0YjhhYmMyMDQ4YmYyMzQ4ZjBhN2IxOGVhOGU5NTFlYTU1N2NhNWY1
+    MDA1MWViOGZlNjdhYjlmMDVmOTk0NzcxNGNmMzVjYjY1ZDc3ZjQ1YjNmNmIy
+    YjEyYjlhYWYwMDEwYWU5MmJhNTQ1MTdhZWE1OGQ3MDI3MjdkOWU=
+  data.tar.gz: !binary |-
+    ZmExOTI4ZTljZTUxNmExODEwMWEwMWNhNzFhNzU3ZTFkODc3ZjllMTc3ODJi
+    N2VlZDcyODZiYTljNmRiNDE4ZmRlZDcyMzQzNTBlZjAyYmY2NzA1MWE1ZDNl
+    ODhhMzZlZWY1MzE1ZTg2YmM5M2Q5MmY5Njc3M2FhY2Y0YjFkMWU=

data/.rubocop.yml

@@ -1 +1,8 @@
 inherit_from: .rubocop_u2i.yml
+
+AllCops:
+  TargetRubyVersion: 1.9
+
+Style/RescueModifier:
+  Exclude:
+  - spec/**/*_spec.rb

data/.rubocop_u2i.yml

@@ -1,7 +1,6 @@
 require: rubocop-rspec
 
 AllCops:
-  RunRailsCops: true
   Include:
     - '**/Rakefile'
     - config.ru

data/.travis.yml

@@ -3,6 +3,7 @@ env:
 language: ruby
 rvm:
   - 1.9.3
-  - 2.1.5
-  - 2.2.1
+  - 2.1
+  - 2.2
+  - 2.3.0
   - jruby-19mode

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [3.2.0] - 2016-05-12
+### Added
+- Added `raise_errors` option to allow disabling exceptions and show warnings instead.
+ 

data/lib/rails_config_validator/railtie.rb

@@ -3,6 +3,7 @@ module RailsConfigValidator
     config.before_configuration do
       config.config_validator = ActiveSupport::OrderedOptions.new
       config.config_validator.configs %w(database)
+      config.config_validator.raise_errors true
     end
 
     rake_tasks do
@@ -12,8 +13,9 @@ module RailsConfigValidator
     end
 
     initializer 'config_validator.configure' do
+      raise_errors = config.config_validator.raise_errors
       validators = config.config_validator.configs.map do |config|
-        RailsConfigValidator::Validator.new(config, Rails.env, pwd: Rails.root)
+        RailsConfigValidator::Validator.new(config, Rails.env, pwd: Rails.root, raise_errors: raise_errors)
       end
 
       validators.each(&:valid!)

data/lib/rails_config_validator/rake_task.rb

@@ -32,7 +32,7 @@ module RailsConfigValidator
       task :validate, [:config, :env] do |_, args|
         config = args[:config]
         env = args[:env] || Rails.env
-        fail 'Missing parameter :config' if args[:config].nil?
+        raise 'Missing parameter :config' if args[:config].nil?
 
         v = RailsConfigValidator::Validator.new(config, env, pwd: Rails.root)
         v.valid!

data/lib/rails_config_validator/validator.rb

@@ -10,6 +10,7 @@ module RailsConfigValidator
       @config_path = options[:config_path] || build_config_path(config_name)
       @schema_path = options[:schema_path] || build_schema_path(config_name)
       @env = env
+      @raise_errors = options.fetch(:raise_errors, true)
     end
 
     def valid?
@@ -21,11 +22,17 @@ module RailsConfigValidator
 
     def valid!
       mv = meta_validate
-      fail InvalidSchemaError,
-           "Incorrect schema #{schema_path}; errors: #{mv}" unless mv.empty?
+      return error(
+        InvalidSchemaError,
+        "Incorrect schema #{schema_path}; errors: #{mv}"
+      ) unless mv.empty?
       v = validate
-      fail InvalidConfigurationError,
-           "Incorrect config #{config_path}; errors: #{v}" unless v.empty?
+      error(
+        InvalidConfigurationError,
+        "Incorrect config #{config_path}; errors: #{v}"
+      ) unless v.empty?
+    rescue InvalidConfigurationError, InvalidSchemaError => e
+      error(e.class, e)
     end
 
     def meta_validate
@@ -55,6 +62,11 @@ module RailsConfigValidator
 
     attr_reader :config_path, :schema_path
 
+    def error(*args)
+      raise(*args) if @raise_errors
+      warn(args.join("\n")) # Ruby 1.9 accepts only single argument
+    end
+
     def kwalify_validator
       Kwalify::Validator.new(schema)
     rescue Errno::ENOENT => e
@@ -66,15 +78,15 @@ module RailsConfigValidator
     end
 
     def config
-      YAML.load(ERB.new((File.read(config_path))).result)
+      YAML.load(ERB.new(File.read(config_path)).result)
     end
 
     def env_config
       document = config
-      fail InvalidConfigurationError,
-           "config file #{config_path} is empty" unless document
-      fail InvalidConfigurationError,
-           "missing configuration for env #{@env} in #{config_path}" unless document.key?(@env)
+      raise InvalidConfigurationError,
+            "config file #{config_path} is empty" unless document
+      raise InvalidConfigurationError,
+            "missing configuration for env #{@env} in #{config_path}" unless document.key?(@env)
       document[@env]
     end
 

data/lib/rails_config_validator/version.rb

@@ -1,3 +1,3 @@
 module RailsConfigValidator
-  VERSION = '3.1.2'
+  VERSION = '3.2.0'.freeze
 end

data/rails_config_validator.gemspec

@@ -27,8 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'u2i-ci_utils', '~> 1.0.2'
+  spec.add_development_dependency 'u2i-ci_utils', '~> 3.0'
 
   spec.add_development_dependency 'guard-rubocop', '~> 1.2'
   spec.add_development_dependency 'guard-rspec', '~> 4.5'
+  spec.add_development_dependency 'listen', '~> 3.0.5'
 end

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: rails_config_validator
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Michał Knapik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: u2i-ci_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.5'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 description: The gem uses Kwalify schema validator to check Rails configuration files
   syntax.
 email:
@@ -102,11 +116,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_u2i.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .rubocop_u2i.yml
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - README.md
@@ -132,12 +147,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []