Skip to content
Browse files

Merge remote-tracking branch 'rlipman/1.9-compatibility'

Conflicts:
	Rakefile
	statsd-ruby.gemspec
  • Loading branch information...
2 parents 72af3af + 36e5340 commit f58a8ae814daea869629313e494e2bebfae2a620 @jeremy committed
Showing with 9 additions and 1 deletion.
  1. +1 −1 .gitignore
  2. +1 −0 Rakefile
  3. +4 −0 spec/helper.rb
  4. +3 −0 statsd-ruby.gemspec
View
2 .gitignore
@@ -1,4 +1,4 @@
-# rcov generated
+# simplecov generated
coverage
# rdoc generated
View
1 Rakefile
@@ -16,6 +16,7 @@ Jeweler::Tasks.new do |gem|
gem.add_development_dependency "minitest", ">= 0"
gem.add_development_dependency "yard", "~> 0.6.0"
gem.add_development_dependency "jeweler", "~> 1.8"
+ gem.add_development_dependency "simplecov", ">= 0"
end
Jeweler::RubygemsDotOrgTasks.new
View
4 spec/helper.rb
@@ -4,6 +4,10 @@
$LOAD_PATH.unshift(File.dirname(__FILE__))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'simplecov'
+SimpleCov.start
+
require 'statsd'
require 'logger'
View
3 statsd-ruby.gemspec
@@ -40,15 +40,18 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<minitest>, [">= 0"])
s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
+ s.add_development_dependency(%q<simplecov>, [">= 0"])
else
s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<yard>, ["~> 0.6.0"])
s.add_dependency(%q<jeweler>, ["~> 1.8"])
+ s.add_dependency(%q<simplecov>, [">= 0"])
end
else
s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<yard>, ["~> 0.6.0"])
s.add_dependency(%q<jeweler>, ["~> 1.8"])
+ s.add_dependency(%q<simplecov>, [">= 0"])
end
end

0 comments on commit f58a8ae

Please sign in to comment.
Something went wrong with that request. Please try again.