Merge commit 'brynary/master'

Rakefile

@@ -1,4 +1,4 @@
-require 'rubygems'
+# require 'rubygems'
 require "rake/gempackagetask"
 require 'rake/rdoctask'
 require "rake/clean"
@@ -28,7 +28,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
 
   # Dependencies
-  s.add_dependency "nokogiri", ">= 1.0.6"
+  s.add_dependency "nokogiri", ">= 1.1.0"
   
   s.rubyforge_project = "webrat"
 end
@@ -52,13 +52,13 @@ end
 desc "Run API and Core specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files = FileList['spec/public/*_spec.rb'] + FileList['spec/private/*_spec.rb']
 end
 
 desc "Run all specs in spec directory with RCov"
 Spec::Rake::SpecTask.new(:rcov) do |t|
   t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files = FileList['spec/public/*_spec.rb'] + FileList['spec/private/*_spec.rb']
   t.rcov = true
   t.rcov_opts = lambda do
     IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
@@ -71,8 +71,8 @@ end
 
 desc 'Install the package as a gem.'
 task :install_gem => [:clean, :package] do
-  gem = Dir['pkg/*.gem'].first
+  gem_filename = Dir['pkg/*.gem'].first
-  sh "sudo gem install --local #{gem}"
+  sh "sudo gem install --local #{gem_filename}"
 end
 
 desc "Delete generated RDoc"
@@ -99,6 +99,25 @@ task :spec_deps do
   end
 end
 
+task :prepare do
+  system "ln -s ../../../../.. ./spec/integration/rails/vendor/plugins/webrat"
+end
+
+namespace :spec do
+  desc "Run the integration specs"
+  task :integration do
+    Dir.chdir "spec/integration/rails" do
+      result = system "rake test:integration"
+      raise "Tests failed" unless result
+    end
+    
+    Dir.chdir "spec/integration/merb" do
+      result = system "rake spec"
+      raise "Tests failed" unless result
+    end
+  end
+end
+
 task :default => :spec
 
-task :precommit => ["spec", "spec:jruby"]
+task :precommit => ["spec", "spec:jruby", "spec:integration"]

spec/integration/merb/.gitignore

@@ -0,0 +1,21 @@
+.DS_Store
+log/*
+tmp/*
+TAGS
+*~
+.#*
+schema/schema.rb
+schema/*_structure.sql
+schema/*.sqlite3
+schema/*.sqlite
+schema/*.db
+*.sqlite
+*.sqlite3
+*.db
+src/*
+.hgignore
+.hg/*
+.svn/*
+gems/gems/*
+gems/specifications/*
+merb_profile_results

spec/integration/merb/Rakefile

@@ -0,0 +1,35 @@
+require 'rubygems'
+require 'rake/rdoctask'
+
+require 'merb-core'
+require 'merb-core/tasks/merb'
+
+include FileUtils
+
+# Load the basic runtime dependencies; this will include 
+# any plugins and therefore plugin rake tasks.
+init_env = ENV['MERB_ENV'] || 'rake'
+Merb.load_dependencies(:environment => init_env)
+     
+# Get Merb plugins and dependencies
+Merb::Plugins.rakefiles.each { |r| require r } 
+
+# Load any app level custom rakefile extensions from lib/tasks
+tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
+rake_files = Dir["#{tasks_path}/*.rake"]
+rake_files.each{|rake_file| load rake_file }
+
+desc "Start runner environment"
+task :merb_env do
+  Merb.start_environment(:environment => init_env, :adapter => 'runner')
+end
+
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
+desc 'Default: run spec examples'
+task :default => 'spec'
+
+##############################################################################
+# ADD YOUR CUSTOM TASKS IN /lib/tasks
+# NAME YOUR RAKE FILES file_name.rake
+##############################################################################

spec/integration/merb/app/controllers/application.rb

@@ -0,0 +1,2 @@
+class Application < Merb::Controller
+end

spec/integration/merb/app/controllers/exceptions.rb

@@ -0,0 +1,13 @@
+class Exceptions < Merb::Controller
+  
+  # handle NotFound exceptions (404)
+  def not_found
+    render :format => :html
+  end
+
+  # handle NotAcceptable exceptions (406)
+  def not_acceptable
+    render :format => :html
+  end
+
+end

spec/integration/merb/app/controllers/testing.rb

@@ -0,0 +1,10 @@
+class Testing < Application
+  
+  def show_form
+    render
+  end
+  
+  def submit_form
+  end
+  
+end

spec/integration/merb/app/views/exceptions/not_acceptable.html.erb

@@ -0,0 +1,63 @@
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg" />
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= request.exceptions.first.message %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Why am I seeing this page?</h3>
+    <p>Merb couldn't find an appropriate content_type to return,
+      based on what you said was available via provides() and
+      what the client requested.</p>
+
+    <h3>How to add a mime-type</h3>
+    <pre><code>
+      Merb.add_mime_type :pdf, :to_pdf, %w[application/pdf], &quot;Content-Encoding&quot; =&gt; &quot;gzip&quot;
+    </code></pre>
+    <h3>What this means is:</h3>
+    <ul>
+      <li>Add a mime-type for :pdf</li>
+      <li>Register the method for converting objects to PDF as <code>#to_pdf</code>.</li>
+      <li>Register the incoming mime-type "Accept" header as <code>application/pdf</code>.</li>
+      <li>Specify a new header for PDF types so it will set <code>Content-Encoding</code> to gzip.</li>
+    </ul>
+
+    <h3>You can then do:</h3>
+    <pre><code>
+      class Foo &lt; Application
+        provides :pdf
+      end
+    </code></pre>
+
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You can change what people see when this happens by editing <tt>app/views/exceptions/not_acceptable.html.erb</tt>.</p> 
+
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2008 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>

spec/integration/merb/app/views/exceptions/not_found.html.erb

@@ -0,0 +1,47 @@
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg" />
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= request.exceptions.first.message %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Welcome to Merb!</h3>
+    <p>Merb is a light-weight MVC framework written in Ruby.  We hope you enjoy it.</p>
+    
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You're seeing this page because you need to edit the following files:
+      <ul>
+        <li>config/router.rb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
+      </ul>
+    </p>
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2008 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>

spec/integration/merb/app/views/layout/application.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
+  <head>
+    <title>Fresh Merb App</title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8" />
+  </head>
+  <body>
+    <%#= message[:notice] %>
+    <%= catch_content :for_layout %>
+  </body>
+</html>

spec/integration/merb/app/views/testing/show_form.html.erb

@@ -0,0 +1,22 @@
+<h1>Webrat Form</h1>
+
+<form action="/testing/submit_form" method="post">
+  <label>
+    Text field
+    <input type="text" name="text_field" />
+  </label>
+  
+  <label>
+    TOS <input type="checkbox" name="tos" />
+  </label>
+  
+  <label>
+    Month
+    <select name="month">
+      <option>None</option>
+      <option>January</option>
+    </select>
+  </label>
+  
+  <input type="submit" value="Test">
+</form>

spec/integration/merb/config/environments/development.rb

@@ -0,0 +1,15 @@
+Merb.logger.info("Loaded DEVELOPMENT Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = true
+  c[:reload_templates] = true
+  c[:reload_classes] = true
+  c[:reload_time] = 0.5
+  c[:ignore_tampered_cookies] = true
+  c[:log_auto_flush ] = true
+  c[:log_level] = :debug
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

spec/integration/merb/config/environments/rake.rb

@@ -0,0 +1,11 @@
+Merb.logger.info("Loaded RAKE Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = true
+  c[:reload_classes]  = false
+  c[:log_auto_flush ] = true
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

spec/integration/merb/config/environments/test.rb

@@ -0,0 +1,12 @@
+Merb.logger.info("Loaded TEST Environment...")
+Merb::Config.use { |c|
+  c[:testing]           = true
+  c[:exception_details] = true
+  c[:log_auto_flush ]   = true
+  # log less in testing environment
+  c[:log_level]         = :error
+
+  #c[:log_file]  = Merb.root / "log" / "test.log"
+  # or redirect logger using IO handle
+  c[:log_stream] = STDOUT
+}

spec/integration/merb/config/init.rb

@@ -0,0 +1,25 @@
+# Go to http://wiki.merbivore.com/pages/init-rb
+ 
+# Specify a specific version of a dependency
+# dependency "RedCloth", "> 3.0"
+
+#  use_orm :none
+use_test :rspec
+use_template_engine :erb
+ 
+Merb::Config.use do |c|
+  c[:use_mutex] = false
+  c[:session_store] = 'cookie'  # can also be 'memory', 'memcache', 'container', 'datamapper
+  
+  # cookie session store configuration
+  c[:session_secret_key]  = 'adb9ea7a0e94b5513503f58623a393c5efe18851'  # required for cookie session store
+  c[:session_id_key] = '_merb_session_id' # cookie session id key, defaults to "_session_id"
+end
+ 
+Merb::BootLoader.before_app_loads do
+  # This will get executed after dependencies have been loaded but before your app's classes have loaded.
+end
+ 
+Merb::BootLoader.after_app_loads do
+  # This will get executed after your app's classes have been loaded.
+end

spec/integration/merb/config/rack.rb

@@ -0,0 +1,11 @@
+# use PathPrefix Middleware if :path_prefix is set in Merb::Config
+if prefix = ::Merb::Config[:path_prefix]
+  use Merb::Rack::PathPrefix, prefix
+end
+
+# comment this out if you are running merb behind a load balancer
+# that serves static files
+use Merb::Rack::Static, Merb.dir_for(:public)
+
+# this is our main merb application
+run Merb::Rack::Application.new

spec/integration/merb/config/router.rb

@@ -0,0 +1,31 @@
+# Merb::Router is the request routing mapper for the merb framework.
+#
+# You can route a specific URL to a controller / action pair:
+#
+#   match("/contact").
+#     to(:controller => "info", :action => "contact")
+#
+# You can define placeholder parts of the url with the :symbol notation. These
+# placeholders will be available in the params hash of your controllers. For example:
+#
+#   match("/books/:book_id/:action").
+#     to(:controller => "books")
+#   
+# Or, use placeholders in the "to" results for more complicated routing, e.g.:
+#
+#   match("/admin/:module/:controller/:action/:id").
+#     to(:controller => ":module/:controller")
+#
+# You can specify conditions on the placeholder by passing a hash as the second
+# argument of "match"
+#
+#   match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/).
+#     to(:controller => "registration")
+#
+# You can also use regular expressions, deferred routes, and many other options.
+# See merb/specs/merb/router.rb for a fairly complete usage sample.
+
+Merb.logger.info("Compiling routes...")
+Merb::Router.prepare do
+  match("/").to(:controller => "testing", :action => "show_form")
+end

spec/integration/merb/spec/spec.opts

@@ -0,0 +1 @@
+--color

spec/integration/merb/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+require "rubygems"
+
+# Add the local gems dir if found within the app root; any dependencies loaded
+# hereafter will try to load from the local gems before loading system gems.
+if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
+  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+end
+
+require "merb-core"
+require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+
+# this loads all plugins required in your init file so don't add them
+# here again, Merb will do it for you
+Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::ViewHelper)
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+end

spec/integration/merb/spec/webrat_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "Webrat" do
+  it "should visit pages" do
+    response = visit "/"
+    response.should contain("Webrat Form")
+  end
+  
+  it "should submit forms" do
+    visit "/"
+    fill_in "Text field", :with => "Hello"
+    check "TOS"
+    select "January"
+    click_button "Test"
+  end
+  
+end

spec/integration/merb/tasks/merb.thor/app_script.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+# This was added by Merb's bundler
+
+require "rubygems"
+require File.join(File.dirname(__FILE__), "common")
+
+gems_dir = File.join(File.dirname(__FILE__), '..', 'gems')
+
+if File.directory?(gems_dir)
+  $BUNDLE = true
+  Gem.clear_paths
+  Gem.path.replace([File.expand_path(gems_dir)])
+  ENV["PATH"] = "#{File.dirname(__FILE__)}:#{ENV["PATH"]}"
+  
+  gem_file = File.join(gems_dir, "specifications", "<%= spec.name %>-*.gemspec")
+  
+  if local_gem = Dir[gem_file].last
+    version = File.basename(local_gem)[/-([\.\d]+)\.gemspec$/, 1]
+  end
+end
+
+version ||= "<%= Gem::Requirement.default %>"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+gem '<%= @spec.name %>', version
+load '<%= bin_file_name %>'

spec/integration/merb/tasks/merb.thor/common.rb

@@ -0,0 +1,64 @@
+# This was added via Merb's bundler
+
+require "rubygems"
+require "rubygems/source_index"
+
+module Gem
+  BUNDLED_SPECS = File.join(Dir.pwd, "gems", "specifications")
+  MAIN_INDEX = Gem::SourceIndex.from_gems_in(BUNDLED_SPECS)
+  FALLBACK_INDEX = Gem::SourceIndex.from_installed_gems
+  
+  def self.source_index
+    MultiSourceIndex.new
+  end
+  
+  def self.searcher
+    MultiPathSearcher.new
+  end
+  
+  class ArbitrarySearcher < GemPathSearcher
+    def initialize(source_index)
+      @source_index = source_index
+      super()
+    end
+    
+    def init_gemspecs
+      @source_index.map { |_, spec| spec }.sort { |a,b|
+        (a.name <=> b.name).nonzero? || (b.version <=> a.version)
+      }
+    end
+  end
+
+  class MultiPathSearcher
+    def initialize
+      @main_searcher = ArbitrarySearcher.new(MAIN_INDEX)
+      @fallback_searcher = ArbitrarySearcher.new(FALLBACK_INDEX)
+    end
+    
+    def find(path)
+      try = @main_searcher.find(path)
+      return try if try
+      @fallback_searcher.find(path)
+    end
+    
+    def find_all(path)
+      try = @main_searcher.find_all(path)
+      return try unless try.empty?
+      @fallback_searcher.find_all(path)
+    end
+  end
+  
+  class MultiSourceIndex
+    def search(*args)
+      try = MAIN_INDEX.search(*args)
+      return try unless try.empty?
+      FALLBACK_INDEX.search(*args)
+    end
+    
+    def find_name(*args)
+      try = MAIN_INDEX.find_name(*args)
+      return try unless try.empty?
+      FALLBACK_INDEX.find_name(*args)
+    end
+  end
+end

spec/integration/merb/tasks/merb.thor/gem_ext.rb

@@ -0,0 +1,124 @@
+require "erb"
+
+Gem.pre_install_hooks.push(proc do |installer|
+  $INSTALLING << installer.spec
+  
+  unless File.file?(installer.bin_dir / "common.rb")
+    FileUtils.mkdir_p(installer.bin_dir)
+    FileUtils.cp(File.dirname(__FILE__) / "common.rb", installer.bin_dir / "common.rb")
+  end
+  
+  include ColorfulMessages
+  name = installer.spec.name
+  if $GEMS && versions = ($GEMS.assoc(name) || [])[1]
+    dep = Gem::Dependency.new(name, versions)
+    unless dep.version_requirements.satisfied_by?(installer.spec.version)
+      error "Cannot install #{installer.spec.full_name} " \
+            "for #{$INSTALLING.map {|x| x.full_name}.join(", ")}; " \
+            "you required #{dep}"
+      ::Thor::Tasks::Merb::Gem.rollback_trans
+      exit!
+    end
+  end
+  success "Installing #{installer.spec.full_name}"
+end)
+
+class ::Gem::Uninstaller
+  def self._with_silent_ui
+    
+    ui = Gem::DefaultUserInteraction.ui 
+    def ui.say(str)
+      puts "- #{str}"
+    end
+    
+    yield
+    
+    class << Gem::DefaultUserInteraction.ui
+      remove_method :say
+    end 
+  end
+  
+  def self._uninstall(source_index, name, op, version)
+    unless source_index.find_name(name, "#{op} #{version}").empty?
+      uninstaller = Gem::Uninstaller.new(
+        name,
+        :version => "#{op} #{version}",
+        :install_dir => Dir.pwd / "gems",
+        :all => true,
+        :ignore => true
+      )
+      _with_silent_ui { uninstaller.uninstall }
+    end
+  end
+  
+  def self._uninstall_others(source_index, name, version)
+    _uninstall(source_index, name, "<", version)
+    _uninstall(source_index, name, ">", version)
+  end
+end
+
+Gem.post_install_hooks.push(proc do |installer|
+  $INSTALLING.pop
+  source_index = installer.instance_variable_get("@source_index")
+  ::Gem::Uninstaller._uninstall_others(
+    source_index, installer.spec.name, installer.spec.version
+  )
+end)
+
+class ::Gem::DependencyInstaller
+  alias old_fg find_gems_with_sources
+  
+  def find_gems_with_sources(dep)
+    if @source_index.any? { |_, installed_spec|
+      installed_spec.satisfies_requirement?(dep)
+    }
+      return []
+    end
+    
+    old_fg(dep)
+  end
+end
+
+class ::Gem::SpecFetcher
+  alias old_fetch fetch
+  def fetch(dependency, all = false, matching_platform = true)
+    idx = Gem::SourceIndex.from_installed_gems
+    
+    dep = idx.search(dependency).sort.last
+    
+    if dep
+      file = dep.loaded_from.dup
+      file.gsub!(/specifications/, "cache")
+      file.gsub!(/gemspec$/, "gem")
+      spec = ::Gem::Format.from_file_by_path(file).spec
+      [[spec, file]]
+    else
+      old_fetch(dependency, all, matching_platform)
+    end
+  end
+end
+
+class ::Gem::Installer
+  def app_script_text(bin_file_name)
+    template = File.read(File.dirname(__FILE__) / "app_script.rb")
+    erb = ERB.new(template)
+    erb.result(binding)
+  end
+end
+
+class ::Gem::Specification
+  def recursive_dependencies(from, index = Gem.source_index)
+    specs = self.runtime_dependencies.map do |dep|
+      spec = index.search(dep).last
+      unless spec
+        from_name = from.is_a?(::Gem::Specification) ? from.full_name : from.to_s
+        wider_net = index.find_name(dep.name).last
+        ThorUI.error "Needed #{dep} for #{from_name}, but could not find it"
+        ThorUI.error "Found #{wider_net.full_name}" if wider_net
+        ::Thor::Tasks::Merb::Gem.rollback_trans
+      end
+      spec
+    end
+    specs + specs.map {|s| s.recursive_dependencies(self, index)}.flatten.uniq
+  end
+end

spec/integration/merb/tasks/merb.thor/main.thor

@@ -0,0 +1,150 @@
+require "rubygems"
+require "rubygems/source_index"
+require "rubygems/dependency_installer"
+require "rubygems/uninstaller"
+require "fileutils"
+require File.join(File.dirname(__FILE__), "utils")
+require File.join(File.dirname(__FILE__), "gem_ext")
+require File.join(File.dirname(__FILE__), "ops")
+
+$INSTALLING = []
+
+module Merb
+  
+  class Gem < Thor
+    extend ColorfulMessages
+    
+    def initialize
+      dirs = [Dir.pwd, File.dirname(__FILE__) / ".."]
+      root = dirs.find {|d| File.file?(d / "config" / "dependencies.rb")}
+      
+      if root
+        @depsrb = root / "config" / "dependencies.rb"
+      else
+        self.class.error "dependencies.rb was not found"
+        exit!
+      end
+      
+      FileUtils.mkdir_p(Dir.pwd / "gems")
+      
+      @list = Collector.collect(File.read(@depsrb))
+      @idx = ::Gem::SourceIndex.new.load_gems_in("gems/specifications")
+    end
+    
+    def list
+      require "pp"
+      pp @list
+    end
+    
+    desc "redeploy", "Syncs up gems/cache with gems/gems. All gems in the cache " \
+                     "that are not already installed will be installed from the " \
+                     "cache. All installed gems that are not in the cache will " \
+                     "be uninstalled."
+    def redeploy
+      gem_dir = Dir.pwd / "gems" / "gems"
+      cache_dir = Dir.pwd / "gems" / "cache"
+      
+      gems  = Dir[gem_dir / "*"].map!  {|n| File.basename(n)}
+      cache = Dir[cache_dir / "*.gem"].map! {|n| File.basename(n, ".gem")}
+      new_gems = cache - gems
+      outdated = gems - cache
+      idx = ::Gem::SourceIndex.new
+      idx.load_gems_in(Dir.pwd / "gems" / "specifications")
+
+      new_gems.each do |g|
+        installer = ::Gem::Installer.new(cache_dir / "#{g}.gem",
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :ignore_dependencies => true,
+          :user_install => false,
+          :wrappers => true,
+          :source_index => idx)
+            
+        installer.install
+      end
+      
+      outdated.each do |g|
+        /(.*)\-(.*)/ =~ g
+        name, version = $1, $2
+        uninstaller = ::Gem::Uninstaller.new(name,
+          :version => version,
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :ignore => true,
+          :executables => true
+        )
+        uninstaller.uninstall
+      end
+    end
+    
+    desc "confirm", "Confirm the current setup. merb:gem:install will " \
+                    "automatically run this task before committing the " \
+                    "changes it makes."
+    def confirm(gems = @list)
+      ::Gem.path.replace([Dir.pwd / "gems"])
+      ::Gem.source_index.load_gems_in(Dir.pwd / "gems" / "specifications")
+      
+      self.class.info "Confirming configuration..."
+      
+      ::Gem.loaded_specs.clear
+      
+      begin
+        gems.each do |name, versions|
+          versions ||= []
+          ::Gem.activate name, *versions
+        end
+      rescue ::Gem::LoadError => e
+        self.class.error "Configuration could not be confirmed: #{e.message}"
+        self.class.rollback_trans
+      end
+      self.class.info "Confirmed"
+    end
+    
+    desc 'install', 'Sync up your bundled gems with the list in config/dependencies.rb'
+    def install(*gems)
+      if gems.empty?
+        gems = @list
+      else
+        gems = gems.map {|desc| name, *versions = desc.split(" ") }
+      end
+      
+      $GEMS = gems
+      
+      self.class.begin_trans
+      
+      gems.each do |name, versions|
+        dep = ::Gem::Dependency.new(name, versions || [])
+        unless @idx.search(dep).empty?
+          next
+        end
+        
+        rescue_failures do
+          $INSTALLING = []
+          _install(dep)
+        end
+      end
+
+      gem_dir = Dir.pwd / "gems" / "gems"
+      installed_gems  = Dir[gem_dir / "*"].map!  {|n| File.basename(n)}
+      
+      list = full_list.map {|x| x.full_name}.compact
+      
+      (installed_gems - list).each do |g|
+        /^(.*)\-(.*)$/ =~ g
+        name, version = $1, $2
+        uninstaller = ::Gem::Uninstaller.new(name,
+          :version => version,
+          :bin_dir => (Dir.pwd / "bin").to_s,
+          :install_dir => (Dir.pwd / "gems").to_s,
+          :ignore => true,
+          :executables => true
+        )
+        uninstaller.uninstall
+      end
+      
+      confirm(gems)
+      
+      self.class.commit_trans
+    end
+  end
+end

spec/integration/merb/tasks/merb.thor/ops.rb

@@ -0,0 +1,93 @@
+module Thor::Tasks
+  module Merb
+    class Collector
+      attr_reader :dependencies
+
+      def self.collect(str)
+        collector = new
+        collector.instance_eval(str)
+        collector.dependencies
+      end
+
+      def initialize
+        @dependencies = []
+      end
+
+      def dependency(name, *versions)
+        versions.pop if versions.last.is_a?(Hash)
+        @dependencies << [name, versions]
+      end
+    end
+    
+    class Gem < Thor
+      def full_list
+        @idx.load_gems_in("gems/specifications")
+
+        @list.map do |name, versions|
+          dep = ::Gem::Dependency.new(name, versions)
+          spec = @idx.search(dep).last
+          unless spec
+            self.class.error "A required dependency #{dep} was not found"
+            self.class.rollback_trans
+          end
+          deps = spec.recursive_dependencies(dep, @idx)
+          [spec] + deps
+        end.flatten.uniq
+      end
+      
+      def rescue_failures(error = StandardError, prc = nil)
+        begin
+          yield
+        rescue error => e
+          if prc
+            prc.call(e)
+          else
+            puts e.message
+            puts e.backtrace
+          end
+          self.class.rollback_trans
+        end
+      end
+
+      def self.begin_trans
+        note "Beginning transaction"
+        FileUtils.cp_r(Dir.pwd / "gems", Dir.pwd / ".original_gems")
+      end
+
+      def self.commit_trans
+        note "Committing transaction"
+        FileUtils.rm_rf(Dir.pwd / ".original_gems")
+      end
+
+      def self.rollback_trans
+        if File.exist?(Dir.pwd / ".original_gems")
+          note "Rolling back transaction"
+          FileUtils.rm_rf(Dir.pwd / "gems")
+          FileUtils.mv(Dir.pwd / ".original_gems", Dir.pwd / "gems")
+        end
+        exit!
+      end
+      
+      private
+      def _install(dep)
+        @idx.load_gems_in("gems/specifications")
+        return if @idx.search(dep).last
+        
+        installer = ::Gem::DependencyInstaller.new(
+          :bin_dir => Dir.pwd / "bin",
+          :install_dir => Dir.pwd / "gems",
+          :user_install => false)
+
+        begin
+          installer.install dep.name, dep.version_requirements
+        rescue ::Gem::GemNotFoundException => e
+          puts "Cannot find #{dep}"
+        rescue ::Gem::RemoteFetcher::FetchError => e
+          puts e.message
+          puts "Retrying..."
+          retry
+        end
+      end
+    end
+  end
+end

spec/integration/merb/tasks/merb.thor/utils.rb

@@ -0,0 +1,40 @@
+class String
+  def /(other)
+    (Pathname.new(self) + other).to_s
+  end
+end
+
+module ColorfulMessages
+  
+  # red
+  def error(*messages)
+    puts messages.map { |msg| "\033[1;31m#{msg}\033[0m" }
+  end
+  
+  # yellow
+  def warning(*messages)
+    puts messages.map { |msg| "\033[1;33m#{msg}\033[0m" }
+  end
+  
+  # green
+  def success(*messages)
+    puts messages.map { |msg| "\033[1;32m#{msg}\033[0m" }
+  end
+  
+  alias_method :message, :success
+  
+  # magenta
+  def note(*messages)
+    puts messages.map { |msg| "\033[1;35m#{msg}\033[0m" }
+  end
+  
+  # blue
+  def info(*messages)
+    puts messages.map { |msg| "\033[1;34m#{msg}\033[0m" }
+  end
+  
+end
+
+module ThorUI
+  extend ColorfulMessages
+end

spec/integration/rails/.gitignore

@@ -0,0 +1 @@
+vendor/plugins/webrat

spec/integration/rails/Rakefile

@@ -0,0 +1,10 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

spec/integration/rails/app/controllers/application.rb

@@ -0,0 +1,15 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+
+  # See ActionController::RequestForgeryProtection for details
+  # Uncomment the :secret if you're not using the cookie session store
+  protect_from_forgery # :secret => 'ceaca978d06f1c9db5c84193c1447572'
+  
+  # See ActionController::Base for details 
+  # Uncomment this to filter the contents of submitted sensitive data parameters
+  # from your application log (in this case, all fields with names like "password"). 
+  # filter_parameter_logging :password
+end

spec/integration/rails/app/controllers/webrat_controller.rb

@@ -0,0 +1,10 @@
+class WebratController < ApplicationController
+  
+  def form
+  end
+  
+  def submit
+    render :text => "OK"
+  end
+  
+end

spec/integration/rails/app/views/webrat/form.html.erb

@@ -0,0 +1,17 @@
+<h1>Webrat Form</h1>
+
+<% form_tag submit_path do %>
+  <label>
+    Text field <%= text_field_tag "text_field" %>
+  </label>
+  
+  <label>
+    TOS <%= check_box_tag "tos" %>
+  </label>
+  
+  <label>
+    <%= select_tag "month", "<option></option><option>January</option>" %>
+  </label>
+  
+  <%= submit_tag "Test" %>
+<% end %>

spec/integration/rails/config/boot.rb

@@ -0,0 +1,109 @@
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
+
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion rescue nil
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        require 'rubygems'
+        min_version = '1.3.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
+  end
+end
+
+# All that for this:
+Rails.boot!

spec/integration/rails/config/environment.rb

@@ -0,0 +1,75 @@
+# Be sure to restart your server when you modify this file
+
+# Uncomment below to force Rails into production mode when
+# you don't control web/app server and can't set it the proper way
+# ENV['RAILS_ENV'] ||= 'production'
+
+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
+Rails::Initializer.run do |config|
+  # Settings in config/environments/* take precedence over those specified here.
+  # Application configuration should go into files in config/initializers
+  # -- all .rb files in that directory are automatically loaded.
+  # See Rails::Configuration for more options.
+
+  # Skip frameworks you're not going to use. To use Rails without a database
+  # you must remove the Active Record framework.
+  config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+
+  # Specify gems that this application depends on. 
+  # They can then be installed with "rake gems:install" on new installations.
+  # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
+  # config.gem "bj"
+  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+  # config.gem "sqlite3-ruby", :lib => "sqlite3"
+  # config.gem "aws-s3", :lib => "aws/s3"
+
+  # Only load the plugins named here, in the order given. By default, all plugins 
+  # in vendor/plugins are loaded in alphabetical order.
+  # :all can be used as a placeholder for all plugins not explicitly named
+  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+  # Add additional load paths for your own custom dirs
+  # config.load_paths += %W( #{RAILS_ROOT}/extras )
+
+  # Force all environments to use the same logger level
+  # (by default production uses :info, the others :debug)
+  # config.log_level = :debug
+
+  # Make Time.zone default to the specified zone, and make Active Record store time values
+  # in the database in UTC, and return them converted to the specified local zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
+  config.time_zone = 'UTC'
+
+  # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
+  # All files from config/locales/*.rb,yml are added automatically.
+  # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
+  # config.i18n.default_locale = :de
+
+  # Your secret key for verifying cookie session data integrity.
+  # If you change this key, all old sessions will become invalid!
+  # Make sure the secret is at least 30 characters and all random, 
+  # no regular words or you'll be exposed to dictionary attacks.
+  config.action_controller.session = {
+    :session_key => '_rails_app_session',
+    :secret      => '81f33872c27349e86f1dc2cd6708995b9c26578e6e2d8992e567cd64d96e844343149f6e2f44bf178304141db9ce39e741e0e60699867c29c51c6d7ef7dc9556'
+  }
+
+  # Use the database for sessions instead of the cookie-based default,
+  # which shouldn't be used to store highly confidential information
+  # (create the session table with "rake db:sessions:create")
+  # config.action_controller.session_store = :active_record_store
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Activate observers that should always be running
+  # Please note that observers generated using script/generate observer need to have an _observer suffix
+  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+end

spec/integration/rails/config/environments/development.rb

@@ -0,0 +1,17 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
+# In the development environment your application's code is reloaded on
+# every request.  This slows down response time but is perfect for development
+# since you don't have to restart the webserver when you make code changes.
+config.cache_classes = false
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_view.debug_rjs                         = true
+config.action_controller.perform_caching             = false
+
+# Don't care if the mailer can't send
+config.action_mailer.raise_delivery_errors = false

spec/integration/rails/config/environments/test.rb

@@ -0,0 +1,22 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
+# The test environment is used exclusively to run your application's
+# test suite.  You never need to work with it otherwise.  Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs.  Don't rely on the data there!
+config.cache_classes = true
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test

spec/integration/rails/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format 
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

spec/integration/rails/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

spec/integration/rails/config/initializers/new_rails_defaults.rb

@@ -0,0 +1,17 @@
+# These settings change the behavior of Rails 2 apps and will be defaults
+# for Rails 3. You can remove this initializer when Rails 3 is released.
+
+if defined?(ActiveRecord)
+  # Include Active Record class name as root for JSON serialized output.
+  ActiveRecord::Base.include_root_in_json = true
+
+  # Store the full class name (including module namespace) in STI type column.
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false

spec/integration/rails/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

spec/integration/rails/config/routes.rb

@@ -0,0 +1,6 @@
+ActionController::Routing::Routes.draw do |map|
+  map.with_options :controller => "webrat" do |webrat|
+    webrat.submit "/submit",  :action => "submit"
+    webrat.root               :action => "form"
+  end
+end

spec/integration/rails/public/404.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+  <title>The page you were looking for doesn't exist (404)</title>
+	<style type="text/css">
+		body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+		div.dialog {
+			width: 25em;
+			padding: 0 4em;
+			margin: 4em auto 0 auto;
+			border: 1px solid #ccc;
+			border-right-color: #999;
+			border-bottom-color: #999;
+		}
+		h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+	</style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+</body>
+</html>

spec/integration/rails/public/422.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+  <title>The change you wanted was rejected (422)</title>
+	<style type="text/css">
+		body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+		div.dialog {
+			width: 25em;
+			padding: 0 4em;
+			margin: 4em auto 0 auto;
+			border: 1px solid #ccc;
+			border-right-color: #999;
+			border-bottom-color: #999;
+		}
+		h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+	</style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>

spec/integration/rails/public/500.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+  <title>We're sorry, but something went wrong (500)</title>
+	<style type="text/css">
+		body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+		div.dialog {
+			width: 25em;
+			padding: 0 4em;
+			margin: 4em auto 0 auto;
+			border: 1px solid #ccc;
+			border-right-color: #999;
+			border-bottom-color: #999;
+		}
+		h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+	</style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+    <p><small>(If you're the administrator of this website, then please read
+    the log file "<%=h RAILS_ENV %>.log"
+    to find out what went wrong.)</small></p>
+  </div>
+</body>
+</html>

spec/integration/rails/script/about

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
+require 'commands/about'

spec/integration/rails/script/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/console'

spec/integration/rails/script/dbconsole

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'

spec/integration/rails/script/destroy

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/destroy'

spec/integration/rails/script/generate

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/generate'

spec/integration/rails/script/performance/benchmarker

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/benchmarker'

spec/integration/rails/script/performance/profiler

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/profiler'

spec/integration/rails/script/performance/request

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/request'

spec/integration/rails/script/plugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/plugin'

spec/integration/rails/script/process/inspector

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'

spec/integration/rails/script/process/reaper

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/reaper'

spec/integration/rails/script/process/spawner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/spawner'

spec/integration/rails/script/runner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/runner'

spec/integration/rails/script/server

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/server'

spec/integration/rails/test/integration/webrat_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class WebratTest < ActionController::IntegrationTest
+  test "should visit pages" do
+    visit root_path
+    assert_tag "Webrat Form"
+    assert response.body.include?("Webrat Form")
+  end
+  
+  test "should submit forms" do
+    visit root_path
+    fill_in "Text field", :with => "Hello"
+    check "TOS"
+    select "January"
+    click_button "Test"
+  end
+end

spec/integration/rails/test/test_helper.rb

@@ -0,0 +1,21 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'test_help'
+require "redgreen"
+
+require "webrat"
+
+Webrat.configure do |config|
+  config.mode = :rails
+end
+
+ActionController::Base.class_eval do
+  def perform_action
+    perform_action_without_rescue
+  end
+end
+Dispatcher.class_eval do
+  def self.failsafe_response(output, status, exception = nil)
+    raise exception
+  end
+end

webrat.gemspec

@@ -4,11 +4,11 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2008-12-25}
+  s.date = %q{2008-12-29}
   s.description = %q{Webrat. Ruby Acceptance Testing for Web applications}
   s.email = %q{bryan@brynary.com}
   s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE.txt"]
-  s.files = ["History.txt", "install.rb", "MIT-LICENSE.txt", "README.rdoc", "Rakefile", "lib/webrat", "lib/webrat/core", "lib/webrat/core/configuration.rb", "lib/webrat/core/elements", "lib/webrat/core/elements/area.rb", "lib/webrat/core/elements/element.rb", "lib/webrat/core/elements/field.rb", "lib/webrat/core/elements/form.rb", "lib/webrat/core/elements/label.rb", "lib/webrat/core/elements/link.rb", "lib/webrat/core/elements/select_option.rb", "lib/webrat/core/locators", "lib/webrat/core/locators/area_locator.rb", "lib/webrat/core/locators/button_locator.rb", "lib/webrat/core/locators/field_by_id_locator.rb", "lib/webrat/core/locators/field_labeled_locator.rb", "lib/webrat/core/locators/field_locator.rb", "lib/webrat/core/locators/field_named_locator.rb", "lib/webrat/core/locators/form_locator.rb", "lib/webrat/core/locators/label_locator.rb", "lib/webrat/core/locators/link_locator.rb", "lib/webrat/core/locators/locator.rb", "lib/webrat/core/locators/select_option_locator.rb", "lib/webrat/core/locators.rb", "lib/webrat/core/logging.rb", "lib/webrat/core/matchers", "lib/webrat/core/matchers/have_content.rb", "lib/webrat/core/matchers/have_selector.rb", "lib/webrat/core/matchers/have_tag.rb", "lib/webrat/core/matchers/have_xpath.rb", "lib/webrat/core/matchers.rb", "lib/webrat/core/methods.rb", "lib/webrat/core/mime.rb", "lib/webrat/core/save_and_open_page.rb", "lib/webrat/core/scope.rb", "lib/webrat/core/session.rb", "lib/webrat/core/xml", "lib/webrat/core/xml/hpricot.rb", "lib/webrat/core/xml/nokogiri.rb", "lib/webrat/core/xml/rexml.rb", "lib/webrat/core/xml.rb", "lib/webrat/core.rb", "lib/webrat/core_extensions", "lib/webrat/core_extensions/blank.rb", "lib/webrat/core_extensions/deprecate.rb", "lib/webrat/core_extensions/detect_mapped.rb", "lib/webrat/core_extensions/hash_with_indifferent_access.rb", "lib/webrat/core_extensions/meta_class.rb", "lib/webrat/core_extensions/nil_to_param.rb", "lib/webrat/mechanize.rb", "lib/webrat/merb.rb", "lib/webrat/rack.rb", "lib/webrat/rails", "lib/webrat/rails/redirect_actions.rb", "lib/webrat/rails.rb", "lib/webrat/rspec-rails.rb", "lib/webrat/selenium", "lib/webrat/selenium/location_strategy_javascript", "lib/webrat/selenium/location_strategy_javascript/button.js", "lib/webrat/selenium/location_strategy_javascript/label.js", "lib/webrat/selenium/location_strategy_javascript/webrat.js", "lib/webrat/selenium/location_strategy_javascript/webratlink.js", "lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js", "lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js", "lib/webrat/selenium/matchers.rb", "lib/webrat/selenium/selenium_extensions.js", "lib/webrat/selenium/selenium_session.rb", "lib/webrat/selenium.rb", "lib/webrat/sinatra.rb", "lib/webrat.rb", "vendor/selenium-server.jar"]
+  s.files = ["History.txt", "install.rb", "MIT-LICENSE.txt", "README.rdoc", "Rakefile", "lib/webrat", "lib/webrat/core", "lib/webrat/core/configuration.rb", "lib/webrat/core/elements", "lib/webrat/core/elements/area.rb", "lib/webrat/core/elements/element.rb", "lib/webrat/core/elements/field.rb", "lib/webrat/core/elements/form.rb", "lib/webrat/core/elements/label.rb", "lib/webrat/core/elements/link.rb", "lib/webrat/core/elements/select_option.rb", "lib/webrat/core/locators", "lib/webrat/core/locators/area_locator.rb", "lib/webrat/core/locators/button_locator.rb", "lib/webrat/core/locators/field_by_id_locator.rb", "lib/webrat/core/locators/field_labeled_locator.rb", "lib/webrat/core/locators/field_locator.rb", "lib/webrat/core/locators/field_named_locator.rb", "lib/webrat/core/locators/form_locator.rb", "lib/webrat/core/locators/label_locator.rb", "lib/webrat/core/locators/link_locator.rb", "lib/webrat/core/locators/locator.rb", "lib/webrat/core/locators/select_option_locator.rb", "lib/webrat/core/locators.rb", "lib/webrat/core/logging.rb", "lib/webrat/core/matchers", "lib/webrat/core/matchers/have_content.rb", "lib/webrat/core/matchers/have_selector.rb", "lib/webrat/core/matchers/have_tag.rb", "lib/webrat/core/matchers/have_xpath.rb", "lib/webrat/core/matchers.rb", "lib/webrat/core/methods.rb", "lib/webrat/core/mime.rb", "lib/webrat/core/save_and_open_page.rb", "lib/webrat/core/scope.rb", "lib/webrat/core/session.rb", "lib/webrat/core/xml", "lib/webrat/core/xml/hpricot.rb", "lib/webrat/core/xml/nokogiri.rb", "lib/webrat/core/xml/rexml.rb", "lib/webrat/core/xml.rb", "lib/webrat/core.rb", "lib/webrat/core_extensions", "lib/webrat/core_extensions/blank.rb", "lib/webrat/core_extensions/deprecate.rb", "lib/webrat/core_extensions/detect_mapped.rb", "lib/webrat/core_extensions/hash_with_indifferent_access.rb", "lib/webrat/core_extensions/meta_class.rb", "lib/webrat/core_extensions/nil_to_param.rb", "lib/webrat/mechanize.rb", "lib/webrat/merb.rb", "lib/webrat/rack.rb", "lib/webrat/rails.rb", "lib/webrat/rspec-rails.rb", "lib/webrat/selenium", "lib/webrat/selenium/location_strategy_javascript", "lib/webrat/selenium/location_strategy_javascript/button.js", "lib/webrat/selenium/location_strategy_javascript/label.js", "lib/webrat/selenium/location_strategy_javascript/webrat.js", "lib/webrat/selenium/location_strategy_javascript/webratlink.js", "lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js", "lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js", "lib/webrat/selenium/matchers.rb", "lib/webrat/selenium/selenium_extensions.js", "lib/webrat/selenium/selenium_session.rb", "lib/webrat/selenium.rb", "lib/webrat/sinatra.rb", "lib/webrat.rb", "vendor/selenium-server.jar"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/brynary/webrat}
   s.require_paths = ["lib"]
@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.0.6"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.1.0"])
     else
-      s.add_dependency(%q<nokogiri>, [">= 1.0.6"])
+      s.add_dependency(%q<nokogiri>, [">= 1.1.0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 1.0.6"])
+    s.add_dependency(%q<nokogiri>, [">= 1.1.0"])
   end
 end