lib/nanoc3/tasks/validate.rake in nanoc3-3.1.0a2 vs lib/nanoc3/tasks/validate.rake in nanoc3-3.1.0a3

@@ -2,34 +2,91 @@
 
 namespace :validate do
 
   desc 'Validate the site\'s HTML files'
   task :html do
-    # Load site
+    # Get output directory
     site = Nanoc3::Site.new('.')
     if site.nil?
       $stderr.puts 'The current working directory does not seem to be a ' +
                    'valid/complete nanoc site directory; aborting.'
       exit 1
     end
+    dir = site.config[:output_dir]
 
     # Validate
-    validator = ::Nanoc3::Extra::Validators::W3C.new(site, :html)
+    validator = ::Nanoc3::Extra::Validators::W3C.new(dir, [ :html ])
     validator.run
   end
 
   desc 'Validate the site\'s CSS files'
   task :css do
-    # Load site
-    site = Nanoc3::Site.new(YAML.load_file(File.join(Dir.getwd, 'config.yaml')))
+    # Get output directory
+    site = Nanoc3::Site.new('.')
     if site.nil?
       $stderr.puts 'The current working directory does not seem to be a ' +
                    'valid/complete nanoc site directory; aborting.'
       exit 1
     end
+    dir = site.config[:output_dir]
 
     # Validate
-    validator = ::Nanoc3::Extra::Validators::W3C.new(site, :css)
+    validator = ::Nanoc3::Extra::Validators::W3C.new(dir, [ :css ])
+    validator.run
+  end
+
+  namespace :links do
+
+    desc 'Validate the site’s internal links'
+    task :internal do
+      # Get output directory
+      site = Nanoc3::Site.new('.')
+      if site.nil?
+        $stderr.puts 'The current working directory does not seem to be a ' +
+                     'valid/complete nanoc site directory; aborting.'
+        exit 1
+      end
+      dir             = site.config[:output_dir]
+      index_filenames = site.config[:index_filenames]
+
+      # Validate
+      validator = ::Nanoc3::Extra::Validators::Links.new(dir, index_filenames, :internal => true)
+      validator.run
+    end
+
+    desc 'Validate the site’s internal links'
+    task :external do
+      # Get output directory
+      site = Nanoc3::Site.new('.')
+      if site.nil?
+        $stderr.puts 'The current working directory does not seem to be a ' +
+                     'valid/complete nanoc site directory; aborting.'
+        exit 1
+      end
+      dir             = site.config[:output_dir]
+      index_filenames = site.config[:index_filenames]
+
+      # Validate
+      validator = ::Nanoc3::Extra::Validators::Links.new(dir, index_filenames, :external => true)
+      validator.run
+    end
+
+  end
+
+  desc 'Validate the site’s internal and external links'
+  task :links do
+    # Get output directory
+    site = Nanoc3::Site.new('.')
+    if site.nil?
+      $stderr.puts 'The current working directory does not seem to be a ' +
+                   'valid/complete nanoc site directory; aborting.'
+      exit 1
+    end
+    dir             = site.config[:output_dir]
+    index_filenames = site.config[:index_filenames]
+
+    # Validate
+    validator = ::Nanoc3::Extra::Validators::Links.new(dir, index_filenames, :internal => true, :external => true)
     validator.run
   end
 
 end