Author: assaf
Date: Tue Nov 18 15:33:16 2008
New Revision: 718787
URL: http://svn.apache.org/viewvc?rev=718787&view=rev
Log:
Development environment now using RSpec gems, no longer installing plugins;
specified as rspec-rails (rspec is a dependency) and upgraded to 1.1.8.
Gems that are only used during development/testing by Rake tasks or seaprate
commands (e.g. spec, thin) are no longer loaded by default.
Upgraded to RMagick 2.7.
Modified:
ode/sandbox/singleshot/config/environment.rb
ode/sandbox/singleshot/config/environments/development.rb
ode/sandbox/singleshot/lib/tasks/database.rake
ode/sandbox/singleshot/lib/tasks/setup.rake
Modified: ode/sandbox/singleshot/config/environment.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environment.rb?rev=718787&r1=718786&r2=718787&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environment.rb (original)
+++ ode/sandbox/singleshot/config/environment.rb Tue Nov 18 15:33:16 2008
@@ -25,7 +25,7 @@
Rails::Initializer.run do |config|
config.gem 'rest-open-uri', :version=>'~>1.0'
- config.gem 'rmagick', :lib=>'RMagick', :version=>'~>2.5'
+ config.gem 'rmagick', :lib=>'RMagick', :version=>'~>2.7'
config.gem 'sparklines', :version=>'~>0.5'
#config.gem 'acts_as_ferret', :version=>'~>0.4'
config.gem 'mislav-will_paginate', :lib=>'will_paginate',
Modified: ode/sandbox/singleshot/config/environments/development.rb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/environments/development.rb?rev=718787&r1=718786&r2=718787&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/environments/development.rb (original)
+++ ode/sandbox/singleshot/config/environments/development.rb Tue Nov 18
15:33:16 2008
@@ -22,8 +22,12 @@
config.action_mailer.raise_delivery_errors = false
config.action_controller.allow_concurrency = true
-config.gem 'annotate-models', :lib=>'annotate_models'
-config.gem 'rspec', :lib=>'spec', :version=>'~> 1.1.4'
-config.gem 'faker', :version=>'~>0.3' # Faker: Used
to populate development database with fake data.
-config.gem 'sqlite3-ruby', :lib=>'sqlite3', :version=>'~>1.2' # SQLite3:
Development and test databases use SQLite3 by default.
-config.gem 'thin', :version=>'~>0.8' # Thin: Not
essential, but development scripts (e.g. rake run) are hard wired to use Thin.
\ No newline at end of file
+
+# These Gems are used exclusively during development/testing, they're listed
here
+# to be included when running rake setup. Some of these are only used from rake
+# tasks or command line (e.g. rspec, thin), so don't load them as part of
Rails.
+config.gem 'annotate-models', :lib=>false
+config.gem 'rspec-rails', :lib=>false, :version=>'1.1.8'
+config.gem 'faker', :lib=>false, :version=>'~>0.3' # Faker: Used
to populate development database with fake data.
+config.gem 'thin', :lib=>false, :version=>'~>1.0' # Thin: Not
essential, but development scripts (e.g. rake run) are hard wired to use Thin.
+config.gem 'sqlite3-ruby', :lib=>'sqlite3', :version=>'~>1.2' # SQLite3:
Development and test databases use SQLite3 by default.
\ No newline at end of file
Modified: ode/sandbox/singleshot/lib/tasks/database.rake
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/lib/tasks/database.rake?rev=718787&r1=718786&r2=718787&view=diff
==============================================================================
--- ode/sandbox/singleshot/lib/tasks/database.rake (original)
+++ ode/sandbox/singleshot/lib/tasks/database.rake Tue Nov 18 15:33:16 2008
@@ -14,6 +14,8 @@
# the License.
+require 'faker'
+
namespace 'db' do
desc 'Populate the database with mock values'
Modified: ode/sandbox/singleshot/lib/tasks/setup.rake
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/lib/tasks/setup.rake?rev=718787&r1=718786&r2=718787&view=diff
==============================================================================
--- ode/sandbox/singleshot/lib/tasks/setup.rake (original)
+++ ode/sandbox/singleshot/lib/tasks/setup.rake Tue Nov 18 15:33:16 2008
@@ -34,9 +34,7 @@
desc "Install all the plugins this app depends on"
task 'install' do
rb_bin = File.join(Config::CONFIG['bindir'],
Config::CONFIG['ruby_install_name'])
- puts "Installing rspec plugin from Github"
- system 'rb_bin', 'script/plugin', 'git://github.com/dchelimsky/rspec.git'
- system 'rb_bin', 'script/plugin',
'git://github.com/dchelimsky/rspec-rails.git'
+# system 'rb_bin', 'script/plugin',
'git://github.com/dchelimsky/rspec-rails.git'
end
desc "List installed plugins"
