rr in rubyretriever-0.1.0

- old
+ new

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
-require_relative('../lib/retriever.rb')
+require 'retriever'
 options = {}
  optparse = OptionParser.new do|opts|
    # Set a banner, displayed at the top
    # of the help screen.
    opts.banner = "Usage: rr [options] Target_URL"
@@ -20,31 +20,26 @@
    opts.on( '-p', '--progressbar', 'Output more information' ) do
      options[:progress] = true
    end
  
   options[:sitemap] = false
-   opts.on( '-s', '--sitemap', 'Crawl site and output sitemap' ) do
-     options[:sitemap] = true
+   opts.on( '-s', '--sitemap FORMAT', 'Crawl site and output sitemap' ) do |output_type|
+     options[:sitemap] = output_type
    end
  
   options[:fileharvest] = false
-   opts.on( '-f', '--files', 'Crawl site and collect links for files found' ) do
-     options[:fileharvest] = true
+   opts.on( '-f', '--files FILETYPE', 'Crawl site and collect links for files found' ) do |file_ext|
+     options[:fileharvest] = file_ext
    end
 
   options[:maxpages] = false
    opts.on( '-l', '--limit PAGE_LIMIT_#', 'set a max on the total number of crawled pages' ) do |maxpages|
      options[:maxpages] = maxpages
    end
 
-  options[:file_ext] = false
-   opts.on( '-e', '--ext FILE_EXTENSION', 'set a file extension to look for on crawled pages' ) do |file_ext|
-     options[:file_ext] = file_ext
-   end
-
    options[:autodown] = false
-   opts.on( '-a', '--autodown', 'Automatically download all files of filetype located' ) do
+   opts.on( '-a', '--auto', 'Automatically download all files of filetype located' ) do
      options[:autodown] = true
    end
  
    # This displays the help screen, all programs are
    # assumed to have this option.
@@ -62,11 +57,12 @@
 ARGV.each do|q|
   if options[:verbose]
     puts "###############################"
     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[:file_ext]} pages" if (options[:file_ext])
+    puts "### Searching for file extension: #{options[:fileharvest]} pages" if (options[:fileharvest])
     puts "### Writting output to filename: #{options[:filename]}" if options[:filename]
     puts "### Being verbose"
     puts "### Stopping after #{options[:maxpages]} pages" if options[:maxpages]
   end
   puts "###############################"
\ No newline at end of file