bogo-config 0.1.14 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc71f05269f56aeb9ca69209a4b90cc3e1e3bd8
-  data.tar.gz: 7cc71fd964e5c6b6e4f3b37fb6566f20be6e75bb
+  metadata.gz: 36cf589e82eeeeb0693171b9e54da8e828a17c1f
+  data.tar.gz: ea5083e9fe3e79cc4188700ee4d2da4c431e8925
 SHA512:
-  metadata.gz: be2e2a898f765199cfd55c1f647435af416fad82325b821579f270cb910265f77c62d93707f7ecc77337b0a1e17abbdb2d3203fe5a4aab9f0e9cc1dcd2693103
-  data.tar.gz: fa88c6c0b25c37261dc37277b8f4cfceb150b037993c6c76f8a4a422710092d743e719aeb0cb125462180d3d59b66aeb33987e6d8b5bb33e9dc55cfba4bae8fd
+  metadata.gz: 3fccfe868de90bc88f45a33ebbc69fbb483c2ed66ff4feeb4776bb59a2096772a793a855cf686984e6b6e09b12904c949260f624c5649732b97a708dbebad4be
+  data.tar.gz: 73cdc5bafdef588bd8c95825849de6e95395b14e4ccd04269cb70d7c459f41f42332f7d954a742d955769d2ecb5dd92c98911fdb034cf546bd3ffdef9950b959

data/CHANGELOG.md

@@ -1,29 +1,33 @@
-## v0.1.14
+# v0.2.0
+* Stop configuration detection after successful load
+* Use custom exception type for config load failures
+
+# v0.1.14
 * Update debug environment variable name
 
-## v0.1.12
+# v0.1.12
 * Allow Ruby config disable via environment variable
 * Remove exclusive use during init
 
-## v0.1.10
+# v0.1.10
 * Gracefully handle failures of ruby files (rescue parse errors)
 
-## v0.1.8
+# v0.1.8
 * Support JSON serialization of configurations
 
-## v0.1.6
+# v0.1.6
 * Remove dirty functionality to retain consistent data access
 * Allow setting configuration as immutable
 
-## v0.1.4
+# v0.1.4
 * Delegate more methods from config instance to underlying data instance
 * Add initial support for auto reloading configuration
 
-## v0.1.2
+# v0.1.2
 * Update `Bogo::Config` to behave more like `Smash`
 * Make XML usage more consistent and apply type formats
 * Add `Configuration` class for cleaner struct usage
 * Add test coverage
 
-## v0.1.0
+# v0.1.0
 * Initial release

data/bogo-config.gemspec

@@ -10,9 +10,11 @@ Gem::Specification.new do |s|
   s.description = 'Configuration helper library'
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
-  s.add_dependency 'bogo', '>= 0.1.4', '< 1.0'
-  s.add_dependency 'multi_json'
-  s.add_dependency 'multi_xml'
-  s.add_dependency 'attribute_struct'
+  s.add_runtime_dependency 'bogo', '>= 0.1.4', '< 1.0'
+  s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'multi_xml'
+  s.add_runtime_dependency 'attribute_struct'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rake', '~> 10'
   s.files = Dir['lib/**/*'] + %w(bogo-config.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
 end

data/lib/bogo-config/config.rb

@@ -10,6 +10,24 @@ module Bogo
 
   class Config
 
+    # Exception wrapper class used for configuration file load failure
+    class FileLoadError < LoadError
+
+      # @return [Exception]
+      attr_reader :original
+
+      def initialize(message, original_exception = nil)
+        super(message)
+        @original = original_exception
+      end
+
+      # @return [Fixnum]
+      def exit_code
+        222
+      end
+
+    end
+
     class << self
 
       include Bogo::Memoization
@@ -170,31 +188,42 @@ module Bogo
     # @param file_path [String] path to file
     # @return [Smash]
     def load_file(file_path)
-      case File.extname(file_path)
-      when '.yaml', '.yml'
-        yaml_load(file_path)
-      when '.json'
-        json_load(file_path)
-      when '.xml'
-        xml_load(file_path)
-      when '.rb' && eval_enabled?
-        struct_load(file_path)
-      else
-        result = [:struct_load, :json_load, :yaml_load, :xml_load].map do |loader|
-          begin
-            send(loader, file_path)
-          rescue StandardError, ScriptError => e
-            if(ENV['BOGO_DEBUG'])
-              $stderr.puts "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
-            end
-            nil
-          end
-        end.compact.first
-        unless(result)
-          raise "Failed to load configuration from file (#{file_path})"
-        end
-        result
+      result = nil
+      errors = Smash.new
+      error = nil
+      begin
+        result = case File.extname(file_path)
+                 when '.yaml', '.yml'
+                   yaml_load(file_path)
+                 when '.json'
+                   json_load(file_path)
+                 when '.xml'
+                   xml_load(file_path)
+                 when '.rb' && eval_enabled?
+                   struct_load(file_path)
+                 else
+                   [:struct_load, :json_load, :yaml_load, :xml_load].each do |loader|
+                     begin
+                       result = send(loader, file_path)
+                       break
+                     rescue StandardError, ScriptError => e
+                       errors[loader] = e
+                       if(ENV['BOGO_DEBUG'])
+                         $stderr.puts "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+                       end
+                     end
+                   end
+                   result
+                 end
+      rescue => error
       end
+      unless(result)
+        raise FileLoadError.new(
+          "Failed to load configuration from file (#{file_path})",
+          error || extract_error_for(file_path, errors)
+        )
+      end
+      result
     end
 
     # Read and parse YAML file
@@ -282,5 +311,23 @@ module Bogo
       !eval_enabled?
     end
 
+    # Extract appropriate execption based on path
+    #
+    # @param path [String]
+    # @param errors [Hash]
+    # @return [Exception, NilClass]
+    def extract_error_for(path, errors)
+      content = File.read(path).strip
+      if(content.start_with?('{'))
+        errors[:json_load]
+      elsif(content.start_with?('<'))
+        errors[:xml_load]
+      elsif(content.match(/\.new\s*(do|\{)/))
+        errors[:struct_load]
+      else
+        errors[:yaml_load]
+      end
+    end
+
   end
 end

data/lib/bogo-config/version.rb

@@ -1,6 +1,6 @@
 module Bogo
   class Config
     # Current library version
-    VERSION = Gem::Version.new('0.1.14')
+    VERSION = Gem::Version.new('0.2.0')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bogo-config
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -72,6 +72,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 description: Configuration helper library
 email: code@chrisroberts.org
 executables: []
@@ -107,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Configuration helper library