From 1ce02b4f8e0d2481672a3f8da656172275e735f4 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Sat, 28 May 2011 11:40:08 -0700
Subject: always have the spec:deps task available

---
 Rakefile | 69 ++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 32 insertions(+), 37 deletions(-)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index 2aa6b2bf..be547e4c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,9 +2,18 @@
 $:.unshift File.expand_path("../lib", __FILE__)
 require 'bundler/gem_tasks'
 
+namespace :spec do
+  desc "Ensure spec dependencies are installed"
+  task :deps do
+    sh "gem list ronn | (grep 'ronn' 1> /dev/null) || gem install ronn --no-ri --no-rdoc"
+    sh "gem list rspec | (grep 'rspec (2.0' 1> /dev/null) || gem install rspec --no-ri --no-rdoc"
+  end
+end
+
 begin
-  # set up rspec tasks
+  # running the specs needs both rspec and ronn
   require 'rspec/core/rake_task'
+  require 'ronn'
 
   desc "Run specs"
   RSpec::Core::RakeTask.new do |t|
@@ -13,29 +22,6 @@ begin
   end
   task :spec => "man:build"
 
-  begin
-    require 'ci/reporter/rake/rspec'
-
-    namespace :ci do
-      desc "Run specs with Hudson output"
-      RSpec::Core::RakeTask.new(:spec)
-      task :spec => ["ci:setup:rspec", "man:build"]
-    end
-
-  rescue LoadError
-    namespace :ci do
-      task :spec do
-        abort "Run `rake ci:deps` to be able to run the CI specs"
-      end
-
-      desc "Install CI dependencies"
-      task :deps do
-        sh "gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || gem install ci_reporter --no-ri --no-rdoc"
-      end
-      task :deps => "spec:deps"
-    end
-  end
-
   namespace :spec do
     task :clean do
       rm_rf 'tmp'
@@ -130,10 +116,6 @@ begin
 
   end
 
-
-  # set up man tasks that use ronn
-  require 'ronn'
-
   namespace :man do
     directory "lib/bundler/man"
 
@@ -161,20 +143,33 @@ begin
     end
   end
 
+  begin
+    require 'ci/reporter/rake/rspec'
 
-rescue LoadError
-  task :spec do
-    abort "Run `rake spec:deps` to be able to run the specs"
-  end
+    namespace :ci do
+      desc "Run specs with Hudson output"
+      RSpec::Core::RakeTask.new(:spec)
+      task :spec => ["ci:setup:rspec", "man:build"]
+    end
 
-  namespace :spec do
-    desc "Ensure spec dependencies are installed"
-    task :deps do
-      sh "gem list ronn | (grep 'ronn' 1> /dev/null) || gem install ronn --no-ri --no-rdoc"
-      sh "gem list rspec | (grep 'rspec (2.0' 1> /dev/null) || gem install rspec --no-ri --no-rdoc"
+  rescue LoadError
+    namespace :ci do
+      task :spec do
+        abort "Run `rake ci:deps` to be able to run the CI specs"
+      end
+
+      desc "Install CI dependencies"
+      task :deps do
+        sh "gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || gem install ci_reporter --no-ri --no-rdoc"
+      end
+      task :deps => "spec:deps"
     end
   end
 
+rescue LoadError
+  task :spec do
+    abort "Run `rake spec:deps` to be able to run the specs"
+  end
 end
 
 namespace :vendor do
-- 
cgit v1.2.3