Permalink
Browse files

Merge branch 'master' of github.com:nicksieger/ci_reporter

Conflicts:
	Rakefile
	ci_reporter.gemspec
  • Loading branch information...
nicksieger committed Dec 6, 2011
2 parents 604dad4 + af8674c commit 64d64dadc04d4259528ddce5672983192cdfc9d2
Showing with 4 additions and 1 deletion.
  1. +1 −1 Rakefile
  2. +3 −0 ci_reporter.gemspec
View
@@ -13,11 +13,11 @@ begin
p.url = "http://caldersphere.rubyforge.org/ci_reporter"
p.author = "Nick Sieger"
p.email = "nick@nicksieger.com"
+ p.readme_file = 'README.rdoc'
p.summary = "CI::Reporter allows you to generate reams of XML for use with continuous integration systems."
p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
p.description = p.paragraphs_of('README.rdoc', 0...1).join("\n\n")
p.extra_rdoc_files += ["README.rdoc"]
- p.extra_deps.reject!{|d| d.first == "hoe"}
p.test_globs = ["spec/**/*_spec.rb"]
p.extra_deps << ['builder', ">= 2.1.2"]
end
View
@@ -26,14 +26,17 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_development_dependency(%q<hoe>, ["~> 2.12"])
+ s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
else
s.add_dependency(%q<builder>, [">= 2.1.2"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, ["~> 2.12"])
+ s.add_dependency(%q<rdoc>, ["~> 3.10"])
end
else
s.add_dependency(%q<builder>, [">= 2.1.2"])
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<hoe>, ["~> 2.12"])
+ s.add_dependency(%q<rdoc>, ["~> 3.10"])
end
end

0 comments on commit 64d64da

Please sign in to comment.