diff options
author | mguetlein <martin.guetlein@gmail.com> | 2010-09-02 16:32:07 +0200 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2010-09-02 16:32:07 +0200 |
commit | 95ac5d0b0f79fe3fb20b380e6aec2e2e64f329ef (patch) | |
tree | a46f8929c88c22de553a7eb5f5c04c41a93c20f8 | |
parent | f04a500388557a34d782c5310c009f559e47d046 (diff) |
fix activerecord version, improve rake init script
-rw-r--r-- | Rakefile | 27 | ||||
-rw-r--r-- | lib/active_record_setup.rb | 6 | ||||
-rw-r--r-- | report/environment.rb | 7 | ||||
-rw-r--r-- | validation/validation_application.rb | 7 |
4 files changed, 30 insertions, 17 deletions
@@ -1,23 +1,32 @@ require 'rubygems' require 'rake' -REPORT_GEMS = ['rubygems', 'logger', 'fileutils', 'sinatra', 'sinatra/url_for', 'rest_client', - 'yaml', 'opentox-ruby-api-wrapper', 'fileutils', 'mime/types', 'abbrev', - 'rexml/document', 'active_record', 'ar-extensions', 'ruby-plot'] -VALIDATION_GEMS = [ 'rubygems', 'sinatra', 'sinatra/url_for', 'opentox-ruby-api-wrapper', 'logger', 'active_record', 'ar-extensions' ] - +REPORT_GEMS = [ 'opentox-ruby-api-wrapper', 'mime-types', 'activerecord', 'activesupport', 'ar-extensions', 'ruby-plot'] +VALIDATION_GEMS = [ 'opentox-ruby-api-wrapper', 'activerecord', 'activesupport', 'ar-extensions', 'ruby-plot'] +GEM_VERSIONS = { "activerecord" => "= 2.3.8", "activesupport" => "= 2.3.8", "ar-extensions" => "= 0.9.2", "ruby-plot" => "= 0.0.2" } +# this is needed because otherwihse ar-extensions adds activesupport 3.0.0 which confuses things +GEM_INSTALL_OPTIONS = { "ar-extensions" => "--ignore-dependencies" } desc "Install required gems" task :install_gems do (REPORT_GEMS + VALIDATION_GEMS).uniq.each do |g| begin - print "> require "+g+" .. " - require g + if GEM_VERSIONS.has_key?(g) + print "> gem "+g+", '"+GEM_VERSIONS[g]+"' .. " + gem g, GEM_VERSIONS[g] + else + print "> gem "+g+" .. " + gem g + end puts "ok" rescue LoadError => ex puts "NOT FOUND" - cmd = "sudo env PATH=$PATH gem install "+g + options = "" + options += "--version '"+GEM_VERSIONS[g]+"' " if GEM_VERSIONS.has_key?(g) + options += GEM_INSTALL_OPTIONS[g]+" " if GEM_INSTALL_OPTIONS.has_key?(g) + cmd = "sudo env PATH=$PATH gem install "+options+" "+g + puts "installing gem, this may take some time..." puts cmd IO.popen(cmd){ |f| puts f.gets } end @@ -61,7 +70,7 @@ end desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x" task :migrate => :load_config do - require 'active_record' + [ 'rubygems', 'active_record', 'logger' ].each{ |l| require l } ActiveRecord::Base.establish_connection( :adapter => @@config[:database][:adapter], :host => @@config[:database][:host], diff --git a/lib/active_record_setup.rb b/lib/active_record_setup.rb index 9fc99df..85690b6 100644 --- a/lib/active_record_setup.rb +++ b/lib/active_record_setup.rb @@ -1,4 +1,6 @@ +gem "activerecord", "= 2.3.8" +gem "ar-extensions", "= 0.9.2" ['rubygems', 'logger', 'active_record', 'ar-extensions', 'opentox-ruby-api-wrapper' ].each do |g| require g end @@ -17,7 +19,7 @@ end class ActiveRecord::Base def self.find_like(filter_params) - puts "params before "+filter_params.inspect + #puts "params before "+filter_params.inspect filter_params.keys.each do |k| key = k.to_s unless self.column_names.include?(key) @@ -32,7 +34,7 @@ class ActiveRecord::Base end filter_params[key+"_like"] = filter_params.delete(k) end - puts "params after "+filter_params.inspect + #puts "params after "+filter_params.inspect self.find(:all, :conditions => filter_params) end end
\ No newline at end of file diff --git a/report/environment.rb b/report/environment.rb index e04c397..f2bbe66 100644 --- a/report/environment.rb +++ b/report/environment.rb @@ -1,7 +1,7 @@ ['rubygems', 'logger', 'fileutils', 'sinatra', 'sinatra/url_for', 'rest_client', 'yaml', 'fileutils', 'mime/types', 'abbrev', - 'rexml/document', 'ruby-plot', 'active_record', 'ar-extensions', 'opentox-ruby-api-wrapper' ].each do |g| + 'rexml/document', 'ruby-plot', 'opentox-ruby-api-wrapper' ].each do |g| require g end gem 'ruby-plot', '= 0.0.2' @@ -9,6 +9,9 @@ gem 'ruby-plot', '= 0.0.2' module Reports end +require "lib/ot_predictions.rb" +require "lib/active_record_setup.rb" + require "report/plot_factory.rb" require "report/xml_report.rb" require "report/xml_report_util.rb" @@ -21,8 +24,6 @@ require "report/validation_data.rb" require "report/util.rb" require "report/external/mimeparse.rb" -require "lib/ot_predictions.rb" -require "lib/active_record_setup.rb" diff --git a/validation/validation_application.rb b/validation/validation_application.rb index 2da9694..7ba968f 100644 --- a/validation/validation_application.rb +++ b/validation/validation_application.rb @@ -1,12 +1,13 @@ -[ 'rubygems', 'sinatra', 'sinatra/url_for', 'active_record', 'ar-extensions', 'opentox-ruby-api-wrapper' ].each do |lib| +[ 'rubygems', 'sinatra', 'sinatra/url_for', 'opentox-ruby-api-wrapper' ].each do |lib| require lib end -require 'validation/validation_service.rb' require 'lib/merge.rb' require 'lib/active_record_setup.rb' +require 'validation/validation_service.rb' + get '/crossvalidation/?' do LOGGER.info "list all crossvalidations" content_type "text/uri-list" @@ -125,7 +126,7 @@ get '/training_test_split' do end get '/?' do - LOGGER.info "list all validations" + LOGGER.info "list all validations, params: "+params.inspect content_type "text/uri-list" Validation::Validation.find_like(params).collect{ |d| url_for("/", :full) + d.id.to_s }.join("\n") end |