Skip to content

Commit

Permalink
No need to install doc-related gems when running tests.
Browse files Browse the repository at this point in the history
This should speed up the build time.
  • Loading branch information
floehopper committed Sep 5, 2012
1 parent 5b9c961 commit 7784760
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 21 deletions.
33 changes: 18 additions & 15 deletions Rakefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ require "bundler"
Bundler::GemHelper.install_tasks Bundler::GemHelper.install_tasks
require "bundler/setup" require "bundler/setup"


require 'yard'
require 'rake/testtask' require 'rake/testtask'


desc "Run all tests" desc "Run all tests"
Expand Down Expand Up @@ -106,23 +105,27 @@ def benchmark_test_case(klass, iterations)
end end
end end


desc 'Remove generated documentation' unless ENV["MOCHA_NO_DOCS"]
task 'clobber_yardoc' do require 'yard'
`rm -rf ./doc`
end


desc 'Generate documentation' desc 'Remove generated documentation'
YARD::Rake::YardocTask.new('yardoc') do |task| task 'clobber_yardoc' do
task.options = ["--title", "Mocha #{Mocha::VERSION}"] `rm -rf ./doc`
end end


desc "Generate documentation" desc 'Generate documentation'
task 'generate_docs' => ['clobber_yardoc', 'yardoc'] YARD::Rake::YardocTask.new('yardoc') do |task|
task.options = ["--title", "Mocha #{Mocha::VERSION}"]
end

desc "Generate documentation"
task 'generate_docs' => ['clobber_yardoc', 'yardoc']


desc "Publish docs to gofreerange.com/docs/mocha" desc "Publish docs to gofreerange.com/docs/mocha"
task 'publish_docs' => 'generate_docs' do task 'publish_docs' => 'generate_docs' do
path = "/home/freerange/docs/mocha" path = "/home/freerange/docs/mocha"
system %{ssh gofreerange.com "sudo rm -fr #{path} && mkdir -p #{path}" && scp -r doc/* gofreerange.com:#{path}} system %{ssh gofreerange.com "sudo rm -fr #{path} && mkdir -p #{path}" && scp -r doc/* gofreerange.com:#{path}}
end
end end


task 'release' => 'default' do task 'release' => 'default' do
Expand Down
1 change: 1 addition & 0 deletions build-matrix.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def with_rbenv(command)
def run(gemfile, task = "test") def run(gemfile, task = "test")
ENV["BUNDLE_GEMFILE"] = gemfile ENV["BUNDLE_GEMFILE"] = gemfile
ENV["MOCHA_OPTIONS"] = "debug" ENV["MOCHA_OPTIONS"] = "debug"
ENV["MOCHA_NO_DOCS"] = "true"
reset_bundle reset_bundle
execute( execute(
with_rbenv("bundle install --gemfile=#{gemfile}"), with_rbenv("bundle install --gemfile=#{gemfile}"),
Expand Down
18 changes: 12 additions & 6 deletions mocha.gemspec
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -30,18 +30,24 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency("rake", ">= 0") s.add_development_dependency("rake", ">= 0")
s.add_development_dependency("introspection", "~> 0.0.1") s.add_development_dependency("introspection", "~> 0.0.1")
s.add_development_dependency("yard") unless ENV["MOCHA_NO_DOCS"]
s.add_development_dependency("redcarpet", "~> 1") s.add_development_dependency("yard")
s.add_development_dependency("redcarpet", "~> 1")
end
else else
s.add_dependency("rake", ">= 0") s.add_dependency("rake", ">= 0")
s.add_dependency("introspection", "~> 0.0.1") s.add_dependency("introspection", "~> 0.0.1")
s.add_dependency("yard") unless ENV["MOCHA_NO_DOCS"]
s.add_dependency("redcarpet", "~> 1") s.add_dependency("yard")
s.add_dependency("redcarpet", "~> 1")
end
end end
else else
s.add_dependency("rake", ">= 0") s.add_dependency("rake", ">= 0")
s.add_dependency("introspection", "~> 0.0.1") s.add_dependency("introspection", "~> 0.0.1")
s.add_dependency("yard") unless ENV["MOCHA_NO_DOCS"]
s.add_dependency("redcarpet", "~> 1") s.add_dependency("yard")
s.add_dependency("redcarpet", "~> 1")
end
end end
end end

0 comments on commit 7784760

Please sign in to comment.