parent
2e3c9b6da5
commit
6aeefd1ef1
@ -1,2 +1,3 @@
|
||||
activesupport-2.3.5.gem
|
||||
activesupport-2.3.8.gem
|
||||
/activesupport-3.0.3.gem
|
||||
|
@ -1,175 +1,32 @@
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
require File.join(File.dirname(__FILE__), 'lib', 'active_support', 'version')
|
||||
|
||||
PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
|
||||
PKG_NAME = 'activesupport'
|
||||
PKG_VERSION = ActiveSupport::VERSION::STRING + PKG_BUILD
|
||||
PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
|
||||
|
||||
RELEASE_NAME = "REL #{PKG_VERSION}"
|
||||
|
||||
RUBY_FORGE_PROJECT = "activesupport"
|
||||
RUBY_FORGE_USER = "webster132"
|
||||
|
||||
task :default => :test
|
||||
Rake::TestTask.new { |t|
|
||||
t.libs << "test"
|
||||
Rake::TestTask.new do |t|
|
||||
t.libs << 'test'
|
||||
t.pattern = 'test/**/*_test.rb'
|
||||
t.verbose = true
|
||||
t.warning = true
|
||||
}
|
||||
t.verbose = true
|
||||
end
|
||||
|
||||
namespace :test do
|
||||
Rake::TestTask.new(:isolated) do |t|
|
||||
t.pattern = 'test/ts_isolated.rb'
|
||||
end
|
||||
end
|
||||
|
||||
# Create compressed packages
|
||||
dist_dirs = [ "lib", "test"]
|
||||
|
||||
# Genereate the RDoc documentation
|
||||
|
||||
Rake::RDocTask.new { |rdoc|
|
||||
rdoc.rdoc_dir = 'doc'
|
||||
rdoc.title = "Active Support -- Utility classes and standard library extensions from Rails"
|
||||
rdoc.options << '--line-numbers' << '--inline-source'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.rdoc_files.include('README', 'CHANGELOG')
|
||||
rdoc.rdoc_files.include('lib/active_support.rb')
|
||||
rdoc.rdoc_files.include('lib/active_support/**/*.rb')
|
||||
rdoc.rdoc_files.exclude('lib/active_support/vendor/*')
|
||||
}
|
||||
|
||||
spec = Gem::Specification.new do |s|
|
||||
s.platform = Gem::Platform::RUBY
|
||||
s.name = PKG_NAME
|
||||
s.version = PKG_VERSION
|
||||
s.summary = "Support and utility classes used by the Rails framework."
|
||||
s.description = %q{Utility library which carries commonly used classes and goodies from the Rails framework}
|
||||
|
||||
s.files = [ "CHANGELOG", "README" ] + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
|
||||
s.require_path = 'lib'
|
||||
s.has_rdoc = true
|
||||
|
||||
s.author = "David Heinemeier Hansson"
|
||||
s.email = "david@loudthinking.com"
|
||||
s.homepage = "http://www.rubyonrails.org"
|
||||
s.rubyforge_project = "activesupport"
|
||||
end
|
||||
spec = eval(File.read('activesupport.gemspec'))
|
||||
|
||||
Rake::GemPackageTask.new(spec) do |p|
|
||||
p.gem_spec = spec
|
||||
p.need_tar = true
|
||||
p.need_zip = true
|
||||
end
|
||||
|
||||
desc "Publish the beta gem"
|
||||
task :pgem => [:package] do
|
||||
require 'rake/contrib/sshpublisher'
|
||||
Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
|
||||
`ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
|
||||
end
|
||||
|
||||
desc "Publish the API documentation"
|
||||
task :pdoc => [:rdoc] do
|
||||
require 'rake/contrib/sshpublisher'
|
||||
Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/as", "doc").upload
|
||||
end
|
||||
|
||||
desc "Publish the release files to RubyForge."
|
||||
task :release => [ :package ] do
|
||||
require 'rubyforge'
|
||||
require 'rake/contrib/rubyforgepublisher'
|
||||
|
||||
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
|
||||
|
||||
namespace :tzinfo do
|
||||
desc "Update bundled tzinfo gem. Only copies the subset of classes and definitions required to support Rails time zone features."
|
||||
task :update => ['tzinfo:copy_classes', 'tzinfo:copy_definitions'] do
|
||||
Rake::Task['tzinfo:cleanup_tmp'].invoke
|
||||
end
|
||||
|
||||
task :unpack_gem do
|
||||
mkdir_p "tmp"
|
||||
cd "tmp"
|
||||
sh "gem unpack --version #{ENV['VERSION'] || "'> 0'"} tzinfo"
|
||||
cd ".."
|
||||
end
|
||||
|
||||
task :copy_classes => :unpack_gem do
|
||||
mkdir_p "#{destination_path}/tzinfo"
|
||||
cp "#{tmp_path}/lib/tzinfo.rb", destination_path
|
||||
comment_requires_for_excluded_classes!('tzinfo.rb')
|
||||
files = FileList["#{tmp_path}/lib/tzinfo/*.rb"]
|
||||
files.each do |file|
|
||||
filename = File.basename(file)
|
||||
unless excluded_classes.include? filename.sub(/.rb$/, '')
|
||||
cp "#{tmp_path}/lib/tzinfo/#{filename}", "#{destination_path}/tzinfo"
|
||||
comment_requires_for_excluded_classes!("tzinfo/#{filename}")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
task :copy_definitions => :unpack_gem do
|
||||
$:.unshift "#{File.dirname(__FILE__)}/lib"
|
||||
require 'active_support/values/time_zone'
|
||||
definitions_path = "#{destination_path}/tzinfo/definitions/"
|
||||
mkdir_p definitions_path
|
||||
ActiveSupport::TimeZone::MAPPING.values.each do |zone|
|
||||
subdir = nil
|
||||
if /\// === zone
|
||||
subdir = zone.sub(/\w+$/, '')
|
||||
mkdir_p "#{definitions_path}/#{subdir}"
|
||||
end
|
||||
cp "#{tmp_path}/lib/tzinfo/definitions/#{zone}.rb", "#{definitions_path}/#{subdir}"
|
||||
end
|
||||
end
|
||||
|
||||
task :cleanup_tmp do
|
||||
rm_rf "tmp"
|
||||
end
|
||||
|
||||
def comment_requires_for_excluded_classes!(file)
|
||||
lines = open("#{destination_path}/#{file}") {|f| f.readlines}
|
||||
updated = false
|
||||
|
||||
new_lines = []
|
||||
lines.each do |line|
|
||||
if Regexp.new("require 'tzinfo/(#{excluded_classes.join('|')})'") === line
|
||||
updated = true
|
||||
new_lines << "# #{line}"
|
||||
else
|
||||
new_lines << line
|
||||
end
|
||||
end
|
||||
|
||||
if updated
|
||||
open("#{destination_path}/#{file}", "w") {|f| f.write(new_lines.join)}
|
||||
end
|
||||
end
|
||||
|
||||
def version
|
||||
ENV['VERSION'] ||= get_unpacked_version
|
||||
end
|
||||
|
||||
def get_unpacked_version
|
||||
m = (FileList["tmp/tzinfo-*"].to_s.match /\d+\.\d+\.\d+/)
|
||||
m ? m[0] : raise(LoadError, "TZInfo gem must be installed locally. `gem install tzinfo` and try again")
|
||||
end
|
||||
|
||||
def tmp_path
|
||||
"tmp/tzinfo-#{version}"
|
||||
end
|
||||
|
||||
def destination_path
|
||||
"lib/active_support/vendor/tzinfo-#{version}"
|
||||
end
|
||||
|
||||
def excluded_classes
|
||||
%w(country country_index_definition country_info country_timezone timezone_index_definition timezone_proxy tzdataparser)
|
||||
end
|
||||
desc "Release to gemcutter"
|
||||
task :release => :package do
|
||||
require 'rake/gemcutter'
|
||||
Rake::Gemcutter::Tasks.new(spec).define
|
||||
Rake::Task['gem:push'].invoke
|
||||
end
|
||||
|
Binary file not shown.
@ -0,0 +1,15 @@
|
||||
--- Rakefile.orig 2011-01-10 16:26:22.397963520 -0500
|
||||
+++ Rakefile 2011-01-10 16:26:28.015963421 -0500
|
||||
@@ -18,12 +18,6 @@ end
|
||||
# Create compressed packages
|
||||
dist_dirs = [ "lib", "test"]
|
||||
|
||||
-spec = eval(File.read('activesupport.gemspec'))
|
||||
-
|
||||
-Rake::GemPackageTask.new(spec) do |p|
|
||||
- p.gem_spec = spec
|
||||
-end
|
||||
-
|
||||
desc "Release to gemcutter"
|
||||
task :release => :package do
|
||||
require 'rake/gemcutter'
|
@ -0,0 +1,67 @@
|
||||
--- test/abstract_unit.rb.orig 2011-02-02 12:38:56.766898240 -0500
|
||||
+++ test/abstract_unit.rb 2011-02-02 12:38:55.397898289 -0500
|
||||
@@ -34,12 +34,16 @@ require 'active_support'
|
||||
require 'active_support/ruby/shim' if RUBY_VERSION < '1.8.7'
|
||||
|
||||
def uses_memcached(test_name)
|
||||
- require 'memcache'
|
||||
begin
|
||||
- MemCache.new('localhost:11211').stats
|
||||
- yield
|
||||
- rescue MemCache::MemCacheError
|
||||
- $stderr.puts "Skipping #{test_name} tests. Start memcached and try again."
|
||||
+ require 'memcache'
|
||||
+ begin
|
||||
+ MemCache.new('localhost:11211').stats
|
||||
+ yield
|
||||
+ rescue MemCache::MemCacheError
|
||||
+ $stderr.puts "Skipping #{test_name} tests. Start memcached and try again."
|
||||
+ end
|
||||
+ rescue LoadError
|
||||
+ $stderr.puts "Skipping #{test_name} tests. Install memcache-client and try again."
|
||||
end
|
||||
end
|
||||
|
||||
--- test/caching_test.rb.orig 2011-02-02 12:39:05.979900964 -0500
|
||||
+++ test/caching_test.rb 2011-02-02 12:41:10.089899015 -0500
|
||||
@@ -59,40 +59,6 @@ class CacheStoreSettingTest < ActiveSupp
|
||||
assert_equal "/path/to/cache/directory", store.cache_path
|
||||
end
|
||||
|
||||
- def test_mem_cache_fragment_cache_store
|
||||
- MemCache.expects(:new).with(%w[localhost], {})
|
||||
- store = ActiveSupport::Cache.lookup_store :mem_cache_store, "localhost"
|
||||
- assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
|
||||
- end
|
||||
-
|
||||
- def test_mem_cache_fragment_cache_store_with_given_mem_cache
|
||||
- mem_cache = MemCache.new
|
||||
- MemCache.expects(:new).never
|
||||
- store = ActiveSupport::Cache.lookup_store :mem_cache_store, mem_cache
|
||||
- assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
|
||||
- end
|
||||
-
|
||||
- def test_mem_cache_fragment_cache_store_with_given_mem_cache_like_object
|
||||
- MemCache.expects(:new).never
|
||||
- memcache = Object.new
|
||||
- def memcache.get() true end
|
||||
- store = ActiveSupport::Cache.lookup_store :mem_cache_store, memcache
|
||||
- assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
|
||||
- end
|
||||
-
|
||||
- def test_mem_cache_fragment_cache_store_with_multiple_servers
|
||||
- MemCache.expects(:new).with(%w[localhost 192.168.1.1], {})
|
||||
- store = ActiveSupport::Cache.lookup_store :mem_cache_store, "localhost", '192.168.1.1'
|
||||
- assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
|
||||
- end
|
||||
-
|
||||
- def test_mem_cache_fragment_cache_store_with_options
|
||||
- MemCache.expects(:new).with(%w[localhost 192.168.1.1], { :timeout => 10 })
|
||||
- store = ActiveSupport::Cache.lookup_store :mem_cache_store, "localhost", '192.168.1.1', :namespace => 'foo', :timeout => 10
|
||||
- assert_kind_of(ActiveSupport::Cache::MemCacheStore, store)
|
||||
- assert_equal 'foo', store.options[:namespace]
|
||||
- end
|
||||
-
|
||||
def test_object_assigned_fragment_cache_store
|
||||
store = ActiveSupport::Cache.lookup_store ActiveSupport::Cache::FileStore.new("/path/to/cache/directory")
|
||||
assert_kind_of(ActiveSupport::Cache::FileStore, store)
|
@ -0,0 +1,11 @@
|
||||
--- test/abstract_unit.rb.orig 2011-01-10 16:57:45.486962914 -0500
|
||||
+++ test/abstract_unit.rb 2011-01-10 16:57:52.306963241 -0500
|
||||
@@ -2,7 +2,7 @@ ORIG_ARGV = ARGV.dup
|
||||
|
||||
begin
|
||||
old, $VERBOSE = $VERBOSE, nil
|
||||
- require File.expand_path('../../../load_paths', __FILE__)
|
||||
+ require 'rubygems'
|
||||
ensure
|
||||
$VERBOSE = old
|
||||
end
|
Binary file not shown.
Loading…
Reference in new issue