rr in rubyretriever-1.0.0

- old
+ new

@@ -1,21 +1,27 @@
 #! /usr/bin/env ruby
+
 require 'retriever'
 require 'optparse'
+
 options = {}
  optparse = OptionParser.new do|opts|
    # Set a banner, displayed at the top
    # of the help screen.
    opts.banner = "Usage: rr [MODE FLAG] [options] Target_URL"
   options[:sitemap] = false
-   opts.on( '-s', '--sitemap FORMAT', 'MODE FLAG: Sitemap mode - Crawl site and output sitemap, format choices: CSV or XML' ) do |output_type|
-     options[:sitemap] = output_type
+   opts.on( '-s', '--sitemap [FORMAT]', 'MODE FLAG: Sitemap mode' ) do |output_type|
+     options[:sitemap] = output_type||''
    end
   options[:fileharvest] = false
-   opts.on( '-f', '--files FILETYPE', 'MODE FLAG: Fileharvest mode - Crawl site and collect links for files found, extension for filetype' ) do |file_ext|
+   opts.on( '-f', '--files FILETYPE', 'MODE FLAG: Fileharvest mode' ) do |file_ext|
      options[:fileharvest] = file_ext
    end
+   options[:seo] = false
+   opts.on( '-e', '--seo', 'MODE FLAG: SEO mode' ) do
+     options[:seo] = true
+   end
     options[:filename] = nil
    opts.on( '-o', '--out FILENAME', 'Dump output to selected filename' ) do|filename|
      options[:filename] = filename
    end
    # Define the options, and what they do
@@ -54,17 +60,17 @@
     puts "### [RubyRetriever]"
     puts "### Creating Sitemap" if options[:sitemap]
     puts "### Outputting in format: #{options[:sitemap]}" if options[:sitemap]
     puts "### Performing File Harvest" if options[:fileharvest]
     puts "### Searching for file extension: #{options[:fileharvest]} pages" if (options[:fileharvest])
+    puts "### Performing SEO Scrape" if options[:seo]   
     puts "### Writting output to filename: #{options[:filename]}" if options[:filename]
     puts "### Being verbose"
-    puts "### Stopping after #{options[:maxpages]} pages" if options[:maxpages]
+    puts "### Stopping after #{options[:maxpages]} pages"
   end
   puts "###############################"
   puts "### [RubyRetriever] go fetch #{q}"
-  Retriever::FetchFiles.new(q, options) if options[:fileharvest]
-  Retriever::FetchSitemap.new(q, options) if options[:sitemap]
+  Retriever::CLI.new(q, options)
   puts "### [RubyRetriever] is done."
   puts "###############################"
   puts
 end
\ No newline at end of file