Stop installing the global configatron method when loading configatro…

…n/core

Gemfile.lock

@@ -20,6 +20,7 @@ GEM
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     rake (10.2.2)
+    subprocess (1.0.0)
 
 PLATFORMS
   ruby
@@ -30,3 +31,4 @@ DEPENDENCIES
   minitest (>= 5.2.3)
   mocha
   rake
+  subprocess

configatron.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "mocha"
+  gem.add_development_dependency "subprocess"
   gem.add_development_dependency "minitest", '>=5.2.3'
 end

lib/configatron.rb

@@ -3,7 +3,7 @@
 
 require 'configatron/deep_clone'
 require 'configatron/errors'
-require 'configatron/kernel'
+require 'configatron/kernel_store'
 require 'configatron/store'
 
 # Proc *must* load before dynamic/delayed, or else Configatron::Proc
@@ -14,3 +14,11 @@
 
 class Configatron
 end
+
+# NO_EXT gets defined when you require "configatron/core", which
+# signals that you don't want any extensions. It'd be nice to have a
+# better internal signaling mechanism (could use environment
+# variables, but then they become part of the public interface).
+unless defined?(Configatron::NO_EXT)
+  require 'configatron/ext/kernel'
+end

lib/configatron/core.rb

@@ -1,2 +1,6 @@
-$stderr.puts "Warning: Loading 'configatron/core' has been deprecated. Please just load 'configatron directly."
+class Configatron
+  # Signals that we should not load the extensions.
+  NO_EXT = true
+end
+
 require 'configatron'

lib/configatron/ext/kernel.rb

@@ -0,0 +1,5 @@
+module Kernel
+  def configatron
+    Configatron::KernelStore.instance
+  end
+end

lib/configatron/kernel.rb → lib/configatron/kernel_store.rb

@@ -50,9 +50,3 @@ def unlock!
     @locked = false
   end
 end
-
-module Kernel
-  def configatron
-    Configatron::KernelStore.instance
-  end
-end

test/functional/_lib/scripts/core.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+if defined?(configatron)
+  raise "`configatron` method was defined at load-time!"
+end
+
+require 'configatron/core'
+
+if defined?(configatron)
+  raise "Loaded configatron/core but `configatron` was defined!"
+end

test/functional/loading.rb

@@ -0,0 +1,10 @@
+require_relative '_lib'
+require 'subprocess'
+
+class Critic::Functional::ConfigatronTest < Critic::Functional::Test
+  describe 'loading' do
+    it 'does not define top-level configatron method if loading configatron/core' do
+      Subprocess.check_call([File.expand_path('../_lib/scripts/core.rb', __FILE__)])
+    end
+  end
+end