Skip to content

Commit d28112a

Browse files
committed
Merge pull request #301 from pitr-ch/master
Make simplecov and coveralls optional
2 parents e1d24b4 + ede0cc4 commit d28112a

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ end
1818

1919
group :testing do
2020
gem 'rspec', '~> 3.2.0'
21+
gem 'timecop', '~> 0.7.3'
22+
end
23+
24+
group :coverage do
2125
gem 'simplecov', '~> 0.10.0', :require => false
2226
gem 'coveralls', '~> 0.8.1', :require => false
23-
gem 'timecop', '~> 0.7.3'
2427
end

spec/spec_helper.rb

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
1-
require 'simplecov'
2-
require 'coveralls'
3-
4-
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
5-
SimpleCov::Formatter::HTMLFormatter,
6-
Coveralls::SimpleCov::Formatter
7-
]
8-
9-
SimpleCov.start do
10-
project_name 'concurrent-ruby'
11-
add_filter '/build-tests/'
12-
add_filter '/coverage/'
13-
add_filter '/doc/'
14-
add_filter '/examples/'
15-
add_filter '/pkg/'
16-
add_filter '/spec/'
17-
add_filter '/tasks/'
18-
add_filter '/yard-template/'
19-
add_filter '/yardoc/'
1+
begin
2+
require 'simplecov'
3+
require 'coveralls'
4+
5+
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
6+
SimpleCov::Formatter::HTMLFormatter,
7+
Coveralls::SimpleCov::Formatter
8+
]
9+
10+
SimpleCov.start do
11+
project_name 'concurrent-ruby'
12+
add_filter '/build-tests/'
13+
add_filter '/coverage/'
14+
add_filter '/doc/'
15+
add_filter '/examples/'
16+
add_filter '/pkg/'
17+
add_filter '/spec/'
18+
add_filter '/tasks/'
19+
add_filter '/yard-template/'
20+
add_filter '/yardoc/'
21+
end
22+
rescue LoadError
2023
end
2124

2225
$VERBOSE = nil # suppress our deprecation warnings
2326
require 'concurrent'
2427
require 'concurrent-edge'
2528

26-
logger = Logger.new($stderr)
27-
logger.level = Logger::WARN
29+
logger = Logger.new($stderr)
30+
logger.level = Logger::WARN
2831
Concurrent.global_logger = lambda do |level, progname, message = nil, &block|
2932
logger.add level, message, progname, &block
3033
end

0 commit comments

Comments
 (0)