Author: assaf
Date: Tue Jun 17 16:03:28 2008
New Revision: 668871
URL: http://svn.apache.org/viewvc?rev=668871&view=rev
Log:
Fixed Gem dependencies: added rest-open-uri, rmagick and sparklines.
Changed to use Rails.root instead of RAILS_ROOT.
Fixed: annotate-models dependency breaking rake setup.
Modified:
ode/sandbox/singleshot/config/environment.rb
ode/sandbox/singleshot/config/initializers/libs.rb
ode/sandbox/singleshot/lib/tasks/database.rake
Modified: ode/sandbox/singleshot/config/environment.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environment.rb?rev=668871&r1=668870&r2=668871&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environment.rb (original)
+++ ode/sandbox/singleshot/config/environment.rb Tue Jun 17 16:03:28 2008
@@ -25,7 +25,9 @@
# config.gem "bj"
# config.gem "hpricot", :version => '0.6', :source =>
"http://code.whytheluckystiff.net";
# config.gem "aws-s3", :lib => "aws/s3"
- config.gem 'sparklines'
+ config.gem 'rest-open-uri', :version=>'1.0.0'
+ config.gem 'rmagick' # Required by sparklines
+ config.gem 'sparklines', :version=>'0.5.1'
# Only load the plugins named here, in the order given. By default, all
plugins
# in vendor/plugins are loaded in alphabetical order.
Modified: ode/sandbox/singleshot/config/initializers/libs.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/initializers/libs.rb?rev=668871&r1=668870&r2=668871&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/initializers/libs.rb (original)
+++ ode/sandbox/singleshot/config/initializers/libs.rb Tue Jun 17 16:03:28 2008
@@ -1,4 +1,4 @@
require 'rest-open-uri'
-require File.join(RAILS_ROOT, 'lib/patches')
-require File.join(RAILS_ROOT, 'lib/extensions')
-require File.join(RAILS_ROOT, 'lib/singleshot')
+require File.join(Rails.root, 'lib/patches')
+require File.join(Rails.root, 'lib/extensions')
+require File.join(Rails.root, 'lib/singleshot')
Modified: ode/sandbox/singleshot/lib/tasks/database.rake
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/lib/tasks/database.rake?rev=668871&r1=668870&r2=668871&view=diff
==============================================================================
--- ode/sandbox/singleshot/lib/tasks/database.rake (original)
+++ ode/sandbox/singleshot/lib/tasks/database.rake Tue Jun 17 16:03:28 2008
@@ -1 +1,4 @@
-require 'annotate_models/tasks'
+begin
+ require 'annotate_models/tasks'
+rescue LoadError
+end
