config: auto-detect $TORK_CONFIGS values only once

sunaku · Aug 6, 2014 · afe3778 · afe3778
1 parent 96f4fd3
commit afe3778
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 4 deletions.
diff --git a/lib/tork/config.rb b/lib/tork/config.rb
@@ -15,3 +15,8 @@ def self.config name, search_path=ENV['TORK_CONFIGS']
 
 ENV['TORK_CONFIGS'] ||= String.new.freeze # ENV values come frozen by default
 Tork.config :config, '*'
+
+unless ENV['TORK_CONFIGS_DETECTED'] =~ /\S/
+  ENV['TORK_CONFIGS_DETECTED'] = $0
+  Tork.config :detect, '*'
+end
diff --git a/lib/tork/config/bundler/config.rb → lib/tork/config/bundler/detect.rb b/lib/tork/config/bundler/config.rb → lib/tork/config/bundler/detect.rb
diff --git a/lib/tork/config/cucumber/config.rb → lib/tork/config/cucumber/detect.rb b/lib/tork/config/cucumber/config.rb → lib/tork/config/cucumber/detect.rb
diff --git a/lib/tork/config/devise/config.rb → lib/tork/config/devise/detect.rb b/lib/tork/config/devise/config.rb → lib/tork/config/devise/detect.rb
diff --git a/lib/tork/config/factory_girl/config.rb → lib/tork/config/factory_girl/detect.rb b/lib/tork/config/factory_girl/config.rb → lib/tork/config/factory_girl/detect.rb
diff --git a/lib/tork/config/rails/config.rb → lib/tork/config/rails/detect.rb b/lib/tork/config/rails/config.rb → lib/tork/config/rails/detect.rb
diff --git a/lib/tork/config/spec/config.rb b/lib/tork/config/spec/config.rb
@@ -1,4 +1,2 @@
 $tork_config_spec_glob = '**/{spec_*,*_spec}.rb'
 $tork_config_spec_grep = %r{.*(\bspec_[^/]+|[^/]+_spec)\.rb$}
-
-ENV['TORK_CONFIGS'] += ':spec' if Dir['spec/', $tork_config_spec_glob].any?
diff --git a/lib/tork/config/spec/detect.rb b/lib/tork/config/spec/detect.rb
@@ -0,0 +1 @@
+ENV['TORK_CONFIGS'] += ':spec' if Dir['spec/', $tork_config_spec_glob].any?
diff --git a/lib/tork/config/test/config.rb b/lib/tork/config/test/config.rb
@@ -6,5 +6,3 @@
 
 $tork_config_test_glob = "**/{#{labels_glob}_*,*_#{labels_glob}}.rb"
 $tork_config_test_grep = %r{.*(\b#{labels_grep}_[^/]+|[^/]+_#{labels_grep})\.rb$}
-
-ENV['TORK_CONFIGS'] += ':test' if Dir['test/', $tork_config_test_glob].any?
diff --git a/lib/tork/config/test/detect.rb b/lib/tork/config/test/detect.rb
@@ -0,0 +1 @@
+ENV['TORK_CONFIGS'] += ':test' if Dir['test/', $tork_config_test_glob].any?