diff --git a/README.textile b/README.textile index 059de66..ea46755 100644 --- a/README.textile +++ b/README.textile @@ -63,7 +63,7 @@ For an extensive usage in production, see the "wukong gem.":http://github.com/mr h2. Notice -Configliere 4.x now has 100% spec coverage, more powerful commandline handling, zero required dependencies. However, it also strips out several obscure features and much magical code, which breaks said obscure features and magic-dependent code. See the "CHANGELOG.":CHANGELOG.textile for details as you upgrade. +Configliere 4.x now has 100% spec coverage, more powerful commandline handling, and minimal required dependencies. However, it also strips out several obscure features and much magical code, which breaks said obscure features and magic-dependent code. See the "CHANGELOG.":CHANGELOG.textile for details as you upgrade. h2. Design goals: diff --git a/lib/configliere.rb b/lib/configliere.rb index 4ce0515..4345228 100644 --- a/lib/configliere.rb +++ b/lib/configliere.rb @@ -1,6 +1,10 @@ require 'date' # type conversion require 'time' # type conversion require 'fileutils' # so save! can mkdir + +require 'multi_json' +require 'yaml' + require 'configliere/deep_hash' # magic hash for params require 'configliere/param' # params container require 'configliere/define' # define param behavior diff --git a/lib/configliere/config_file.rb b/lib/configliere/config_file.rb index 9844291..cf2b8f3 100644 --- a/lib/configliere/config_file.rb +++ b/lib/configliere/config_file.rb @@ -48,7 +48,6 @@ def read filename, options={} end def read_yaml yaml_str, options={} - require 'yaml' new_data = YAML.load(yaml_str) || {} # Extract the :env (production/development/etc) if options[:env] @@ -58,11 +57,7 @@ def read_yaml yaml_str, options={} self end - # - # we depend on you to require some sort of JSON - # def read_json json_str, options={} - require 'multi_json' new_data = MultiJson.load(json_str) || {} # Extract the :env (production/development/etc) if options[:env]