webmock 1.22.5 → 1.22.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/.travis.yml +9 -3
  4. data/Appraisals +3 -0
  5. data/CHANGELOG.md +12 -0
  6. data/gemfiles/ruby_1_8.gemfile +19 -0
  7. data/lib/webmock.rb +10 -0
  8. data/lib/webmock/version.rb +1 -1
  9. data/webmock.gemspec +2 -2
  10. metadata +71 -59
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA512:
3
- metadata.gz: f264f2ee632cba4f292af8842162b194ca3d2869455452e0b4f3a37c090991ee32a4fb8045cd341f023ed54c1aba167ead51af0cfb08e9f94dd9031feaf716d9
4
- data.tar.gz: 7b2896f0007c759df21777fb3a6497efef8293d230e3356124ab786e12d768ee251163d1bfaa0bf5f653db3b845c3134b542772ba40c69f4c69cd357528b5252
5
2
  SHA1:
6
- metadata.gz: b14156b6d829103daa974ba8bf5b5c3479077cb7
7
- data.tar.gz: 205f1ed9b69fd533481ebe3161bf82e33f2a134a
3
+ data.tar.gz: cea737d780cbdf021a2649d7d942383e2bbbb69c
4
+ metadata.gz: e3f79ac55efa0abafd09ab92ec4058fa446839da
5
+ SHA512:
6
+ data.tar.gz: 235d4a2350afedb4a5b4781aaf84cca3111cd5300d85ec65736a44659f60090becc3041dfae074befd74534c34e2998364dac1b4435a36d1844e9408f8e3d1db
7
+ metadata.gz: 163992f908d194fa07e88027d26fed7c9dbf8dde05b6df292a0d3b1f6da2babbc85d96920cd21e17020c8eb00c0ee4f898a8d4d4265ca35d993a1b8acc12bb58
data/.gitignore CHANGED
@@ -25,6 +25,7 @@ pkg
25
25
  *.gem
26
26
  .bundle
27
27
  Gemfile.lock
28
+ gemfiles/*.gemfile.lock
28
29
  pkg/*
29
30
  tmp/*
30
31
  *.rbc
data/.travis.yml CHANGED
@@ -1,5 +1,4 @@
1
1
  rvm:
2
- - 1.8.7
3
2
  - 1.9.2
4
3
  - 1.9.3
5
4
  - 2.0.0
@@ -9,18 +8,25 @@ rvm:
9
8
  - 2.3.0
10
9
  - rbx-2
11
10
  - ruby-head
12
- - ree
13
11
  - jruby-9.0.0.0
14
12
  - jruby-9.0.1.0
15
- - jruby-18mode
16
13
  - jruby-19mode
17
14
  - jruby
18
15
  - jruby-head
19
16
  matrix:
17
+ include:
18
+ - rvm: 1.8.7
19
+ gemfile: gemfiles/ruby_1_8.gemfile
20
+ - rvm: ree
21
+ gemfile: gemfiles/ruby_1_8.gemfile
22
+ - rvm: jruby-18mode
23
+ gemfile: gemfiles/ruby_1_8.gemfile
20
24
  allow_failures:
21
25
  - rvm: jruby-9.0.0.0
22
26
  - rvm: jruby-18mode
23
27
  - rvm: jruby-head
24
28
  - rvm: ruby-head
25
29
  - rvm: rbx-2
30
+ # Send builds to container-based infrastructure
31
+ # http://docs.travis-ci.com/user/workers/container-based-infrastructure/
26
32
  sudo: false
data/Appraisals ADDED
@@ -0,0 +1,3 @@
1
+ appraise "ruby_1_8" do
2
+ gem "addressable", ">= 2.3.6", "< 2.4.0"
3
+ end
data/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # Changelog
2
2
 
3
+ ## 1.22.6
4
+
5
+ * Fixes [issue](https://github.com/bblimke/webmock/issues/568) around
6
+ WebMock restricting [Addressable](https://github.com/sporkmonger/addressable)
7
+ version, based on Ruby 1.8.7 for all versions of Ruby.
8
+
9
+ This change inverts that, and forces Ruby 1.8.7 users to specify in thier
10
+ Gemfile an Addressable version < 2.4.0.
11
+
12
+ Thanks to [PikachuEXE](https://github.com/PikachuEXE) and
13
+ [Matthew Rudy Jacobs](https://github.com/matthewrudy).
14
+
3
15
  ## 1.22.5
4
16
 
5
17
  * Fixes [bug](https://github.com/bblimke/webmock/issues/565) where WebMock tries
data/gemfiles/ruby_1_8.gemfile ADDED
@@ -0,0 +1,19 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "http://rubygems.org/"
4
+
5
+ gem "addressable", ">= 2.3.6", "< 2.4.0"
6
+
7
+ group :development do
8
+ gem "rake"
9
+ end
10
+
11
+ group :test do
12
+ gem "minitest_tu_shim", "1.3.2"
13
+ end
14
+
15
+ platforms :jruby do
16
+ gem "jruby-openssl"
17
+ end
18
+
19
+ gemspec :path => "../"
data/lib/webmock.rb CHANGED
@@ -53,4 +53,14 @@ require 'webmock/http_lib_adapters/manticore_adapter'
53
53
 
54
54
  require 'webmock/webmock'
55
55
 
56
+ if RUBY_VERSION <= "1.8.7" && Addressable::VERSION::STRING >= "2.4.0"
57
+ raise StandardError,
58
+ <<-ERR
59
+ \n\e[31m
60
+ Addressable dropped support for Ruby 1.8.7 on version 2.4.0,
56
61
 
62
+ please add the following to your Gemfile to be able to use WebMock:
63
+
64
+ gem 'addressable', '< 2.4.0'\e[0m\n
65
+ ERR
66
+ end
data/lib/webmock/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module WebMock
2
- VERSION = '1.22.5' unless defined?(::WebMock::VERSION)
2
+ VERSION = '1.22.6' unless defined?(::WebMock::VERSION)
3
3
  end
data/webmock.gemspec CHANGED
@@ -16,10 +16,9 @@ Gem::Specification.new do |s|
16
16
  s.rubyforge_project = 'webmock'
17
17
 
18
18
  patron_version = (RUBY_VERSION <= '1.8.7') ? '0.4.18' : '>= 0.4.18'
19
- addressable_version = (RUBY_VERSION) > '1.8.7' ? '>= 2.3.6' : '< 2.4.0'
20
19
  manticore_version = (RUBY_VERSION) > '1.8.7' ? '>= 0.5.1' : '<= 0.5.1'
21
20
 
22
- s.add_dependency 'addressable', addressable_version
21
+ s.add_dependency 'addressable', '>= 2.3.6'
23
22
  s.add_dependency 'crack', '>=0.3.2'
24
23
  s.add_dependency 'hashdiff'
25
24
 
@@ -36,6 +35,7 @@ Gem::Specification.new do |s|
36
35
  s.add_development_dependency 'minitest', '~> 5.0.0'
37
36
  s.add_development_dependency 'rdoc', ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
38
37
  s.add_development_dependency 'rack'
38
+ s.add_development_dependency "appraisal", "~> 2.0"
39
39
 
40
40
  s.files = `git ls-files`.split("\n")
41
41
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: webmock
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.22.5
4
+ version: 1.22.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bartosz Blimke
@@ -9,147 +9,157 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2016-01-05 00:00:00 Z
12
+ date: 2016-01-10 00:00:00 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
- version_requirements: &id001 !ruby/object:Gem::Requirement
16
- requirements:
17
- - - <
18
- - !ruby/object:Gem::Version
19
- version: 2.4.0
20
15
  name: addressable
21
16
  prerelease: false
22
- requirement: *id001
17
+ requirement: &id001 !ruby/object:Gem::Requirement
18
+ requirements:
19
+ - - ">="
20
+ - !ruby/object:Gem::Version
21
+ version: 2.3.6
23
22
  type: :runtime
23
+ version_requirements: *id001
24
24
  - !ruby/object:Gem::Dependency
25
- version_requirements: &id002 !ruby/object:Gem::Requirement
25
+ name: crack
26
+ prerelease: false
27
+ requirement: &id002 !ruby/object:Gem::Requirement
26
28
  requirements:
27
29
  - - ">="
28
30
  - !ruby/object:Gem::Version
29
31
  version: 0.3.2
30
- name: crack
31
- prerelease: false
32
- requirement: *id002
33
32
  type: :runtime
33
+ version_requirements: *id002
34
34
  - !ruby/object:Gem::Dependency
35
- version_requirements: &id003 !ruby/object:Gem::Requirement
35
+ name: hashdiff
36
+ prerelease: false
37
+ requirement: &id003 !ruby/object:Gem::Requirement
36
38
  requirements:
37
39
  - &id014
38
40
  - ">="
39
41
  - !ruby/object:Gem::Version
40
42
  version: "0"
41
- name: hashdiff
42
- prerelease: false
43
- requirement: *id003
44
43
  type: :runtime
44
+ version_requirements: *id003
45
45
  - !ruby/object:Gem::Dependency
46
- version_requirements: &id004 !ruby/object:Gem::Requirement
46
+ name: rspec
47
+ prerelease: false
48
+ requirement: &id004 !ruby/object:Gem::Requirement
47
49
  requirements:
48
50
  - - ">="
49
51
  - !ruby/object:Gem::Version
50
52
  version: 3.1.0
51
- name: rspec
52
- prerelease: false
53
- requirement: *id004
54
53
  type: :development
54
+ version_requirements: *id004
55
55
  - !ruby/object:Gem::Dependency
56
- version_requirements: &id005 !ruby/object:Gem::Requirement
56
+ name: httpclient
57
+ prerelease: false
58
+ requirement: &id005 !ruby/object:Gem::Requirement
57
59
  requirements:
58
60
  - - ">="
59
61
  - !ruby/object:Gem::Version
60
62
  version: 2.2.4
61
- name: httpclient
62
- prerelease: false
63
- requirement: *id005
64
63
  type: :development
64
+ version_requirements: *id005
65
65
  - !ruby/object:Gem::Dependency
66
- version_requirements: &id006 !ruby/object:Gem::Requirement
66
+ name: patron
67
+ prerelease: false
68
+ requirement: &id006 !ruby/object:Gem::Requirement
67
69
  requirements:
68
70
  - - "="
69
71
  - !ruby/object:Gem::Version
70
72
  version: 0.4.18
71
- name: patron
72
- prerelease: false
73
- requirement: *id006
74
73
  type: :development
74
+ version_requirements: *id006
75
75
  - !ruby/object:Gem::Dependency
76
- version_requirements: &id007 !ruby/object:Gem::Requirement
76
+ name: em-http-request
77
+ prerelease: false
78
+ requirement: &id007 !ruby/object:Gem::Requirement
77
79
  requirements:
78
80
  - - ">="
79
81
  - !ruby/object:Gem::Version
80
82
  version: 1.0.2
81
- name: em-http-request
82
- prerelease: false
83
- requirement: *id007
84
83
  type: :development
84
+ version_requirements: *id007
85
85
  - !ruby/object:Gem::Dependency
86
- version_requirements: &id008 !ruby/object:Gem::Requirement
86
+ name: http
87
+ prerelease: false
88
+ requirement: &id008 !ruby/object:Gem::Requirement
87
89
  requirements:
88
90
  - - "="
89
91
  - !ruby/object:Gem::Version
90
92
  version: 0.7.3
91
- name: http
92
- prerelease: false
93
- requirement: *id008
94
93
  type: :development
94
+ version_requirements: *id008
95
95
  - !ruby/object:Gem::Dependency
96
- version_requirements: &id009 !ruby/object:Gem::Requirement
96
+ name: curb
97
+ prerelease: false
98
+ requirement: &id009 !ruby/object:Gem::Requirement
97
99
  requirements:
98
100
  - - <=
99
101
  - !ruby/object:Gem::Version
100
102
  version: 0.8.6
101
- name: curb
102
- prerelease: false
103
- requirement: *id009
104
103
  type: :development
104
+ version_requirements: *id009
105
105
  - !ruby/object:Gem::Dependency
106
- version_requirements: &id010 !ruby/object:Gem::Requirement
106
+ name: typhoeus
107
+ prerelease: false
108
+ requirement: &id010 !ruby/object:Gem::Requirement
107
109
  requirements:
108
110
  - - ">="
109
111
  - !ruby/object:Gem::Version
110
112
  version: 0.5.0
111
- name: typhoeus
112
- prerelease: false
113
- requirement: *id010
114
113
  type: :development
114
+ version_requirements: *id010
115
115
  - !ruby/object:Gem::Dependency
116
- version_requirements: &id011 !ruby/object:Gem::Requirement
116
+ name: excon
117
+ prerelease: false
118
+ requirement: &id011 !ruby/object:Gem::Requirement
117
119
  requirements:
118
120
  - - ">="
119
121
  - !ruby/object:Gem::Version
120
122
  version: 0.27.5
121
- name: excon
122
- prerelease: false
123
- requirement: *id011
124
123
  type: :development
124
+ version_requirements: *id011
125
125
  - !ruby/object:Gem::Dependency
126
- version_requirements: &id012 !ruby/object:Gem::Requirement
126
+ name: minitest
127
+ prerelease: false
128
+ requirement: &id012 !ruby/object:Gem::Requirement
127
129
  requirements:
128
130
  - - ~>
129
131
  - !ruby/object:Gem::Version
130
132
  version: 5.0.0
131
- name: minitest
132
- prerelease: false
133
- requirement: *id012
134
133
  type: :development
134
+ version_requirements: *id012
135
135
  - !ruby/object:Gem::Dependency
136
- version_requirements: &id013 !ruby/object:Gem::Requirement
136
+ name: rdoc
137
+ prerelease: false
138
+ requirement: &id013 !ruby/object:Gem::Requirement
137
139
  requirements:
138
140
  - - ">"
139
141
  - !ruby/object:Gem::Version
140
142
  version: 3.5.0
141
- name: rdoc
142
- prerelease: false
143
- requirement: *id013
144
143
  type: :development
144
+ version_requirements: *id013
145
145
  - !ruby/object:Gem::Dependency
146
- version_requirements: &id015 !ruby/object:Gem::Requirement
146
+ name: rack
147
+ prerelease: false
148
+ requirement: &id015 !ruby/object:Gem::Requirement
147
149
  requirements:
148
150
  - *id014
149
- name: rack
151
+ type: :development
152
+ version_requirements: *id015
153
+ - !ruby/object:Gem::Dependency
154
+ name: appraisal
150
155
  prerelease: false
151
- requirement: *id015
156
+ requirement: &id016 !ruby/object:Gem::Requirement
157
+ requirements:
158
+ - - ~>
159
+ - !ruby/object:Gem::Version
160
+ version: "2.0"
152
161
  type: :development
162
+ version_requirements: *id016
153
163
  description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
154
164
  email:
155
165
  - bartosz.blimke@gmail.com
@@ -164,11 +174,13 @@ files:
164
174
  - .gitignore
165
175
  - .rspec-tm
166
176
  - .travis.yml
177
+ - Appraisals
167
178
  - CHANGELOG.md
168
179
  - Gemfile
169
180
  - LICENSE
170
181
  - README.md
171
182
  - Rakefile
183
+ - gemfiles/ruby_1_8.gemfile
172
184
  - lib/webmock.rb
173
185
  - lib/webmock/api.rb
174
186
  - lib/webmock/assertion_failure.rb