vendor/plugins/wagn/init.rb @@ -3,38 +3,8 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot')) -# -namespace :db do - namespace :test do - desc 'Prepare the test database and load the schema' - task :prepare => :environment do - if defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank? - Rake::Task[{ :sql => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke - end - puts ">>loading test fixtures" - puts `rake db:fixtures:load RAILS_ENV=test` - end - end -end - require 'rake' require 'rake/testtask' require 'rake/rdoctask' -require 'tasks/rails' - - -namespace :db do - namespace :fixtures do - desc "Load fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y" - task :load => :environment do - require 'active_record/fixtures' - ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| - Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*')) - end - Rake::Task['wagn:prepare_fulltext'].invoke - end - end -end - +require 'tasks/rails' Rakefile @@ -1,56 +1,110 @@ -# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb +# Don't change this file! +# Configure your app in config/environment.rb and config/environments/*.rb -unless defined?(RAILS_ROOT) - root_path = File.join(File.dirname(__FILE__), '..') - unless RUBY_PLATFORM =~ /mswin32/ - require 'pathname' - root_path = Pathname.new(root_path).cleanpath(true).to_s - end +RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) - RAILS_ROOT = root_path -end +module Rails + class << self + def boot! + unless booted? + preinitialize + pick_boot.run + end + end -unless defined?(Rails::Initializer) - if File.directory?("#{RAILS_ROOT}/vendor/rails") - require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" - else - require 'rubygems' + def booted? + defined? Rails::Initializer + end + + def pick_boot + (vendor_rails? ? VendorBoot : GemBoot).new + end + + def vendor_rails? + File.exist?("#{RAILS_ROOT}/vendor/rails") + end - environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join - environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/ - rails_gem_version = $1 + # FIXME : Ruby 1.9 + def preinitialize + load(preinitializer_path) if File.exists?(preinitializer_path) + end + + def preinitializer_path + "#{RAILS_ROOT}/config/preinitializer.rb" + end + end + + class Boot + def run + load_initializer + Rails::Initializer.run(:set_load_path) + end + end + + class VendorBoot < Boot + def load_initializer + require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" + end + end - if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version - rails_gem = Gem.cache.search('rails', "=#{version}").first + class GemBoot < Boot + def load_initializer + self.class.load_rubygems + load_rails_gem + require 'initializer' + end - if rails_gem - require_gem "rails", "=#{version}" - require rails_gem.full_gem_path + '/lib/initializer' + def load_rails_gem + if version = self.class.gem_version + gem 'rails', version else - STDERR.puts %(Cannot find gem for Rails =#{version}: - Install the missing gem with 'gem install -v=#{version} rails', or - change environment.rb to define RAILS_GEM_VERSION with your desired version. - ) - exit 1 + gem 'rails' end - else - require_gem "rails" - require 'initializer' + rescue Gem::LoadError => load_error + $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.) + exit 1 end - end -module Rails - class Initializer - def set_load_path - configuration.load_paths.reverse.reject do |path| - #warn "EXAMINIT PATH #{path}" - path == "#{RAILS_ROOT}/app/models/card" - end.each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) } - $LOAD_PATH.uniq! + class << self + def rubygems_version + Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion + end + + def gem_version + if defined? RAILS_GEM_VERSION + RAILS_GEM_VERSION + elsif ENV.include?('RAILS_GEM_VERSION') + ENV['RAILS_GEM_VERSION'] + else + parse_gem_version(read_environment_rb) + end + end + + def load_rubygems + require 'rubygems' + + unless rubygems_version >= '0.9.4' + $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.) + exit 1 + end + + rescue LoadError + $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org) + exit 1 + end + + def parse_gem_version(text) + $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/ + end + + private + def read_environment_rb + File.read("#{RAILS_ROOT}/config/environment.rb") + end end end end - - Rails::Initializer.run(:set_load_path) -end \ No newline at end of file + +# All that for this: +Rails.boot! config/boot.rb @@ -8,11 +8,11 @@ require File.join(File.dirname(__FILE__), 'boot') # needs to be loaded for all files, before migrations, etc. -require "lib/wagn" - +#require "lib/wagn" + Rails::Initializer.run do |config| # Settings in config/environments/* take precedence those specified here - + RAILS_GEM_VERSION = '1.2.4' unless defined? RAILS_GEM_VERSION # Skip frameworks you're not going to use config.frameworks -= [ :action_web_service ] @@ -76,3 +76,4 @@ Session = CGI::Session::ActiveRecordStore.session_class System + config/environment.rb @@ -9,7 +9,7 @@ config.cache_classes = false config.whiny_nils = true # Enable the breakpoint server that script/breakpointer connects to -config.breakpoint_server = true +#config.breakpoint_server = true # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config/environments/development.rb @@ -122,7 +122,7 @@ class JumpToVersion109 < ActiveRecord::Migration t.column "link_type", :string, :limit => 1, :default => "", :null => false end - `rake wagn:load_bootstrap_data` + #`rake wagn:load_bootstrap_data` end db/migrate/001_jump_to_version_109.rb @@ -7,8 +7,9 @@ class Sandbox :securityViolationText, :syntaxErrorDetected, :syntaxErrorText, :sandboxOutput - def initialize(level = 2, maxRunTime = 10, + def initialize(level = 2, request=nil, maxRunTime = 10, maxThreadCount = 10, maxNewObjects = 10000) + @request = request @level = level @maxRunTime = maxRunTime @maxThreadCount = maxThreadCount @@ -74,7 +75,8 @@ class Sandbox end def starteInDerSandbox(exeCmd) - begin + begin + request = @request @sandboxOutput.value = eval(exeCmd, Object.module_eval("binding")) rescue SecurityError => detail @securityViolationDetected = true @@ -87,7 +89,8 @@ class Sandbox def fuehreAus(cmd) cmd.untaint - exeCmd = cmd + exeCmd = cmd + exeCmd = "$SAFE = #{@level}\n" + exeCmd starteWaechterThread # this is our BIG BROTHER @sandboxThreadGroup.add(@sandboxThread = lib/sandbox.rb @@ -1,8 +1,9 @@ +=begin task :compress_javascript => :environment do cmd = "cd #{RAILS_ROOT}/public/javascripts; " + - "cat #{JAVASCRIPT_FILES.join(" ")} > #{COMPRESSED_JS}.tmp; " + - "java -jar ../../lib/custom_rhino.jar -c #{COMPRESSED_JS}.tmp > #{COMPRESSED_JS}; " + - "rm #{COMPRESSED_JS}.tmp" + "cat #{Wagn.javascript_files.join(" ")} > #{Wagn.compressed_js}.tmp; " + + "java -jar ../../lib/custom_rhino.jar -c #{Wagn.compressed_js}.tmp > #{Wagn.compressed_js}; " + + "rm #{Wagn.compressed_js}.tmp" `#{cmd}` end @@ -19,4 +20,6 @@ task :compress_wadget => :environment do print "#{cmd}" end -task :test => [ :compress_javascript ] \ No newline at end of file +task :test => [ :compress_javascript ] + +=end \ No newline at end of file lib/tasks/javascript.rake @@ -2,8 +2,8 @@ require 'rubygems' require 'rake/testtask' require 'rake/rdoctask' require 'rake/gempackagetask' -require 'lib/wagn' -require 'lib/wagn/version' +#require 'lib/wagn' +#require 'lib/wagn/version' PKG_NAME = 'wagn' PKG_VERSION = Wagn::Version.to_s lib/tasks/release.rake cf29a45fab582472e3ba89f63ac802d791f11819 lhoffman lhoffman@ec9d8473-2c57-4e18-8d51-132f0e30f32e http://github.com/wagn/wagn/commit/5bf2de790b740bcb741133e972fbce0a5147f8ec 5bf2de790b740bcb741133e972fbce0a5147f8ec 2008-01-29T13:41:50-08:00 2008-01-29T13:41:50-08:00 move wagn ruby/rails extensions to plugin git-svn-id: svn+ssh://rubyforge.org/var/svn/wagn/trunk@484 ec9d8473-2c57-4e18-8d51-132f0e30f32e f5b9f29d31e0a526497dc46bce1432a8d221dfd5 lhoffman lhoffman@ec9d8473-2c57-4e18-8d51-132f0e30f32e