rails 1.0.0 → 2.0.0

data/html/robots.txt

@@ -1 +1,5 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

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
@@ -83,7 +83,7 @@ class CodeStatistics #:nodoc:
       loc_over_m = (statistics["codelines"] / statistics["methods"]) - 2 rescue loc_over_m = 0
 
       start = if TEST_TYPES.include? name
-        "|   #{name.ljust(18)} "
+        "| #{name.ljust(20)} "
       else
         "| #{name.ljust(20)} " 
       end

data/lib/commands/console.rb

@@ -1,23 +1,32 @@
-irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
 require 'optparse'
 options = { :sandbox => false, :irb => irb }
 OptionParser.new do |opt|
   opt.banner = "Usage: console [environment] [options]"
-  opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |options[:sandbox]| }
-  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |options[:irb]| }
+  opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |v| options[:sandbox] = v }
+  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |v| options[:irb] = v }
   opt.parse!(ARGV)
 end
 
 libs =  " -r irb/completion"
-libs << " -r #{RAILS_ROOT}/config/environment"
+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'] = case ARGV.first
+  when "p": "production"
+  when "d": "development"
+  when "t": "test"
+  else
+    ARGV.first || ENV['RAILS_ENV'] || 'development'
+end
 
-ENV['RAILS_ENV'] = ARGV.first || 'development'
 if options[:sandbox]
-  puts "Loading #{ENV['RAILS_ENV']} environment in sandbox."
-  puts "Any modifications you make will be rolled back on exit."
+  puts "Loading #{ENV['RAILS_ENV']} environment in sandbox (Rails #{Rails::VERSION::STRING})"
+  puts "Any modifications you make will be rolled back on exit"
 else
-  puts "Loading #{ENV['RAILS_ENV']} environment."
+  puts "Loading #{ENV['RAILS_ENV']} environment (Rails #{Rails::VERSION::STRING})"
 end
-exec "#{options[:irb]} #{libs} --prompt-mode simple"
+exec "#{options[:irb]} #{libs} --simple-prompt"

data/lib/commands/performance/profiler.rb

@@ -1,5 +1,5 @@
 if ARGV.empty?
-  $stderr.puts "Usage: ./script/performance/profiler 'Person.expensive_method(10)' [times]"
+  $stderr.puts "Usage: ./script/performance/profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]"
   exit(1)
 end
 
@@ -16,14 +16,30 @@ end
 
 # Use the ruby-prof extension if available.  Fall back to stdlib profiler.
 begin
-  require 'prof'
-  $stderr.puts 'Using the ruby-prof extension.'
-  Prof.clock_mode = Prof::GETTIMEOFDAY
-  Prof.start
-  profile_me
-  results = Prof.stop
-  require 'rubyprof_ext'
-  Prof.print_profile(results, $stderr)
+  begin
+    require "ruby-prof"
+    $stderr.puts 'Using the ruby-prof extension.'
+    RubyProf.clock_mode = RubyProf::WALL_TIME
+    RubyProf.start
+    profile_me
+    results = RubyProf.stop
+    if ARGV[2]
+      printer_class = RubyProf.const_get((ARGV[2] + "_printer").classify)
+    else
+      printer_class = RubyProf::FlatPrinter
+    end
+    printer = printer_class.new(results)
+    printer.print($stderr, 0)
+  rescue LoadError
+    require "prof"
+    $stderr.puts 'Using the old ruby-prof extension.'
+    Prof.clock_mode = Prof::GETTIMEOFDAY
+    Prof.start
+    profile_me
+    results = Prof.stop
+    require 'rubyprof_ext'
+    Prof.print_profile(results, $stderr)
+  end
 rescue LoadError
   require 'profiler'
   $stderr.puts 'Using the standard Ruby profiler.'

data/lib/commands/performance/request.rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require 'config/environment'
+require 'application'
+require 'action_controller/request_profiler'
+
+ActionController::RequestProfiler.run(ARGV)

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 old
+#     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
@@ -88,26 +91,27 @@ class RailsEnvironment
     unless plugin.nil?
       plugin.install
     else
-      puts "plugin not found: #{name_uri_or_plugin}"
+      puts "Plugin not found: #{name_uri_or_plugin}"
     end
   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
+    # is under subversion then 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
   
@@ -146,49 +150,112 @@ class Plugin
     guess_name(uri)
   end
   
+  def self.find(name)
+    name =~ /\// ? new(name) : Repositories.instance.find_plugin(name)
+  end
+  
   def to_s
     "#{@name.ljust(30)}#{@uri}"
   end
   
+  def svn_url?
+    @uri =~ /svn(?:\+ssh)?:\/\/*/
+  end
+  
   def installed?
     File.directory?("#{rails_env.root}/vendor/plugins/#{name}") \
       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?
+    method   = :export if method == :http and svn_url?
+
+    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
+      run_uninstall_hook
+      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
+
+  def info
+    tmp = "#{rails_env.root}/_tmp_about.yml"
+    if svn_url?
+      cmd = "svn export #{@uri} \"#{rails_env.root}/#{tmp}\""
+      puts cmd if $verbose
+      system(cmd)
+    end
+    open(svn_url? ? tmp : File.join(@uri, 'about.yml')) do |stream|
+      stream.read
+    end rescue "No about.yml found in #{uri}"
+  ensure
+    FileUtils.rm_rf tmp if svn_url?
+  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 run_uninstall_hook
+      uninstall_hook_file = "#{rails_env.root}/vendor/plugins/#{name}/uninstall.rb"
+      load uninstall_hook_file if File.exists? uninstall_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(options = {})
+      root = rails_env.root
+      mkdir_p "#{root}/vendor/plugins/#{@name}"
+      Dir.chdir "#{root}/vendor/plugins/#{@name}" do
+        puts "fetching from '#{uri}'" if $verbose
+        fetcher = RecursiveHTTPFetcher.new(uri, -1)
+        fetcher.quiet = true if options[:quiet]
+        fetcher.fetch
+      end
     end
 
-    def install_using_http
+    def svn_command(cmd, options = {})
       root = rails_env.root
       mkdir_p "#{root}/vendor/plugins"
-      Dir.chdir "#{root}/vendor/plugins"
-      RecursiveHTTPFetcher.new(uri).fetch
+      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 +306,6 @@ class Repositories
         return plugin if plugin.name == name
       end
     end
-    
     return nil
   end
   
@@ -298,8 +364,7 @@ class Repository
   attr_reader :uri, :plugins
   
   def initialize(uri)
-    uri << "/" unless uri =~ /\/$/
-    @uri = uri
+    @uri = uri.chomp('/') << "/"
     @plugins = nil
   end
   
@@ -310,7 +375,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 +388,7 @@ class Repository
   
   private
     def index
-      @index ||= `svn ls #{@uri}`
+      @index ||= RecursiveHTTPFetcher.new(@uri).ls
     end
 end
 
@@ -406,12 +471,12 @@ module Commands
       options.parse!(general)
       
       command = general.shift
-      if command =~ /^(list|discover|install|source|unsource|sources|remove|update)$/
+      if command =~ /^(list|discover|install|source|unsource|sources|remove|update|info)$/
         command = Commands.const_get(command.capitalize).new(self)
         command.parse!(sub)
       else
         puts "Unknown command: #{command}"
-        puts "Try: #{$0} --help"
+        puts options
         exit 1
       end
     end
@@ -435,7 +500,6 @@ module Commands
       @sources = []
       @local = false
       @remote = true
-      @details = false
     end
     
     def options
@@ -451,10 +515,8 @@ module Commands
         o.on(         "--local", 
                       "List locally installed plugins.") {|@local| @remote = false}
         o.on(         "--remote",
-                      "List remotely availabled plugins. This is the default behavior",
+                      "List remotely available 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 +531,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
@@ -518,8 +578,8 @@ module Commands
     def options
       OptionParser.new do |o|
         o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} source REPOSITORY"
-        o.define_head "Add a new repository."
+        o.banner =    "Usage: #{@base_command.script_name} source REPOSITORY [REPOSITORY [REPOSITORY]...]"
+        o.define_head "Add new repositories to the default search list."
       end
     end
     
@@ -625,13 +685,17 @@ module Commands
       puts "Scraping #{uri}" if $verbose
       dupes = []
       content = open(uri).each do |line|
-        if line =~ /<a[^>]*href=['"]([^'"]*)['"]/
-          uri = $1
-          if uri =~ /\/plugins\// and uri !~ /\/browser\//
-            uri = extract_repository_uri(uri)
-            yield uri unless dupes.include?(uri) or Repositories.instance.exist?(uri)
-            dupes << uri
+        begin
+          if line =~ /<a[^>]*href=['"]([^'"]*)['"]/ || line =~ /(svn:\/\/[^<|\n]*)/
+            uri = $1
+            if uri =~ /^\w+:\/\// && uri =~ /\/plugins\// && uri !~ /\/browser\// && uri !~ /^http:\/\/wiki\.rubyonrails/ && uri !~ /http:\/\/instiki/
+              uri = extract_repository_uri(uri)
+              yield uri unless dupes.include?(uri) || Repositories.instance.exist?(uri)
+              dupes << uri
+            end
           end
+        rescue
+          puts "Problems scraping '#{uri}': #{$!.to_s}"
         end
       end
     end
@@ -644,7 +708,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 +725,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 +745,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
@@ -689,23 +762,51 @@ module Commands
       environment = @base_command.environment
       install_method = determine_install_method
       puts "Plugins will be installed using #{install_method}" if $verbose
-      args.each do |name| 
-        if name =~ /\// then
-          ::Plugin.new(name).install(install_method)
+      args.each do |name|
+        ::Plugin.find(name).install(install_method, @options)
+      end
+    rescue StandardError => e
+      puts "Plugin not found: #{args.inspect}"
+      puts e.inspect if $verbose
+      exit 1
+    end
+  end
+
+  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} 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|
+        if File.directory?(name)
+          puts "Updating plugin: #{name}"
+          system("svn #{$verbose ? '' : '-q'} up \"#{name}\" #{@revision ? "-r #{@revision}" : ''}")
         else
-          plugin = Repositories.instance.find_plugin(name)
-          unless plugin.nil?
-            plugin.install(install_method)
-          else
-            puts "Plugin not found: #{name}"
-            exit 1
-          end
+          puts "Plugin doesn't exist: #{name}"
         end
       end
     end
   end
 
-
   class Remove
     def initialize(base_command)
       @base_command = base_command
@@ -723,57 +824,53 @@ module Commands
       options.parse!(args)
       root = @base_command.environment.root
       args.each do |name|
-        path = "#{root}/vendor/plugins/#{name}"
-        if File.directory?(path)
-          rm_r path
-        else
-          puts "Plugin doesn't exist: #{path}"
-        end
-        # clean up svn:externals
-        externals = @base_command.environment.externals
-        externals.reject!{|n,u| name == n or name == u}
-        @base_command.environment.externals = externals
+        ::Plugin.new(name).uninstall
       end
     end
   end
 
-  class Update
+  class Info
     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} update [name [name]...]"
-        o.define_head "Update plugins."
+        o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
+        o.define_head "Shows plugin info at {url}/about.yml."
       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
+        puts ::Plugin.find(name).info
+        puts
       end
     end
   end
-
 end
  
 class RecursiveHTTPFetcher
-  def initialize(urls_to_fetch, cwd = ".")
+  attr_accessor :quiet
+  def initialize(urls_to_fetch, level = 1, cwd = ".")
+    @level = level
     @cwd = cwd
     @urls_to_fetch = urls_to_fetch.to_a
+    @quiet = false
+  end
+
+  def ls
+    @urls_to_fetch.collect do |url|
+      if url =~ /^svn:\/\/.*/
+        `svn ls #{url}`.split("\n").map {|entry| "/#{entry}"} rescue nil
+      else
+        open(url) do |stream|
+          links("", stream.read)
+        end rescue nil
+      end
+    end.flatten
   end
 
   def push_d(dir)
@@ -789,14 +886,15 @@ class RecursiveHTTPFetcher
     links = []
     contents.scan(/href\s*=\s*\"*[^\">]*/i) do |link|
       link = link.sub(/href="/i, "")
-      next if link =~ /^http/i || link =~ /^\./
+      next if link =~ /svnindex.xsl$/
+      next if link =~ /^(\w*:|)\/\// || link =~ /^\./
       links << File.join(base_url, link)
     end
     links
   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)
@@ -811,12 +909,14 @@ class RecursiveHTTPFetcher
   end
   
   def fetch_dir(url)
-    push_d(File.basename(url))
+    @level += 1
+    push_d(File.basename(url)) if @level > 0
     open(url) do |stream|
       contents =  stream.read
       fetch(links(url, contents))
     end
-    pop_d
+    pop_d if @level > 0
+    @level -= 1
   end
 end