webmock 1.22.5 → 1.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: f264f2ee632cba4f292af8842162b194ca3d2869455452e0b4f3a37c090991ee32a4fb8045cd341f023ed54c1aba167ead51af0cfb08e9f94dd9031feaf716d9
-  data.tar.gz: 7b2896f0007c759df21777fb3a6497efef8293d230e3356124ab786e12d768ee251163d1bfaa0bf5f653db3b845c3134b542772ba40c69f4c69cd357528b5252
 SHA1: 
-  metadata.gz: b14156b6d829103daa974ba8bf5b5c3479077cb7
-  data.tar.gz: 205f1ed9b69fd533481ebe3161bf82e33f2a134a
+  data.tar.gz: cea737d780cbdf021a2649d7d942383e2bbbb69c
+  metadata.gz: e3f79ac55efa0abafd09ab92ec4058fa446839da
+SHA512: 
+  data.tar.gz: 235d4a2350afedb4a5b4781aaf84cca3111cd5300d85ec65736a44659f60090becc3041dfae074befd74534c34e2998364dac1b4435a36d1844e9408f8e3d1db
+  metadata.gz: 163992f908d194fa07e88027d26fed7c9dbf8dde05b6df292a0d3b1f6da2babbc85d96920cd21e17020c8eb00c0ee4f898a8d4d4265ca35d993a1b8acc12bb58

data/.gitignore

@@ -25,6 +25,7 @@ pkg
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.gemfile.lock
 pkg/*
 tmp/*
 *.rbc

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
@@ -9,18 +8,25 @@ rvm:
   - 2.3.0
   - rbx-2
   - ruby-head
-  - ree
   - jruby-9.0.0.0
   - jruby-9.0.1.0
-  - jruby-18mode
   - jruby-19mode
   - jruby
   - jruby-head
 matrix:
+  include:
+    - rvm: 1.8.7
+      gemfile: gemfiles/ruby_1_8.gemfile
+    - rvm: ree
+      gemfile: gemfiles/ruby_1_8.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/ruby_1_8.gemfile
   allow_failures:
     - rvm: jruby-9.0.0.0
     - rvm: jruby-18mode
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx-2
+# Send builds to container-based infrastructure
+# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
 sudo: false

data/Appraisals

@@ -0,0 +1,3 @@
+appraise "ruby_1_8" do
+  gem "addressable", ">= 2.3.6", "< 2.4.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.22.6
+
+  * Fixes [issue](https://github.com/bblimke/webmock/issues/568) around
+    WebMock restricting [Addressable](https://github.com/sporkmonger/addressable)
+    version, based on Ruby 1.8.7 for all versions of Ruby.
+
+    This change inverts that, and forces Ruby 1.8.7 users to specify in thier
+    Gemfile an Addressable version < 2.4.0.
+
+    Thanks to [PikachuEXE](https://github.com/PikachuEXE) and
+    [Matthew Rudy Jacobs](https://github.com/matthewrudy).
+
 ## 1.22.5
 
   * Fixes [bug](https://github.com/bblimke/webmock/issues/565) where WebMock tries

data/gemfiles/ruby_1_8.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org/"
+
+gem "addressable", ">= 2.3.6", "< 2.4.0"
+
+group :development do
+  gem "rake"
+end
+
+group :test do
+  gem "minitest_tu_shim", "1.3.2"
+end
+
+platforms :jruby do
+  gem "jruby-openssl"
+end
+
+gemspec :path => "../"

data/lib/webmock.rb

@@ -53,4 +53,14 @@ require 'webmock/http_lib_adapters/manticore_adapter'
 
 require 'webmock/webmock'
 
+if RUBY_VERSION <= "1.8.7" && Addressable::VERSION::STRING >= "2.4.0"
+  raise StandardError,
+    <<-ERR
+    \n\e[31m
+    Addressable dropped support for Ruby 1.8.7 on version 2.4.0,
 
+    please add the following to your Gemfile to be able to use WebMock:
+
+    gem 'addressable', '< 2.4.0'\e[0m\n
+  ERR
+end

data/lib/webmock/version.rb

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

data/webmock.gemspec

@@ -16,10 +16,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'webmock'
 
   patron_version      = (RUBY_VERSION <= '1.8.7') ? '0.4.18'   : '>= 0.4.18'
-  addressable_version = (RUBY_VERSION) > '1.8.7'  ? '>= 2.3.6' : '< 2.4.0'
   manticore_version   = (RUBY_VERSION) > '1.8.7'  ? '>= 0.5.1' : '<= 0.5.1'
 
-  s.add_dependency 'addressable', addressable_version
+  s.add_dependency 'addressable', '>= 2.3.6'
   s.add_dependency 'crack', '>=0.3.2'
   s.add_dependency 'hashdiff'
 
@@ -36,6 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest',        '~> 5.0.0'
   s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
   s.add_development_dependency 'rack'
+  s.add_development_dependency "appraisal", "~> 2.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 1.22.5
+  version: 1.22.6
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -9,147 +9,157 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-01-05 00:00:00 Z
+date: 2016-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        version: 2.4.0
   name: addressable
   prerelease: false
-  requirement: *id001
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.6
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: crack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.3.2
-  name: crack
-  prerelease: false
-  requirement: *id002
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: hashdiff
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - &id014 
       - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  name: hashdiff
-  prerelease: false
-  requirement: *id003
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 3.1.0
-  name: rspec
-  prerelease: false
-  requirement: *id004
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: httpclient
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.2.4
-  name: httpclient
-  prerelease: false
-  requirement: *id005
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: patron
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.4.18
-  name: patron
-  prerelease: false
-  requirement: *id006
   type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: em-http-request
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.2
-  name: em-http-request
-  prerelease: false
-  requirement: *id007
   type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: http
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.7.3
-  name: http
-  prerelease: false
-  requirement: *id008
   type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: curb
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
         version: 0.8.6
-  name: curb
-  prerelease: false
-  requirement: *id009
   type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: typhoeus
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.5.0
-  name: typhoeus
-  prerelease: false
-  requirement: *id010
   type: :development
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: excon
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.27.5
-  name: excon
-  prerelease: false
-  requirement: *id011
   type: :development
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: minitest
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 5.0.0
-  name: minitest
-  prerelease: false
-  requirement: *id012
   type: :development
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  name: rdoc
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
         version: 3.5.0
-  name: rdoc
-  prerelease: false
-  requirement: *id013
   type: :development
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  name: rack
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     requirements: 
     - *id014
-  name: rack
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: appraisal
   prerelease: false
-  requirement: *id015
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
   type: :development
+  version_requirements: *id016
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com
@@ -164,11 +174,13 @@ files:
 - .gitignore
 - .rspec-tm
 - .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/ruby_1_8.gemfile
 - lib/webmock.rb
 - lib/webmock/api.rb
 - lib/webmock/assertion_failure.rb