From be19ffbbeddc1516b859abf26d026843cdd157ce Mon Sep 17 00:00:00 2001
From: Jacques Crocker <railsjedi@gmail.com>
Date: Sun, 25 Jul 2010 17:42:11 -0700
Subject: [PATCH] Updating RSpec to beta 18 (textmate support w00t!). Also
 checking in Gemfile.lock, as Yehuda will be mad at us if we dont ;-).

---
 .gitignore   |   5 +-
 Gemfile      |   2 +-
 Gemfile.lock | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 264 insertions(+), 3 deletions(-)
 create mode 100644 Gemfile.lock

diff --git a/.gitignore b/.gitignore
index 4b9982f4..1971d097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .bundle
-Gemfile.lock
 db/*.sqlite3
 log/*.log
 tmp/**/*
@@ -22,4 +21,6 @@ doc/production.sh
 doc/DONE
 *.gem
 tmp/*
-.rvmrc
\ No newline at end of file
+.rvmrc
+Capfile
+config/deploy.rb
diff --git a/Gemfile b/Gemfile
index 322ec518..0199ff26 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ group :test, :development do
 end
 
 group :test do
-  gem 'rspec-rails', '2.0.0.beta.11'
+  gem 'rspec-rails', '2.0.0.beta.18'
   gem 'factory_girl_rails'
   gem 'capybara'
   gem 'cucumber'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000..e51409c8
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,260 @@
+GIT
+  remote: git://github.com/floehopper/mocha.git
+  revision: d1715ff
+  specs:
+    mocha (0.9.8.20090918115329)
+      rake
+
+GIT
+  remote: http://github.com/justinfrench/formtastic.git
+  revision: e7e29b6
+  branch: rails3
+  specs:
+    formtastic (1.0.0.beta2)
+      actionpack (>= 2.3.0)
+      activesupport (>= 2.3.0)
+      i18n (>= 0.4.0)
+
+GEM
+  remote: http://gemcutter.org/
+  remote: http://gems.github.com/
+  specs:
+    RedCloth (4.2.3)
+    abstract (1.0.0)
+    actionmailer (3.0.0.beta4)
+      actionpack (= 3.0.0.beta4)
+      mail (~> 2.2.3)
+    actionmailer-with-request (0.1.1)
+    actionpack (3.0.0.beta4)
+      activemodel (= 3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.5)
+      i18n (~> 0.4.1)
+      rack (~> 1.1.0)
+      rack-mount (~> 0.6.3)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.16)
+    activemodel (3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0.beta4)
+      activemodel (= 3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      arel (~> 0.4.0)
+      tzinfo (~> 0.3.16)
+    activeresource (3.0.0.beta4)
+      activemodel (= 3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+    activesupport (3.0.0.beta4)
+    arel (0.4.0)
+      activesupport (>= 3.0.0.beta)
+    aws (2.3.13)
+      http_connection
+      uuidtools
+      xml-simple
+    bson (1.0.4)
+    bson_ext (1.0.4)
+    builder (2.1.2)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+    carrierwave-rails3 (0.4.5)
+    cgi_multipart_eof_fix (2.5.0)
+    columnize (0.3.1)
+    configuration (1.1.0)
+    crack (0.1.7)
+    cucumber (0.8.5)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.1.4)
+      json_pure (~> 1.4.3)
+      term-ansicolor (~> 1.0.4)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.10)
+    daemons (1.1.0)
+    devise (1.1.rc1)
+      warden (~> 0.10.3)
+    diff-lcs (1.1.2)
+    durran-validatable (2.0.1)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    factory_girl (1.3.1)
+    factory_girl_rails (1.0)
+      factory_girl (~> 1.3)
+      rails (>= 3.0.0.beta4)
+    fastthread (1.0.7)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gem_plugin (0.2.3)
+    gemcutter (0.6.1)
+    gherkin (2.1.5)
+      trollop (~> 1.16.2)
+    git (1.2.5)
+    haml (3.0.13)
+    has_scope (0.5.0)
+    heroku (1.9.11)
+      json_pure (>= 1.2.0, < 1.5.0)
+      launchy (~> 0.3.2)
+      rest-client (~> 1.4.0)
+    http_connection (1.3.0)
+    httparty (0.6.0)
+      crack (= 0.1.7)
+    i18n (0.4.1)
+    inherited_resources (1.1.2)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6.0)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.3)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    leshill-will_paginate (2.3.11)
+    linecache (0.43)
+    liquid (2.0.0)
+    mail (2.2.5)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    mimetype-fu (0.1.2)
+    mongo (1.0.5)
+      bson (>= 1.0.4)
+    mongo_ext (0.19.3)
+    mongo_session_store (2.0.0.pre)
+      actionpack (~> 3.0)
+    mongoid (1.0.6)
+      activesupport (>= 2.2.2)
+      durran-validatable (>= 2.0.1)
+      leshill-will_paginate (>= 2.3.11)
+      mongo (>= 0.18.2)
+    mongoid-locomotive (2.0.0.beta9)
+      activemodel (~> 3.0.0.beta)
+      bson (~> 1.0.4)
+      bson_ext (~> 1.0.4)
+      bundler
+      mongo (~> 1.0.5)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    mongoid_acts_as_tree (0.1.5)
+      bson (>= 0.20.1)
+      mongoid (<= 2.0.0)
+    mongrel (1.1)
+      cgi_multipart_eof_fix (>= 2.4)
+      daemons (>= 1.0.3)
+      fastthread (>= 1.0.1)
+      gem_plugin (>= 0.2.3)
+    mongrel_experimental (1.1)
+      mongrel (= 1.1)
+    nokogiri (1.4.2)
+    polyglot (0.3.1)
+    rack (1.1.0)
+    rack-mount (0.6.9)
+      rack (>= 1.0.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rails (3.0.0.beta4)
+      actionmailer (= 3.0.0.beta4)
+      actionpack (= 3.0.0.beta4)
+      activerecord (= 3.0.0.beta4)
+      activeresource (= 3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      bundler (>= 0.9.26)
+      railties (= 3.0.0.beta4)
+    railties (3.0.0.beta4)
+      actionpack (= 3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      rake (>= 0.8.3)
+      thor (~> 0.13.6)
+    rake (0.8.7)
+    responders (0.6.1)
+    rest-client (1.4.2)
+      mime-types (>= 1.16)
+    rmagick (2.12.2)
+    rspec (2.0.0.beta.18)
+      rspec-core (= 2.0.0.beta.18)
+      rspec-expectations (= 2.0.0.beta.18)
+      rspec-mocks (= 2.0.0.beta.18)
+    rspec-core (2.0.0.beta.18)
+    rspec-expectations (2.0.0.beta.18)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.18)
+    rspec-rails (2.0.0.beta.18)
+      rspec (>= 2.0.0.beta.14)
+      webrat (>= 0.7.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.0.26)
+      ffi (>= 0.6.1)
+      json_pure
+      rubyzip
+    spork (0.8.4)
+    term-ansicolor (1.0.5)
+    thor (0.13.8)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    trollop (1.16.2)
+    tzinfo (0.3.22)
+    uuidtools (2.1.1)
+    warden (0.10.7)
+      rack (>= 1.0.0)
+    webrat (0.7.1)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    will_paginate (3.0.pre)
+    xml-simple (1.0.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  actionmailer-with-request
+  aws
+  bson_ext (>= 1.0.1)
+  capybara
+  carrierwave-rails3
+  cgi_multipart_eof_fix
+  cucumber
+  cucumber-rails
+  devise (= 1.1.rc1)
+  factory_girl_rails
+  fastthread
+  formtastic!
+  haml (= 3.0.13)
+  heroku
+  httparty (= 0.6.0)
+  inherited_resources (= 1.1.2)
+  jeweler
+  launchy
+  liquid (= 2.0.0)
+  mimetype-fu
+  mocha!
+  mongo_ext
+  mongo_session_store (= 2.0.0.pre)
+  mongoid-locomotive
+  mongoid_acts_as_tree (= 0.1.5)
+  mongrel
+  mongrel_experimental
+  rails (= 3.0.0.beta4)
+  rmagick (= 2.12.2)
+  rspec-rails (= 2.0.0.beta.18)
+  ruby-debug
+  spork
+  warden