rails 1.2.2 → 1.2.3

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.2.3* (March 12th, 2007)
+
+* Ruby 1.8.6 compatibility
+
+* Windows: include MinGW in RUBY_PLATFORM check.  #2982 [okkez000@gmail.com, Kaspar Schiess]
+
+* Stop swallowing errors during rake test [Koz]
+
+
 *1.2.2* (February 5th, 2007)
 
 * Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]

data/Rakefile

@@ -287,12 +287,12 @@ spec = Gem::Specification.new do |s|
     on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
   EOF
 
-  s.add_dependency('rake', '>= 0.7.1')
-  s.add_dependency('activesupport',    '= 1.4.1' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.15.2' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.13.2' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 1.3.2' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 1.2.2' + PKG_BUILD)
+  s.add_dependency('rake', '>= 0.7.2')
+  s.add_dependency('activesupport',    '= 1.4.2' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.15.3' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.13.3' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 1.3.3' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 1.2.3' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -323,9 +323,12 @@ task :pgem => [:gem] do
 end
 
 desc "Publish the release files to RubyForge."
-task :release => [ :gem ] do
-  `rubyforge login`
-  release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.gem"
-  puts release_command
-  system(release_command)
-end
+task :release => [ :package ] do
+  require 'rubyforge'
+
+  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
+
+  rubyforge = RubyForge.new
+  rubyforge.login
+  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
+end

data/environments/boot.rb

@@ -3,7 +3,7 @@
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
 
-  unless RUBY_PLATFORM =~ /mswin32/
+  unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
     require 'pathname'
     root_path = Pathname.new(root_path).cleanpath(true).to_s
   end
@@ -42,4 +42,4 @@ unless defined?(Rails::Initializer)
   end
 
   Rails::Initializer.run(:set_load_path)
-end
+end

data/lib/commands/console.rb

@@ -1,4 +1,4 @@
-irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
 require 'optparse'
 options = { :sandbox => false, :irb => irb }

data/lib/commands/plugin.rb

@@ -240,11 +240,12 @@ class Plugin
     def install_using_http(options = {})
       root = rails_env.root
       mkdir_p "#{root}/vendor/plugins"
-      Dir.chdir "#{root}/vendor/plugins"
-      puts "fetching from '#{uri}'" if $verbose
-      fetcher = RecursiveHTTPFetcher.new(uri)
-      fetcher.quiet = true if options[:quiet]
-      fetcher.fetch
+      Dir.chdir "#{root}/vendor/plugins" do
+        puts "fetching from '#{uri}'" if $verbose
+        fetcher = RecursiveHTTPFetcher.new(uri)
+        fetcher.quiet = true if options[:quiet]
+        fetcher.fetch
+      end
     end
 
     def svn_command(cmd, options = {})

data/lib/commands/process/inspector.rb

@@ -1,6 +1,6 @@
 require 'optparse'
 
-if RUBY_PLATFORM =~ /mswin32/ then abort("Inspector is only for Unix") end
+if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Inspector is only for Unix") end
 
 OPTIONS = {
   :pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
@@ -65,4 +65,4 @@ ARGV.options do |opts|
   opts.parse!
 end
 
-Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])
+Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])

data/lib/commands/process/reaper.rb

@@ -2,7 +2,7 @@ require 'optparse'
 require 'net/http'
 require 'uri'
 
-if RUBY_PLATFORM =~ /mswin32/ then abort("Reaper is only for Unix") end
+if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Reaper is only for Unix") end
 
 class Killer
   class << self

data/lib/commands/process/spawner.rb

@@ -92,7 +92,7 @@ server = case ARGV.first
   else
     if defined?(Mongrel)
       "mongrel"
-    elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
+    elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
       "fcgi"
     end
 end
@@ -206,4 +206,4 @@ if OPTIONS[:repeat]
   end
 else
   spawner_class.spawn_all
-end
+end

data/lib/commands/server.rb

@@ -19,7 +19,7 @@ server = case ARGV.first
   else
     if defined?(Mongrel)
       "mongrel"
-    elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
+    elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
       "lighttpd"
     else
       "webrick"

data/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -109,7 +109,7 @@ class AppGenerator < Rails::Generator::Base
     end
 
     def mysql_socket_location
-      RUBY_PLATFORM =~ /mswin32/ ? MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } : nil
+      MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
     end
 
 

data/lib/tasks/testing.rake

@@ -30,7 +30,7 @@ end
 module Kernel
   def silence_stderr
     old_stderr = STDERR.dup
-    STDERR.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+    STDERR.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
     STDERR.sync = true
     yield
   ensure
@@ -40,14 +40,17 @@ end
 
 desc 'Test all units and functionals'
 task :test do
-  Rake::Task["test:units"].invoke       rescue got_error = true
-  Rake::Task["test:functionals"].invoke rescue got_error = true
+  exceptions = ["test:units", "test:functionals", "test:integration"].collect do |task|
+    begin
+      Rake::Task[task].invoke
+      nil
+    rescue => e
+      e
+    end
+  end.compact
   
-  if File.exist?("test/integration")
-    Rake::Task["test:integration"].invoke rescue got_error = true
-  end
-
-  raise "Test failures" if got_error
+  exceptions.each {|e| puts e;puts e.backtrace }
+  raise "Test failures" unless exceptions.empty?
 end
 
 namespace :test do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2007-02-06 00:00:00 -06:00
+  version: 1.2.3
+date: 2007-03-13 00:00:00 -05:00
 summary: Web-application framework with template engine, control-flow layer, and ORM.
 require_paths: 
 - lib
@@ -41,7 +41,6 @@ files:
 - html
 - lib
 - MIT-LICENSE
-- pkg
 - Rakefile
 - README
 - bin/about
@@ -308,7 +307,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.7.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -317,7 +316,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.1
+        version: 1.4.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -326,7 +325,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.15.2
+        version: 1.15.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -335,7 +334,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.13.2
+        version: 1.13.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -344,7 +343,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.2
+        version: 1.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionwebservice
@@ -353,5 +352,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.2.3
     version: