@@ -51,7 +51,6 @@ module MetricFu class Configuration def initialize #:nodoc:# - warn_about_deprecated_config_options reset add_attr_accessors_to_self add_class_methods_to_metric_fu @@ -82,25 +81,6 @@ module MetricFu end end - # Check if certain constants that are deprecated have been - # assigned. If so, warn the user about them, and the - # fact that they will have no effect. - def warn_about_deprecated_config_options - if defined?(::MetricFu::CHURN_OPTIONS) - raise("Use config.churn instead of MetricFu::CHURN_OPTIONS") - end - if defined?(::MetricFu::DIRECTORIES_TO_FLOG) - raise("Use config.flog[:dirs_to_flog] "+ - "instead of MetricFu::DIRECTORIES_TO_FLOG") - end - if defined?(::MetricFu::SAIKURO_OPTIONS) - raise("Use config.saikuro instead of MetricFu::SAIKURO_OPTIONS") - end - if defined?(SAIKURO_OPTIONS) - raise("Use config.saikuro instead of SAIKURO_OPTIONS") - end - end - # This allows us to have a nice syntax like: # # MetricFu.run do |config| lib/base/configuration.rb @@ -30,53 +30,6 @@ describe MetricFu::Configuration do @config.instance_variable_get(:@metric_fu_root_directory) end - describe '#warn_about_deprecated_config_options' do - - def get_new_config_and_raise_runtime_error - lambda { get_new_config }.should raise_error - end - - describe 'when ::MetricFu::CHURN_OPTIONS is present' do - before(:each) { ::MetricFu::CHURN_OPTIONS = 'option' } - after(:each) { ::MetricFu.send(:remove_const, 'CHURN_OPTIONS') } - - it 'should raise a RuntimeError with "Use config.churn '+ - 'instead of MetricFu::CHURN_OPTIONS"' do - get_new_config_and_raise_runtime_error - end - end - - describe 'when ::MetricFu::DIRECTORIES_TO_FLOG is present' do - before(:each) { ::MetricFu::DIRECTORIES_TO_FLOG = 'option' } - after(:each) { ::MetricFu.send(:remove_const,'DIRECTORIES_TO_FLOG')} - - it 'should raise a RuntimeError with "Use config.flog '+ - '[:dirs_to_flog] instead of MetricFu::DIRECTORIES_TO_FLOG' do - get_new_config_and_raise_runtime_error - end - end - - describe 'when ::MetricFu::SAIKURO_OPTIONS is present' do - before(:each) { ::MetricFu::SAIKURO_OPTIONS = 'option' } - after(:each) { ::MetricFu.send(:remove_const,'SAIKURO_OPTIONS')} - - it 'should raise a RuntimeError with "Use config.saikuro '+ - 'instead of MetricFu::SAIKURO_OPTIONS' do - get_new_config_and_raise_runtime_error - end - end - - describe 'when SAIKURO_OPTIONS is present' do - before(:each) { SAIKURO_OPTIONS = 'option' } - after(:each) { Object.send(:remove_const,'SAIKURO_OPTIONS')} - - it 'should raise a RuntimeError with "Use config.saikuro '+ - 'instead of SAIKURO_OPTIONS' do - get_new_config_and_raise_runtime_error - end - end - end - describe "#reset" do before(:each) { get_new_config } @@ -318,7 +271,7 @@ describe MetricFu::Configuration do before(:each) { get_new_config } it 'should return the value of the PLATFORM constant' do - this_platform = PLATFORM + this_platform = RUBY_PLATFORM @config.platform.should == this_platform end end spec/base/configuration_spec.rb 5d89f26162ff4243b9dc09b7e341c9592af1342c Jake Scruggs jake.scruggs@gmail.com http://github.com/jscruggs/metric_fu/commit/be63a6549e1c35fe21ebedd0ba37cd665c8290f4 be63a6549e1c35fe21ebedd0ba37cd665c8290f4 2009-07-10T20:56:41-07:00 2009-07-10T20:56:41-07:00 removing the check for depricated ways of configuring metric_fu as the tests were causing Ruby 1.9x problems and it's been forever since they were supported 2705e321287c53c80a72fdfa3f19634e34145c3a Jake Scruggs jake.scruggs@gmail.com