@@ -1,10 +1,12 @@ #!/usr/bin/env ruby - require File.join(File.dirname(__FILE__), '..', 'config', 'boot') $LOAD_PATH << File.join(File.dirname(__FILE__), '..') -require 'lib/ruby_version_check' +require 'rubygems' +gem 'rails' + +require 'ruby_version_check' Signal.trap("INT") { puts; exit } require 'lib/spree' @@ -15,7 +17,11 @@ end app_path = ARGV.first -require 'lib/rails_generator' +# configuration must be set or we get uninitialized class variable @@configuration (introduced w/rails 2.1) +require 'spree/initializer' +Rails.configuration = Spree::Configuration.new + +require 'rails_generator' require 'rails_generator/scripts/generate' class Rails::Generator::Base bin/spree @@ -73,7 +73,7 @@ module Spree # (but we need it in the initializer) def load_rails(version) if File.exist?("#{RAILS_ROOT}/vendor/rails") - $LOAD_PATH.unshift "#{SPREE_ROOT}/vendor/rails/railties/lib" + $LOAD_PATH.unshift "#{RAILS_ROOT}/vendor/rails/railties/lib" else load_rubygems begin config/boot.rb d1886a11af495c6ea17124bc8515c7e999727aa3 Sean Schofield schof@apache.org http://github.com/akitaonrails/spree/commit/ff6052fda79f3e3b306ed4714b4a37df39ce6a30 ff6052fda79f3e3b306ed4714b4a37df39ce6a30 2008-06-20T11:37:36-07:00 2008-06-20T11:37:36-07:00 Fixed a bug with the 'spree' command introduced by Rails 2.1 3cb0bd19647ffd85d48ed89a8d558058cc627fe5 Sean Schofield schof@apache.org