rails 1.0.0 → 1.1.0

data/html/javascripts/prototype.js

@@ -1,17 +1,13 @@
-/*  Prototype JavaScript framework, version 1.4.0
+/*  Prototype JavaScript framework, version 1.5.0_pre1
  *  (c) 2005 Sam Stephenson <sam@conio.net>
  *
- *  THIS FILE IS AUTOMATICALLY GENERATED. When sending patches, please diff
- *  against the source tree, available from the Prototype darcs repository.
- *
  *  Prototype is freely distributable under the terms of an MIT-style license.
- *
  *  For details, see the Prototype web site: http://prototype.conio.net/
  *
 /*--------------------------------------------------------------------------*/
 
 var Prototype = {
-  Version: '1.4.0',
+  Version: '1.5.0_pre1',
   ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
 
   emptyFunction: function() {},
@@ -120,26 +116,49 @@ PeriodicalExecuter.prototype = {
     }
   }
 }
+Object.extend(String.prototype, {
+  gsub: function(pattern, replacement) {
+    var result = '', source = this, match;
+    replacement = arguments.callee.prepareReplacement(replacement);
+
+    while (source.length > 0) {
+      if (match = source.match(pattern)) {
+        result += source.slice(0, match.index);
+        result += (replacement(match) || '').toString();
+        source  = source.slice(match.index + match[0].length);
+      } else {
+        result += source, source = '';
+      }
+    }
+    return result;
+  },
 
-/*--------------------------------------------------------------------------*/
+  sub: function(pattern, replacement, count) {
+    replacement = this.gsub.prepareReplacement(replacement);
+    count = count === undefined ? 1 : count;
 
-function $() {
-  var elements = new Array();
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  },
 
-  for (var i = 0; i < arguments.length; i++) {
-    var element = arguments[i];
-    if (typeof element == 'string')
-      element = document.getElementById(element);
+  scan: function(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return this;
+  },
 
-    if (arguments.length == 1)
-      return element;
+  truncate: function(length, truncation) {
+    length = length || 30;
+    truncation = truncation === undefined ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : this;
+  },
 
-    elements.push(element);
-  }
+  strip: function() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  },
 
-  return elements;
-}
-Object.extend(String.prototype, {
   stripTags: function() {
     return this.replace(/<\/?[^>]+>/gi, '');
   },
@@ -203,12 +222,35 @@ Object.extend(String.prototype, {
   },
 
   inspect: function() {
-    return "'" + this.replace('\\', '\\\\').replace("'", '\\\'') + "'";
+    return "'" + this.replace(/\\/g, '\\\\').replace(/'/g, '\\\'') + "'";
   }
 });
 
+String.prototype.gsub.prepareReplacement = function(replacement) {
+  if (typeof replacement == 'function') return replacement;
+  var template = new Template(replacement);
+  return function(match) { return template.evaluate(match) };
+}
+
 String.prototype.parseQuery = String.prototype.toQueryParams;
 
+var Template = Class.create();
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+Template.prototype = {
+  initialize: function(template, pattern) {
+    this.template = template.toString();
+    this.pattern  = pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    return this.template.gsub(this.pattern, function(match) {
+      var before = match[1];
+      if (before == '\\') return match[2];
+      return before + (object[match[3]] || '').toString();
+    });
+  }
+}
+
 var $break    = new Object();
 var $continue = new Object();
 
@@ -375,8 +417,7 @@ var Enumerable = {
 
     var collections = [this].concat(args).map($A);
     return this.map(function(value, index) {
-      iterator(value = collections.pluck(index));
-      return value;
+      return iterator(collections.pluck(index));
     });
   },
 
@@ -662,7 +703,8 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
   setRequestHeaders: function() {
     var requestHeaders =
       ['X-Requested-With', 'XMLHttpRequest',
-       'X-Prototype-Version', Prototype.Version];
+       'X-Prototype-Version', Prototype.Version,
+       'Accept', 'text/javascript, text/html, application/xml, text/xml, */*'];
 
     if (this.options.method == 'post') {
       requestHeaders.push('Content-type',
@@ -831,22 +873,48 @@ Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
     this.updater = new Ajax.Updater(this.container, this.url, this.options);
   }
 });
+function $() {
+  var results = [], element;
+  for (var i = 0; i < arguments.length; i++) {
+    element = arguments[i];
+    if (typeof element == 'string')
+      element = document.getElementById(element);
+    results.push(Element.extend(element));
+  }
+  return results.length < 2 ? results[0] : results;
+}
+
 document.getElementsByClassName = function(className, parentElement) {
   var children = ($(parentElement) || document.body).getElementsByTagName('*');
   return $A(children).inject([], function(elements, child) {
     if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
-      elements.push(child);
+      elements.push(Element.extend(child));
     return elements;
   });
 }
 
 /*--------------------------------------------------------------------------*/
 
-if (!window.Element) {
+if (!window.Element)
   var Element = new Object();
+
+Element.extend = function(element) {
+  if (!element) return;
+
+  if (!element._extended && element.tagName && element != window) {
+    var methods = Element.Methods;
+    for (property in methods) {
+      var value = methods[property];
+      if (typeof value == 'function')
+        element[property] = value.bind(null, element);
+    }
+  }
+
+  element._extended = true;
+  return element;
 }
 
-Object.extend(Element, {
+Element.Methods = {
   visible: function(element) {
     return $(element).style.display != 'none';
   },
@@ -882,6 +950,19 @@ Object.extend(Element, {
     setTimeout(function() {html.evalScripts()}, 10);
   },
 
+  replace: function(element, html) {
+    element = $(element);
+    if (element.outerHTML) {
+      element.outerHTML = html.stripScripts();
+    } else {
+      var range = element.ownerDocument.createRange();
+      range.selectNodeContents(element);
+      element.parentNode.replaceChild(
+        range.createContextualFragment(html.stripScripts()), element);
+    }
+    setTimeout(function() {html.evalScripts()}, 10);
+  },
+
   getHeight: function(element) {
     element = $(element);
     return element.offsetHeight;
@@ -920,6 +1001,13 @@ Object.extend(Element, {
     return $(element).innerHTML.match(/^\s*$/);
   },
 
+  childOf: function(element, ancestor) {
+    element = $(element), ancestor = $(ancestor);
+    while (element = element.parentNode)
+      if (element == ancestor) return true;
+    return false;
+  },
+
   scrollTo: function(element) {
     element = $(element);
     var x = element.x ? element.x : element.offsetLeft,
@@ -1013,7 +1101,9 @@ Object.extend(Element, {
     element.style.overflow = element._overflow;
     element._overflow = undefined;
   }
-});
+}
+
+Object.extend(Element, Element.Methods);
 
 var Toggle = new Object();
 Toggle.display = Element.toggle;
@@ -1148,6 +1238,116 @@ Element.ClassNames.prototype = {
 }
 
 Object.extend(Element.ClassNames.prototype, Enumerable);
+var Selector = Class.create();
+Selector.prototype = {
+  initialize: function(expression) {
+    this.params = {classNames: []};
+    this.expression = expression.toString().strip();
+    this.parseExpression();
+    this.compileMatcher();
+  },
+
+  parseExpression: function() {
+    function abort(message) { throw 'Parse error in selector: ' + message; }
+
+    if (this.expression == '')  abort('empty expression');
+
+    var params = this.params, expr = this.expression, match, modifier, clause, rest;
+    while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) {
+      params.attributes = params.attributes || [];
+      params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''});
+      expr = match[1];
+    }
+
+    if (expr == '*') return this.params.wildcard = true;
+
+    while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) {
+      modifier = match[1], clause = match[2], rest = match[3];
+      switch (modifier) {
+        case '#':       params.id = clause; break;
+        case '.':       params.classNames.push(clause); break;
+        case '':
+        case undefined: params.tagName = clause.toUpperCase(); break;
+        default:        abort(expr.inspect());
+      }
+      expr = rest;
+    }
+
+    if (expr.length > 0) abort(expr.inspect());
+  },
+
+  buildMatchExpression: function() {
+    var params = this.params, conditions = [], clause;
+
+    if (params.wildcard)
+      conditions.push('true');
+    if (clause = params.id)
+      conditions.push('element.id == ' + clause.inspect());
+    if (clause = params.tagName)
+      conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
+    if ((clause = params.classNames).length > 0)
+      for (var i = 0; i < clause.length; i++)
+        conditions.push('Element.hasClassName(element, ' + clause[i].inspect() + ')');
+    if (clause = params.attributes) {
+      clause.each(function(attribute) {
+        var value = 'element.getAttribute(' + attribute.name.inspect() + ')';
+        var splitValueBy = function(delimiter) {
+          return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
+        }
+
+        switch (attribute.operator) {
+          case '=':       conditions.push(value + ' == ' + attribute.value.inspect()); break;
+          case '~=':      conditions.push(splitValueBy(' ') + '.include(' + attribute.value.inspect() + ')'); break;
+          case '|=':      conditions.push(
+                            splitValueBy('-') + '.first().toUpperCase() == ' + attribute.value.toUpperCase().inspect()
+                          ); break;
+          case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
+          case '':
+          case undefined: conditions.push(value + ' != null'); break;
+          default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
+        }
+      });
+    }
+
+    return conditions.join(' && ');
+  },
+
+  compileMatcher: function() {
+    this.match = new Function('element', 'if (!element.tagName) return false; \
+      return ' + this.buildMatchExpression());
+  },
+
+  findElements: function(scope) {
+    var element;
+
+    if (element = $(this.params.id))
+      if (this.match(element))
+        if (!scope || Element.childOf(element, scope))
+          return [element];
+
+    scope = (scope || document).getElementsByTagName(this.params.tagName || '*');
+
+    var results = [];
+    for (var i = 0; i < scope.length; i++)
+      if (this.match(element = scope[i]))
+        results.push(Element.extend(element));
+
+    return results;
+  },
+
+  toString: function() {
+    return this.expression;
+  }
+}
+
+function $$() {
+  return $A(arguments).map(function(expression) {
+    return expression.strip().split(/\s+/).inject([null], function(results, expr) {
+      var selector = new Selector(expr);
+      return results.map(selector.findElements.bind(selector)).flatten();
+    });
+  }).flatten();
+}
 var Field = {
   clear: function() {
     for (var i = 0; i < arguments.length; i++)

data/lib/code_statistics.rb

@@ -1,6 +1,6 @@
 class CodeStatistics #:nodoc:
 
-  TEST_TYPES = ['Units', 'Functionals', 'Unit tests', 'Functional tests']
+  TEST_TYPES = %w(Units Functionals Unit\ tests Functional\ tests Integration\ tests)
 
   def initialize(*pairs)
     @pairs      = pairs

data/lib/commands/console.rb

@@ -11,9 +11,11 @@ end
 
 libs =  " -r irb/completion"
 libs << " -r #{RAILS_ROOT}/config/environment"
+libs << " -r console_app"
 libs << " -r console_sandbox" if options[:sandbox]
+libs << " -r console_with_helpers"
 
-ENV['RAILS_ENV'] = ARGV.first || 'development'
+ENV['RAILS_ENV'] = ARGV.first || ENV['RAILS_ENV'] || 'development'
 if options[:sandbox]
   puts "Loading #{ENV['RAILS_ENV']} environment in sandbox."
   puts "Any modifications you make will be rolled back on exit."

data/lib/commands/plugin.rb

@@ -31,10 +31,13 @@
 #     look like subversion repositories with plugins:
 #     http://wiki.rubyonrails.org/rails/pages/Plugins
 # 
+#   * Unless you specify that you want to use svn, script/plugin uses plain ole
+#     HTTP for downloads.  The following bullets are true if you specify
+#     that you want to use svn.
+#
 #   * If `vendor/plugins` is under subversion control, the script will
 #     modify the svn:externals property and perform an update. You can
-#     use normal subversion commands to keep the plugins up to date or
-#     you can use the built in update command.
+#     use normal subversion commands to keep the plugins up to date.
 # 
 #   * Or, if `vendor/plugins` is not under subversion control, the
 #     plugin is pulled via `svn checkout` or `svn export` but looks
@@ -58,7 +61,7 @@ class RailsEnvironment
   def initialize(dir)
     @root = dir
   end
-  
+
   def self.find(dir=nil)
     dir ||= pwd
     while dir.length > 1
@@ -93,21 +96,22 @@ class RailsEnvironment
   end
  
   def use_svn?
-    `svn --version` rescue nil
+    require 'active_support/core_ext/kernel'
+    silence_stderr {`svn --version` rescue nil}
     !$?.nil? && $?.success?
   end
 
   def use_externals?
-    File.directory?("#{root}/vendor/plugins/.svn")
+    use_svn? && File.directory?("#{root}/vendor/plugins/.svn")
   end
-  
+
   def use_checkout?
     # this is a bit of a guess. we assume that if the rails environment
     # is under subversion than they probably want the plugin checked out
     # instead of exported. This can be overridden on the command line
     File.directory?("#{root}/.svn")
   end
-  
+
   def best_install_method
     return :http unless use_svn?
     case
@@ -119,12 +123,12 @@ class RailsEnvironment
 
   def externals
     return [] unless use_externals?
-    ext = `svn propget svn:externals #{root}/vendor/plugins`
+    ext = `svn propget svn:externals "#{root}/vendor/plugins"`
     ext.reject{ |line| line.strip == '' }.map do |line| 
       line.strip.split(/\s+/, 2) 
     end
   end
-  
+
   def externals=(items)
     unless items.is_a? String
       items = items.map{|name,uri| "#{name.ljust(29)} #{uri.chomp('/')}"}.join("\n")
@@ -132,7 +136,7 @@ class RailsEnvironment
     Tempfile.open("svn-set-prop") do |file|
       file.write(items)
       file.flush
-      system("svn propset -q svn:externals -F #{file.path} #{root}/vendor/plugins")
+      system("svn propset -q svn:externals -F #{file.path} \"#{root}/vendor/plugins\"")
     end
   end
   
@@ -155,40 +159,73 @@ class Plugin
       or rails_env.externals.detect{ |name, repo| self.uri == repo }
   end
   
-  def install(method=nil)
+  def install(method=nil, options = {})
     method ||= rails_env.best_install_method?
+
+    uninstall if installed? and options[:force]
+
     unless installed?
-      send("install_using_#{method}")
+      send("install_using_#{method}", options)
+      run_install_hook
     else
-      puts "already installed: #{name} (#{uri})"
+      puts "already installed: #{name} (#{uri}).  pass --force to reinstall"
     end
   end
-  
+
+  def uninstall
+    path = "#{rails_env.root}/vendor/plugins/#{name}"
+    if File.directory?(path)
+      puts "Removing 'vendor/plugins/#{name}'" if $verbose
+      rm_r path
+    else
+      puts "Plugin doesn't exist: #{path}"
+    end
+    # clean up svn:externals
+    externals = rails_env.externals
+    externals.reject!{|n,u| name == n or name == u}
+    rails_env.externals = externals
+  end
+
   private 
-    def install_using_export
-      root = rails_env.root
-      mkdir_p "#{root}/vendor/plugins"
-      system("svn export #{uri} #{root}/vendor/plugins/#{name}")
+
+    def run_install_hook
+      install_hook_file = "#{rails_env.root}/vendor/plugins/#{name}/install.rb"
+      load install_hook_file if File.exists? install_hook_file
+    end
+
+    def install_using_export(options = {})
+      svn_command :export, options
     end
     
-    def install_using_checkout
-      root = rails_env.root
-      mkdir_p "#{root}/vendor/plugins"
-      system("svn checkout #{uri} #{root}/vendor/plugins/#{name}")
+    def install_using_checkout(options = {})
+      svn_command :checkout, options
     end
     
-    def install_using_externals
+    def install_using_externals(options = {})
       externals = rails_env.externals
       externals.push([@name, uri])
       rails_env.externals = externals
-      install_using_checkout
+      install_using_checkout(options)
     end
 
-    def install_using_http
+    def install_using_http(options = {})
       root = rails_env.root
       mkdir_p "#{root}/vendor/plugins"
       Dir.chdir "#{root}/vendor/plugins"
-      RecursiveHTTPFetcher.new(uri).fetch
+      puts "fetching from '#{uri}'" if $verbose
+      fetcher = RecursiveHTTPFetcher.new(uri)
+      fetcher.quiet = true if options[:quiet]
+      fetcher.fetch
+    end
+
+    def svn_command(cmd, options = {})
+      root = rails_env.root
+      mkdir_p "#{root}/vendor/plugins"
+      base_cmd = "svn #{cmd} #{uri} \"#{root}/vendor/plugins/#{name}\""
+      base_cmd += ' -q' if options[:quiet] and not $verbose
+      base_cmd += " -r #{options[:revision]}" if options[:revision]
+      puts base_cmd if $verbose
+      system(base_cmd)
     end
 
     def guess_name(url)
@@ -239,7 +276,6 @@ class Repositories
         return plugin if plugin.name == name
       end
     end
-    
     return nil
   end
   
@@ -298,8 +334,7 @@ class Repository
   attr_reader :uri, :plugins
   
   def initialize(uri)
-    uri << "/" unless uri =~ /\/$/
-    @uri = uri
+    @uri = uri.chomp('/') << "/"
     @plugins = nil
   end
   
@@ -310,7 +345,7 @@ class Repository
         puts index
       end
 
-      @plugins = index.split(/\n/).reject{ |line| line !~ /\/$/ }
+      @plugins = index.reject{ |line| line !~ /\/$/ }
       @plugins.map! { |name| Plugin.new(File.join(@uri, name), name) }
     end
 
@@ -323,7 +358,7 @@ class Repository
   
   private
     def index
-      @index ||= `svn ls #{@uri}`
+      @index ||= RecursiveHTTPFetcher.new(@uri).ls
     end
 end
 
@@ -411,7 +446,7 @@ module Commands
         command.parse!(sub)
       else
         puts "Unknown command: #{command}"
-        puts "Try: #{$0} --help"
+        puts options
         exit 1
       end
     end
@@ -435,7 +470,6 @@ module Commands
       @sources = []
       @local = false
       @remote = true
-      @details = false
     end
     
     def options
@@ -453,8 +487,6 @@ module Commands
         o.on(         "--remote",
                       "List remotely availabled plugins. This is the default behavior",
                       "unless --local is provided.") {|@remote|}
-        o.on(         "-l", "--long",
-                      "Long listing / details about each plugin.") {|@details|}
       end
     end
     
@@ -469,14 +501,12 @@ module Commands
         @sources.map{|r| r.plugins}.flatten.each do |plugin| 
           if @local or !plugin.installed?
             puts plugin.to_s
-            system "svn info #{plugin.uri}" if @details
           end
         end
       else
         cd "#{@base_command.environment.root}/vendor/plugins"
         Dir["*"].select{|p| File.directory?(p)}.each do |name| 
           puts name
-          system "svn info #{name}" if @details
         end
       end
     end
@@ -644,7 +674,8 @@ module Commands
   class Install
     def initialize(base_command)
       @base_command = base_command
-      @method = :export
+      @method = :http
+      @options = { :quiet => false, :revision => nil, :force => false }
     end
     
     def options
@@ -660,6 +691,14 @@ module Commands
         o.on(         "-o", "--checkout",
                       "Use svn checkout to grab the plugin.",
                       "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
+        o.on(         "-q", "--quiet",
+                      "Suppresses the output from installation.",
+                      "Ignored if -v is passed (./script/plugin -v install ...)") { |v| @options[:quiet] = true }
+        o.on(         "-r REVISION", "--revision REVISION",
+                      "Checks out the given revision from subversion.",
+                      "Ignored if subversion is not used.") { |v| @options[:revision] = v }
+        o.on(         "-f", "--force",
+                      "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
         o.separator   ""
         o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
         o.separator   "a plugin repository."
@@ -672,8 +711,8 @@ module Commands
       case
       when (best == :http and @method != :http)
         msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
-      when (best == :export and (@method != :export and method != :http))
-        msg = "Cannot install using #{requested} because this project is not under subversion."
+      when (best == :export and (@method != :export and @method != :http))
+        msg = "Cannot install using #{@method} because this project is not under subversion."
       when (best != :externals and @method == :externals)
         msg = "Cannot install using externals because vendor/plugins is not under subversion."
       end
@@ -691,11 +730,11 @@ module Commands
       puts "Plugins will be installed using #{install_method}" if $verbose
       args.each do |name| 
         if name =~ /\// then
-          ::Plugin.new(name).install(install_method)
+          ::Plugin.new(name).install(install_method, @options)
         else
           plugin = Repositories.instance.find_plugin(name)
           unless plugin.nil?
-            plugin.install(install_method)
+            plugin.install(install_method, @options)
           else
             puts "Plugin not found: #{name}"
             exit 1
@@ -705,39 +744,42 @@ module Commands
     end
   end
 
-
-  class Remove
+  class Update
     def initialize(base_command)
       @base_command = base_command
     end
-    
+   
     def options
       OptionParser.new do |o|
         o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
-        o.define_head "Remove plugins."
+        o.banner =    "Usage: #{@base_command.script_name} update [name [name]...]"
+        o.on(         "-r REVISION", "--revision REVISION",
+                      "Checks out the given revision from subversion.",
+                      "Ignored if subversion is not used.") { |v| @revision = v }
+        o.define_head "Update plugins."
       end
     end
-    
+   
     def parse!(args)
       options.parse!(args)
       root = @base_command.environment.root
+      cd root
+      args = Dir["vendor/plugins/*"].map do |f|
+        File.directory?("#{f}/.svn") ? File.basename(f) : nil
+      end.compact if args.empty?
+      cd "vendor/plugins"
       args.each do |name|
-        path = "#{root}/vendor/plugins/#{name}"
-        if File.directory?(path)
-          rm_r path
+        if File.directory?(name)
+          puts "Updating plugin: #{name}"
+          system("svn #{$verbose ? '' : '-q'} up \"#{name}\" #{@revision ? "-r #{@revision}" : ''}")
         else
-          puts "Plugin doesn't exist: #{path}"
+          puts "Plugin doesn't exist: #{name}"
         end
-        # clean up svn:externals
-        externals = @base_command.environment.externals
-        externals.reject!{|n,u| name == n or name == u}
-        @base_command.environment.externals = externals
       end
     end
   end
 
-  class Update
+  class Remove
     def initialize(base_command)
       @base_command = base_command
     end
@@ -745,25 +787,16 @@ module Commands
     def options
       OptionParser.new do |o|
         o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} update [name [name]...]"
-        o.define_head "Update plugins."
+        o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
+        o.define_head "Remove plugins."
       end
     end
     
     def parse!(args)
       options.parse!(args)
       root = @base_command.environment.root
-      args = Dir["#{root}/vendor/plugins/*"].map do |f|
-        File.directory?("#{f}/.svn") ? File.basename(f) : nil
-      end.compact if args.empty?
-      cd "#{root}/vendor/plugins"
       args.each do |name|
-        if File.directory?(name)
-          puts "Updating plugin: #{name}"
-          system("svn #{$verbose ? '' : '-q'} up #{name}")
-        else
-          puts "Plugin doesn't exist: #{name}"
-        end
+        ::Plugin.new(name).uninstall
       end
     end
   end
@@ -771,9 +804,19 @@ module Commands
 end
  
 class RecursiveHTTPFetcher
+  attr_accessor :quiet
   def initialize(urls_to_fetch, cwd = ".")
     @cwd = cwd
     @urls_to_fetch = urls_to_fetch.to_a
+    @quiet = false
+  end
+
+  def ls
+    @urls_to_fetch.collect do |url|
+      open(url) do |stream|
+        links("", stream.read)
+      end rescue nil
+    end.flatten
   end
 
   def push_d(dir)
@@ -796,7 +839,7 @@ class RecursiveHTTPFetcher
   end
   
   def download(link)
-    puts "+ #{File.join(@cwd, File.basename(link))}"
+    puts "+ #{File.join(@cwd, File.basename(link))}" unless @quiet
     open(link) do |stream|
       File.open(File.join(@cwd, File.basename(link)), "wb") do |file|
         file.write(stream.read)