webmock 1.23.0 → 1.24.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.24.0
+
+  * Enabled support for Curb > 0.8.6
+
 ## 1.23.0
 
   * `WebMock.disable_net_connect` accepts `:allow` option with an object that responds to `#call`, receiving a `URI` object and returning a boolean:

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -5,7 +5,7 @@ rescue LoadError
 end
 
 if defined?(Curl)
-  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16', '0.8.7').check_version!
+  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16', '0.9.1', ['0.8.7']).check_version!
 
   module WebMock
     module HttpLibAdapters

data/lib/webmock/util/version_checker.rb

@@ -24,9 +24,10 @@
 
 module WebMock
   class VersionChecker
-    def initialize(library_name, library_version, min_patch_level, max_minor_version = nil)
+    def initialize(library_name, library_version, min_patch_level, max_minor_version = nil, unsupported_versions = [])
       @library_name, @library_version = library_name, library_version
       @min_patch_level, @max_minor_version = min_patch_level, max_minor_version
+      @unsupported_versions = unsupported_versions || []
 
       @major,     @minor,     @patch     = parse_version(library_version)
       @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
@@ -38,6 +39,7 @@ module WebMock
     def check_version!
       warn_about_too_low if too_low?
       warn_about_too_high if too_high?
+      warn_about_unsupported_version if unsupported_version?
     end
 
   private
@@ -50,6 +52,10 @@ module WebMock
       @comparison_result == :too_high
     end
 
+    def unsupported_version?
+      @unsupported_versions.include?(@library_version)
+    end
+
     def warn_about_too_low
       warn_in_red "You are using #{@library_name} #{@library_version}. " +
                   "WebMock supports version #{version_requirement}."
@@ -61,6 +67,12 @@ module WebMock
                   "It may not work with this version."
     end
 
+    def warn_about_unsupported_version
+      warn_in_red "You are using #{@library_name} #{@library_version}. " +
+                  "WebMock does not support this version. " +
+                  "WebMock supports versions #{version_requirement}."
+    end
+
     def warn_in_red(text)
       Kernel.warn colorize(text, "\e[31m")
     end
@@ -80,6 +92,7 @@ module WebMock
     def version_requirement
       req = ">= #{@min_patch_level}"
       req += ", < #{@max_major}.#{@max_minor + 1}" if @max_minor
+      req += ", except versions #{@unsupported_versions.join(',')}" unless @unsupported_versions.empty?
       req
     end
 

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.23.0' unless defined?(::WebMock::VERSION)
+  VERSION = '1.24.0' unless defined?(::WebMock::VERSION)
 end

data/spec/spec_helper.rb

@@ -48,7 +48,6 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end
-RSpec::Expectations.configuration.warn_about_potential_false_positives = false
 
 def fail()
   raise_error(RSpec::Expectations::ExpectationNotMetError)

data/spec/unit/util/version_checker_spec.rb

@@ -55,5 +55,11 @@ module WebMock
       expect(Kernel).not_to receive(:warn)
       checker.check_version!
     end
+
+    it "prints warning if version is unsupported" do
+      checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '3.0', ['2.0.0'])
+      expect(Kernel).to receive(:warn).with(%r{You are using foo 2.0.0. WebMock does not support this version. WebMock supports versions >= 1.0.0, < 3.1, except versions 2.0.0.})
+      checker.check_version!
+    end
   end
 end

data/webmock.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'em-http-request', '>= 1.0.2'
   s.add_development_dependency 'http',            ((RUBY_VERSION <= '1.9.3') ? '0.7.3' : '>= 0.8.0')
   s.add_development_dependency 'em-synchrony',    '>= 1.0.0' if RUBY_VERSION >= "1.9"
-  s.add_development_dependency 'curb',            '<= 0.8.6' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'curb',            '>= 0.7.16' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'typhoeus',        '>= 0.5.0' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency('manticore',       manticore_version) if RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'excon',           '>= 0.27.5'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 119
   prerelease: 
   segments: 
   - 1
-  - 23
+  - 24
   - 0
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-18 00:00:00 +01:00
+date: 2016-02-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,14 +149,14 @@ dependencies:
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 35
         segments: 
         - 0
-        - 8
-        - 6
-        version: 0.8.6
+        - 7
+        - 16
+        version: 0.7.16
   prerelease: false
   requirement: *id009
   name: curb