Gemfile @@ -8,8 +8,8 @@ and it seemed best to learn the code by specing as I go. This works w/ merb Requirements (UNIX) ------------------- -% sudo gem install thor -% thor merb:gem:install +% sudo gem install bundler +% gem bundle On Localhost ------------ @@ -44,4 +44,3 @@ Guidance ------------- http://openid.net/specs/openid-authentication-2_0.html http://wiki.openid.net/OpenID_Authentication_2.0 - README @@ -1,49 +1,31 @@ -require 'rubygems' -require 'rake/rdoctask' - +project_root = File.expand_path(File.dirname(__FILE__)) +require File.join(project_root, 'vendor', 'gems', 'environment') require 'merb-core' -require 'merb-core/tasks/merb' - -include FileUtils # Load the basic runtime dependencies; this will include # any plugins and therefore plugin rake tasks. -init_env = ENV['MERB_ENV'] || 'rake' +init_env = ENV['MERB_ENV'] || 'development' Merb.load_dependencies(:environment => init_env) -# Get Merb plugins and dependencies -Merb::Plugins.rakefiles.each { |r| require r } - -# Load any app level custom rakefile extensions from lib/tasks -tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks") -rake_files = Dir["#{tasks_path}/*.rake"] -rake_files.each{|rake_file| load rake_file } - desc "Start runner environment" task :merb_env do Merb.start_environment(:environment => init_env, :adapter => 'runner') end require 'spec/rake/spectask' -require 'merb-core/test/tasks/spectasks' desc 'Default: run spec examples' -task :default => 'spec:ci' - +task :default => 'spec' ############################################################################## # ADD YOUR CUSTOM TASKS IN /lib/tasks # NAME YOUR RAKE FILES file_name.rake ############################################################################## -namespace :spec do - task :update_gems do |t| - system("script/update") - end - Spec::Rake::SpecTask.new(:ci => [:update_gems]) do |t| - t.spec_opts << %w(-fs --color) << %w(-O spec/spec.opts) - t.spec_opts << '--loadby' << 'random' - t.spec_files = %w(requests mailers models helpers views).collect { |dir| Dir["spec/#{dir}/**/*_spec.rb"] }.flatten - t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true - t.rcov_opts << '--exclude' << 'spec/,config/,exceptions,schema,gems/gems,merb/' - t.rcov_opts << '--text-summary' - t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse' - end +require 'spec/rake/spectask' +Spec::Rake::SpecTask.new do |t| + t.spec_opts << %w(-fs --color) << %w(-O spec/spec.opts) + t.spec_opts << '--loadby' << 'random' + t.spec_files = %w(requests mailers models helpers views).collect { |dir| Dir["spec/#{dir}/**/*_spec.rb"] }.flatten + t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true + t.rcov_opts << '--exclude' << 'spec/,config/,exceptions,schema,gems/gems,merb/' + t.rcov_opts << '--text-summary' + t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse' end Rakefile @@ -1,22 +1,22 @@ -require 'config/dependencies.rb' - # Go to http://wiki.merbivore.com/pages/init-rb +Bundler.require_env + require 'pp' require 'digest/sha1' use_orm :datamapper use_test :rspec use_template_engine :erb - + Merb::Config.use do |c| c[:use_mutex] = false c[:session_store] = 'cookie' # can also be 'memory', 'memcache', 'container', '' - + # cookie session store configuration c[:session_secret_key] = 'fbe44747c953159bc4ad423415f45504c4822cc6' # required for cookie session store c[:session_id_key] = '_flatirons_session_id' # cookie session id key, defaults to "_session_id" end - + Merb::BootLoader.before_app_loads do require "openid" require "openid/consumer/discovery" config/init.rb @@ -1,3 +1,5 @@ +require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) + describe User do describe "#create with valid params" do it "should be valid" do spec/models/user_spec.rb @@ -1,15 +1,9 @@ -require "rubygems" - -# Add the local gems dir if found within the app root; any dependencies loaded -# hereafter will try to load from the local gems before loading system gems. -if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil? - $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir) -end +project_root = File.expand_path(File.dirname(__FILE__)) +require File.join(project_root, '..', 'vendor', 'gems', 'environment') require "merb-core" -require "spec" # Satisfies Autotest and anyone else not using the Rake tasks +require "spec" require 'pp' -require 'ruby-debug' require 'webrat/merb' require 'webrat/selenium' # this loads all plugins required in your init file so don't add them @@ -67,13 +61,15 @@ class Merb::Mailer self.delivery_method = :test_send end -if ENV['SELENIUM'].nil? - Webrat.configuration.mode = :merb -else - Webrat.configuration.mode = :selenium - Webrat.configuration.application_framework = :merb - Webrat.configuration.application_environment = :test - Webrat.configuration.application_port = 4000 +Webrat.configure do |config| + if ENV['SELENIUM'].nil? + config.mode = :merb + else + config.mode = :selenium + config.application_framework = :merb + config.application_environment = :test + config.application_port = 4000 + end end # setup helpers for rspec spec/spec_helper.rb tasks/merb.thor/app_script.rb tasks/merb.thor/common.rb tasks/merb.thor/gem_ext.rb tasks/merb.thor/main.thor tasks/merb.thor/ops.rb tasks/merb.thor/utils.rb 992ad430acac52dedbc04056cd45abf640e2b29b Corey Donohoe atmos@atmos.org http://github.com/atmos/flatirons/commit/6d101879d7d0166532d2a4fbeff7b0c8c34db37a 6d101879d7d0166532d2a4fbeff7b0c8c34db37a 2009-09-22T17:42:28-07:00 2009-09-22T17:42:28-07:00 nuke thor scripts, update to the bundler to make this work with a modern merb app 92cefb21ab55062e62b6ce2550e04131eb75902e Corey Donohoe atmos@atmos.org