Skip to content

Commit 0d3ee8d

Browse files
committed
Update dependencies and fix warnings for Ruby 2.3.0
Using an older jeweler depended on a version of nokogiri that would not build for me; updating fixed that. I was getting runtime warnings from shoulda and mocha; updating them and changing the requirement fixed that.
1 parent 6eca5a3 commit 0d3ee8d

File tree

5 files changed

+69
-52
lines changed

5 files changed

+69
-52
lines changed

.travis.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
rvm:
2-
- 1.9.2
3-
- 1.9.3
4-
- 2.0.0
5-
- 2.1.0
6-
- 2.2.0
2+
- 2.1.8
3+
- 2.2.4
74
- 2.3.0
8-
- jruby-19mode
5+
- jruby-9.0.5.0

Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
source "https://rubygems.org"
22

33
group :development do
4-
gem "shoulda", "~> 2.11.3"
5-
gem "jeweler", "~> 1.8.7"
6-
gem "mocha", "~> 0.14.0"
4+
gem "shoulda", "~> 3.5.0"
5+
gem "jeweler", "~> 2.0.1"
6+
gem "mocha", "~> 1.1.0"
77
gem "test-unit", "~> 3.0.8"
88
end

Gemfile.lock

+59-39
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,81 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.3.5)
4+
activesupport (4.2.6)
5+
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
addressable (2.4.0)
511
builder (3.2.2)
6-
faraday (0.8.8)
7-
multipart-post (~> 1.2.0)
8-
git (1.2.6)
9-
github_api (0.10.1)
10-
addressable
11-
faraday (~> 0.8.1)
12-
hashie (>= 1.2)
13-
multi_json (~> 1.4)
14-
nokogiri (~> 1.5.2)
12+
descendants_tracker (0.0.4)
13+
thread_safe (~> 0.3, >= 0.3.1)
14+
faraday (0.9.2)
15+
multipart-post (>= 1.2, < 3)
16+
git (1.3.0)
17+
github_api (0.13.1)
18+
addressable (~> 2.4.0)
19+
descendants_tracker (~> 0.0.4)
20+
faraday (~> 0.8, < 0.10)
21+
hashie (>= 3.4)
22+
multi_json (>= 1.7.5, < 2.0)
1523
oauth2
16-
hashie (2.0.5)
17-
highline (1.6.19)
18-
httpauth (0.2.0)
19-
jeweler (1.8.7)
24+
hashie (3.4.3)
25+
highline (1.7.8)
26+
i18n (0.7.0)
27+
jeweler (2.0.1)
2028
builder
21-
bundler (~> 1.0)
29+
bundler (>= 1.0)
2230
git (>= 1.2.5)
23-
github_api (= 0.10.1)
31+
github_api
2432
highline (>= 1.6.15)
25-
nokogiri (= 1.5.10)
33+
nokogiri (>= 1.5.10)
2634
rake
2735
rdoc
28-
json (1.8.2)
29-
jwt (0.1.8)
30-
multi_json (>= 1.5)
31-
metaclass (0.0.1)
32-
mocha (0.14.0)
36+
json (1.8.3)
37+
jwt (1.5.1)
38+
metaclass (0.0.4)
39+
mini_portile2 (2.0.0)
40+
minitest (5.8.4)
41+
mocha (1.1.0)
3342
metaclass (~> 0.0.1)
34-
multi_json (1.7.9)
43+
multi_json (1.11.2)
3544
multi_xml (0.5.5)
36-
multipart-post (1.2.0)
37-
nokogiri (1.5.10)
38-
oauth2 (0.9.2)
39-
faraday (~> 0.8)
40-
httpauth (~> 0.2)
41-
jwt (~> 0.1.4)
42-
multi_json (~> 1.0)
45+
multipart-post (2.0.0)
46+
nokogiri (1.6.7.2)
47+
mini_portile2 (~> 2.0.0.rc2)
48+
oauth2 (1.1.0)
49+
faraday (>= 0.8, < 0.10)
50+
jwt (~> 1.0, < 1.5.2)
51+
multi_json (~> 1.3)
4352
multi_xml (~> 0.5)
44-
rack (~> 1.2)
45-
power_assert (0.2.3)
46-
rack (1.5.2)
47-
rake (10.1.0)
48-
rdoc (4.0.1)
53+
rack (>= 1.2, < 3)
54+
power_assert (0.2.7)
55+
rack (1.6.4)
56+
rake (11.1.1)
57+
rdoc (4.2.2)
4958
json (~> 1.4)
50-
shoulda (2.11.3)
59+
shoulda (3.5.0)
60+
shoulda-context (~> 1.0, >= 1.0.1)
61+
shoulda-matchers (>= 1.4.1, < 3.0)
62+
shoulda-context (1.2.1)
63+
shoulda-matchers (2.8.0)
64+
activesupport (>= 3.0.0)
5165
test-unit (3.0.9)
5266
power_assert
67+
thread_safe (0.3.5)
68+
tzinfo (1.2.2)
69+
thread_safe (~> 0.1)
5370

5471
PLATFORMS
5572
ruby
5673

5774
DEPENDENCIES
58-
jeweler (~> 1.8.7)
59-
mocha (~> 0.14.0)
60-
shoulda (~> 2.11.3)
75+
jeweler (~> 2.0.1)
76+
mocha (~> 1.1.0)
77+
shoulda (~> 3.5.0)
6178
test-unit (~> 3.0.8)
79+
80+
BUNDLED WITH
81+
1.11.2

test/helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'rubygems'
22
require 'test/unit'
33
require 'shoulda'
4-
require 'mocha'
4+
require 'mocha/setup'
55

66
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
77
$LOAD_PATH.unshift(File.dirname(__FILE__))

test/test_notifier.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ class TestNotifier < Test::Unit::TestCase
5252
e.set_backtrace(caller)
5353
hash = @notifier.__send__(:extract_hash, e)
5454
assert_equal 'RuntimeError: message', hash['short_message']
55-
assert_match /Backtrace/, hash['full_message']
55+
assert_match(/Backtrace/, hash['full_message'])
5656
assert_equal GELF::ERROR, hash['level']
5757
end
5858

5959
should "work with exception without backtrace" do
6060
e = RuntimeError.new('message')
6161
hash = @notifier.__send__(:extract_hash, e)
62-
assert_match /Backtrace is not available/, hash['full_message']
62+
assert_match(/Backtrace is not available/, hash['full_message'])
6363
end
6464

6565
should "work with exception and hash" do
@@ -108,7 +108,7 @@ class TestNotifier < Test::Unit::TestCase
108108
should "set file and line" do
109109
line = __LINE__
110110
hash = @notifier.__send__(:extract_hash, { 'version' => '1.0', 'short_message' => 'message' })
111-
assert_match /test_notifier.rb/, hash['file']
111+
assert_match(/test_notifier.rb/, hash['file'])
112112
assert_equal line + 1, hash['line']
113113
end
114114

0 commit comments

Comments
 (0)