rails 1.1.0 → 1.1.1

data/lib/tasks/databases.rake

@@ -47,6 +47,7 @@ namespace :db do
           search_path = abcs[RAILS_ENV]["schema_search_path"]
           search_path = "--schema=#{search_path}" if search_path
           `pg_dump -i -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}`
+          raise "Error dumping database" if $?.exitstatus == 1
         when "sqlite", "sqlite3"
           dbfile = abcs[RAILS_ENV]["database"] || abcs[RAILS_ENV]["dbfile"]
           `#{abcs[RAILS_ENV]["adapter"]} #{dbfile} .schema > db/#{RAILS_ENV}_structure.sql`

data/lib/tasks/framework.rake

@@ -6,7 +6,7 @@ namespace :rails do
       require 'rubygems'
       Gem.manage_gems
 
-      rails = version = ENV['VERSION'] ?
+      rails = (version = ENV['VERSION']) ?
         Gem.cache.search('rails', "= #{version}").first :
         Gem.cache.search('rails').sort_by { |g| g.version }.last
 
@@ -32,7 +32,7 @@ namespace :rails do
       end
     end
 
-    desc "Lock this application to latest Edge Rails. Lock a specific revision with REVISION=X"
+    desc "Lock to latest Edge Rails or a specific revision with REVISION=X (ex: REVISION=4021) or a tag with TAG=Y (ex: TAG=rel_1-1-0)"
     task :edge do
       $verbose = false
       `svn --version` rescue nil
@@ -40,21 +40,28 @@ namespace :rails do
         $stderr.puts "ERROR: Must have subversion (svn) available in the PATH to lock this application to Edge Rails"
         exit 1
       end
-
-      rails_svn = 'http://dev.rubyonrails.org/svn/rails/trunk'
-
-      if ENV['REVISION'].nil?
-        ENV['REVISION'] = /^r(\d+)/.match(%x{svn log -q --limit 1 #{rails_svn}})[1]
-        puts "REVISION not set. Using HEAD, which is revision #{ENV['REVISION']}."
-      end
-
+            
       rm_rf   "vendor/rails"
       mkdir_p "vendor/rails"
+      
+      svn_root = "http://dev.rubyonrails.org/svn/rails/"
 
-      touch   "vendor/rails/REVISION_#{ENV['REVISION']}"
+      if ENV['TAG']
+        rails_svn = "#{svn_root}/tags/#{ENV['TAG']}"
+        touch "vendor/rails/TAG_#{ENV['TAG']}"
+      else
+        rails_svn = "#{svn_root}/trunk"
+
+        if ENV['REVISION'].nil?
+          ENV['REVISION'] = /^r(\d+)/.match(%x{svn -qr HEAD log #{svn_root}})[1]
+          puts "REVISION not set. Using HEAD, which is revision #{ENV['REVISION']}."
+        end
+
+        touch "vendor/rails/REVISION_#{ENV['REVISION']}"
+      end
       
       for framework in %w( railties actionpack activerecord actionmailer activesupport actionwebservice )
-        system "svn export #{rails_svn}/#{framework} vendor/rails/#{framework} -r #{ENV['REVISION']}"
+        system "svn export #{rails_svn}/#{framework} vendor/rails/#{framework}" + (ENV['REVISION'] ? " -r #{ENV['REVISION']}" : "")
       end
     end
   end

data/lib/tasks/tmp.rake

@@ -22,7 +22,7 @@ namespace :tmp do
   end
 
   namespace :sockets do
-    desc "Clears all ruby_sess.* files in tmp/sessions"
+    desc "Clears all files in tmp/sockets"
     task :clear do
       FileUtils.rm(Dir['tmp/sockets/[^.]*'])
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-03-27 00:00:00 -06:00
+  version: 1.1.1
+date: 2006-04-06 00:00:00 -05:00
 summary: Web-application framework with template engine, control-flow layer, and ORM.
 require_paths: 
 - lib
@@ -60,8 +60,10 @@ files:
 - bin/process/spawner
 - builtin/rails_info
 - builtin/rails_info/rails
+- builtin/rails_info/rails_info_controller.rb
 - builtin/rails_info/rails/info.rb
 - builtin/rails_info/rails/info_controller.rb
+- builtin/rails_info/rails/info_helper.rb
 - configs/apache.conf
 - configs/databases
 - configs/empty.log
@@ -109,9 +111,9 @@ files:
 - lib/dispatcher.rb
 - lib/fcgi_handler.rb
 - lib/initializer.rb
+- lib/rails
 - lib/rails_generator
 - lib/rails_generator.rb
-- lib/rails_version.rb
 - lib/railties_path.rb
 - lib/ruby_version_check.rb
 - lib/rubyprof_ext.rb
@@ -140,6 +142,7 @@ files:
 - lib/commands/process/spinner.rb
 - lib/commands/servers/lighttpd.rb
 - lib/commands/servers/webrick.rb
+- lib/rails/version.rb
 - lib/rails_generator/base.rb
 - lib/rails_generator/commands.rb
 - lib/rails_generator/generators
@@ -263,7 +266,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -272,7 +275,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -281,7 +284,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.14.0
+        version: 1.14.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -290,7 +293,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.12.0
+        version: 1.12.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -299,7 +302,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionwebservice
@@ -308,5 +311,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.1.1
     version: