[DRE-commits] [rails-3.2] 01/02: undo direct changes done by mistake
Antonio Terceiro
terceiro at moszumanska.debian.org
Sat Mar 29 17:32:19 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rails-3.2.
commit b888340797b304b39056e2877ed5503a42d668b8
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sat Mar 29 14:15:23 2014 -0300
undo direct changes done by mistake
---
actionpack/actionpack.gemspec | 4 ++--
activemodel/activemodel.gemspec | 2 +-
activerecord/activerecord.gemspec | 4 ++--
.../active_record/connection_adapters/mysql2_adapter.rb | 1 +
.../lib/active_record/connection_adapters/mysql_adapter.rb | 1 +
.../connection_adapters/postgresql_adapter.rb | 1 +
.../active_record/connection_adapters/sqlite3_adapter.rb | 1 +
railties/lib/rails/generators/app_base.rb | 14 ++++++++++++--
railties/lib/rails/tasks/tmp.rake | 14 +++++---------
9 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index f997b78..cd906c0 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', version)
s.add_dependency('activemodel', version)
s.add_dependency('rack-cache', '~> 1.2')
- s.add_dependency('builder', '~> 3.0')
+ s.add_dependency('builder', '~> 3.0.0')
s.add_dependency('rack', '~> 1.4.5')
s.add_dependency('rack-test', '~> 0.6.1')
s.add_dependency('journey', '~> 1.0.4')
- s.add_dependency('sprockets', '~> 2.2')
+ s.add_dependency('sprockets', '~> 2.2.1')
s.add_dependency('erubis', '~> 2.7.0')
s.add_development_dependency('tzinfo', '~> 0.3.29')
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index ce70370..a4f0836 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.add_dependency('activesupport', version)
- s.add_dependency('builder', '~> 3.0')
+ s.add_dependency('builder', '~> 3.0.0')
end
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index d0f7441..7e93d8a 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', version)
s.add_dependency('activemodel', version)
- s.add_dependency('arel', '~> 4.0')
- s.add_dependency('tzinfo', '~> 1.0')
+ s.add_dependency('arel', '~> 3.0.2')
+ s.add_dependency('tzinfo', '~> 0.3.29')
end
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 2157dd5..c690b98 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -1,5 +1,6 @@
require 'active_record/connection_adapters/abstract_mysql_adapter'
+gem 'mysql2', '~> 0.3.10'
require 'mysql2'
module ActiveRecord
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index c70cfc9..4850b68 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -2,6 +2,7 @@ require 'active_record/connection_adapters/abstract_mysql_adapter'
require 'active_record/connection_adapters/statement_pool'
require 'active_support/core_ext/hash/keys'
+gem 'mysql', '~> 2.8'
require 'mysql'
class Mysql
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 0db04ac..e98337e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -4,6 +4,7 @@ require 'active_record/connection_adapters/statement_pool'
require 'arel/visitors/bind_visitor'
# Make sure we're using pg high enough for PGResult#values
+gem 'pg', '~> 0.11'
require 'pg'
module ActiveRecord
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index b6b50db..11bb457 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -1,5 +1,6 @@
require 'active_record/connection_adapters/sqlite_adapter'
+gem 'sqlite3', '~> 1.3.5'
require 'sqlite3'
module ActiveRecord
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 16cb881..398319c 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -241,11 +241,21 @@ module Rails
def bundle_command(command)
say_status :run, "bundle #{command}"
- print `"#{Gem.ruby}" -rubygems /usr/bin/bundle #{command}`
+ # We are going to shell out rather than invoking Bundler::CLI.new(command)
+ # because `rails new` loads the Thor gem and on the other hand bundler uses
+ # its own vendored Thor, which could be a different version. Running both
+ # things in the same process is a recipe for a night with paracetamol.
+ #
+ # We use backticks and #print here instead of vanilla #system because it
+ # is easier to silence stdout in the existing test suite this way. The
+ # end-user gets the bundler commands called anyway, so no big deal.
+ #
+ # Thanks to James Tucker for the Gem tricks involved in this call.
+ print `"#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
end
def run_bundle
- bundle_command('install --local') unless options[:skip_gemfile] || options[:skip_bundle]
+ bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle]
end
def empty_directory_with_gitkeep(destination, config = {})
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 7a11902..0d6c103 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -4,38 +4,34 @@ namespace :tmp do
desc "Creates tmp directories for sessions, cache, sockets, and pids"
task :create do
- FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"sessions"))
- FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"cache"))
- FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"sockets"))
- FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"pids"))
- FileUtils.mkdir_p(File.join(Rails.configuration.paths["tmp"],"cache/assets"))
+ FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids tmp/cache/assets ))
end
namespace :sessions do
# desc "Clears all files in tmp/sessions"
task :clear do
- FileUtils.rm(Dir[File.join(Rails.configuration.paths["tmp"],'sessions/[^.]*')])
+ FileUtils.rm(Dir['tmp/sessions/[^.]*'])
end
end
namespace :cache do
# desc "Clears all files and directories in tmp/cache"
task :clear do
- FileUtils.rm_rf(Dir[File.join(Rails.configuration.paths["tmp"],'cache/[^.]*')])
+ FileUtils.rm_rf(Dir['tmp/cache/[^.]*'])
end
end
namespace :sockets do
# desc "Clears all files in tmp/sockets"
task :clear do
- FileUtils.rm(Dir[File.join(Rails.configuration.paths["tmp"],'sockets/[^.]*')])
+ FileUtils.rm(Dir['tmp/sockets/[^.]*'])
end
end
namespace :pids do
# desc "Clears all files in tmp/pids"
task :clear do
- FileUtils.rm(Dir[File.join(Rails.configuration.paths["tmp"],'pids/[^.]*')])
+ FileUtils.rm(Dir['tmp/pids/[^.]*'])
end
end
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails-3.2.git
More information about the Pkg-ruby-extras-commits
mailing list