Rename webmock to web_mock internally

lib/web_mock.rb

@@ -0,0 +1,37 @@
+require 'singleton'
+
+require 'addressable/uri'
+require 'crack'
+
+require 'web_mock/deprecation'
+require 'web_mock/version'
+
+require 'web_mock/errors'
+
+require 'web_mock/util/uri'
+require 'web_mock/util/headers'
+require 'web_mock/util/hash_counter'
+require 'web_mock/util/hash_keys_stringifier'
+
+require 'web_mock/request_pattern'
+require 'web_mock/request_signature'
+require 'web_mock/responses_sequence'
+require 'web_mock/request_stub'
+require 'web_mock/response'
+
+require 'web_mock/stub_request_snippet'
+
+require 'web_mock/assertion_failure'
+require 'web_mock/request_execution_verifier'
+require 'web_mock/config'
+require 'web_mock/callback_registry'
+require 'web_mock/request_registry'
+require 'web_mock/stub_registry'
+require 'web_mock/api'
+require 'web_mock/web_mock'
+
+require 'web_mock/adapters/net_http'
+require 'web_mock/adapters/httpclient'
+require 'web_mock/adapters/patron'
+require 'web_mock/adapters/curb'
+require 'web_mock/adapters/em_http_request'

lib/webmock/http_lib_adapters/curb.rb → lib/web_mock/adapters/curb.rb

@@ -1,3 +1,5 @@
+require 'web_mock/web_mock'
+
 if defined?(Curl)
 
   module Curl

lib/webmock/http_lib_adapters/em_http_request.rb → lib/web_mock/adapters/em_http_request.rb

@@ -1,3 +1,5 @@
+require 'web_mock/web_mock'
+
 if defined?(EventMachine::HttpRequest)
 
   module EventMachine

lib/webmock/http_lib_adapters/httpclient.rb → lib/web_mock/adapters/httpclient.rb

@@ -1,3 +1,5 @@
+require 'web_mock/web_mock'
+
 if defined?(::HTTPClient)
 
   class ::HTTPClient

lib/webmock/http_lib_adapters/net_http.rb → lib/web_mock/adapters/net_http.rb

@@ -1,3 +1,5 @@
+require 'web_mock/web_mock'
+
 require 'net/http'
 require 'net/https'
 require 'stringio'

lib/webmock/http_lib_adapters/net_http_response.rb → lib/web_mock/adapters/net_http_response.rb

@@ -11,6 +11,8 @@
 # after it has aleady been read.  This attemps to preserve the behavior of
 # #read_body, acting just as if it had never been read.
 
+require 'web_mock/web_mock'
+
 module WebMock
   module Net
     module HTTPResponse

lib/webmock/http_lib_adapters/patron.rb → lib/web_mock/adapters/patron.rb

@@ -1,3 +1,5 @@
+require 'web_mock/web_mock'
+
 if defined?(Patron)
 
   module Patron

lib/webmock/cucumber.rb → lib/web_mock/cucumber.rb

@@ -1,5 +1,5 @@
-require 'webmock'
-require 'webmock/rspec/matchers'
+require 'web_mock'
+require 'web_mock/rspec/matchers'
 
 World(WebMock::API, WebMock::Matchers)
 

lib/webmock/rspec.rb → lib/web_mock/rspec.rb

@@ -1,4 +1,4 @@
-require 'webmock'
+require 'web_mock'
 
 # RSpec 1.x and 2.x compatibility
 if defined?(RSpec) && defined?(RSpec::Expectations)
@@ -18,7 +18,7 @@
   end
 end
 
-require 'webmock/rspec/matchers'
+require 'web_mock/rspec/matchers'
 
 RSPEC_CONFIGURER.configure { |config|
 

lib/webmock/rspec/matchers.rb → lib/web_mock/rspec/matchers.rb

@@ -1,6 +1,6 @@
-require 'webmock'
-require 'webmock/rspec/matchers/request_pattern_matcher'
-require 'webmock/rspec/matchers/webmock_matcher'
+require 'web_mock'
+require 'web_mock/rspec/matchers/request_pattern_matcher'
+require 'web_mock/rspec/matchers/webmock_matcher'
 
 module WebMock
   module Matchers

lib/webmock/test_unit.rb → lib/web_mock/test_unit.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'webmock'
+require 'web_mock'
 
 module Test
   module Unit

lib/webmock/webmock.rb → lib/web_mock/web_mock.rb

@@ -72,6 +72,11 @@ def self.print_executed_requests
     puts WebMock::RequestExecutionVerifier.executed_requests_message
   end
 
+  def self.warn(message)
+    $stderr.puts message
+    $stderr.puts caller.join("\n") if $VERBOSE
+  end
+
   %w(
     allow_net_connect!
     disable_net_connect!

lib/webmock.rb

@@ -1,37 +1,2 @@
-require 'singleton'
-
-require 'addressable/uri'
-require 'crack'
-
-require 'webmock/deprecation'
-require 'webmock/version'
-
-require 'webmock/http_lib_adapters/net_http'
-require 'webmock/http_lib_adapters/httpclient'
-require 'webmock/http_lib_adapters/patron'
-require 'webmock/http_lib_adapters/curb'
-require 'webmock/http_lib_adapters/em_http_request'
-
-require 'webmock/errors'
-
-require 'webmock/util/uri'
-require 'webmock/util/headers'
-require 'webmock/util/hash_counter'
-require 'webmock/util/hash_keys_stringifier'
-
-require 'webmock/request_pattern'
-require 'webmock/request_signature'
-require 'webmock/responses_sequence'
-require 'webmock/request_stub'
-require 'webmock/response'
-
-require 'webmock/stub_request_snippet'
-
-require 'webmock/assertion_failure'
-require 'webmock/request_execution_verifier'
-require 'webmock/config'
-require 'webmock/callback_registry'
-require 'webmock/request_registry'
-require 'webmock/stub_registry'
-require 'webmock/api'
-require 'webmock/webmock'
+require 'web_mock'
+WebMock.warn('require "webmock" is deprecated and will be removed in WebMock 2.1. Use require "web_mock" instead.')

spec/spec_helper.rb

@@ -9,7 +9,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rspec'
-require 'webmock/rspec'
+require 'web_mock/rspec'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 

webmock.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
-require 'webmock/version'
+require 'web_mock/version'
 
 Gem::Specification.new do |s|
   s.name        = 'webmock'