bin/merb bin/merb-gen bin/rake bin/spec config/rubundler.rb @@ -1,3 +1,8 @@ +require File.dirname(__FILE__) + "/config/rubundler" +r = Rubundler.new +r.setup_env +r.setup_requirements + require 'rubygems' require 'rake/rdoctask' Rakefile @@ -1,19 +1,27 @@ -# auto generated from config/gems.yml -dependency 'extlib', '0.9.8' -dependency 'merb-core', '1.0' -dependency 'merb-param-protection', '1.0' -dependency 'merb-haml', '1.0' -dependency 'merb-auth-core', '1.0' -dependency 'merb-auth-more', '1.0' -dependency 'merb-cache', '1.0' -dependency 'merb-helpers', '1.0' -dependency 'merb-assets', '1.0' -dependency 'merb-slices', '1.0' -dependency 'merb-action-args', '1.0' -dependency 'merb-auth-slice-password', '1.0' -dependency 'merb_datamapper', '0.9.6' -dependency 'dm-core', '0.9.6' -dependency 'dm-validations', '0.9.6' -dependency 'dm-serializer', '0.9.6' -dependency 'dm-timestamps', '0.9.6' -dependency 'dm-types', '0.9.6' +add_source "http://gems.rubyforge.org/" + +add_gem 'rspec', '=1.1.11' +add_gem 'rake' +add_gem 'rcov' +add_gem 'mongrel' +add_gem 'hoe' +add_gem 'data_objects' +add_gem 'do_sqlite3' +add_gem 'ruby-openid', '=2.1.2' +add_gem 'rr', '=0.6.0' + +add_dependency 'dm-core', '=0.9.7', :require => 'dm-core' +add_dependency 'dm-validations', '=0.9.7', :require => 'dm-validations' + +add_dependency 'extlib', '=0.9.8', :require => 'extlib' +add_dependency 'merb-core', '=1.0.1', :require => 'merb-core' +add_dependency 'merb-gen', '=1.0.1' +add_dependency 'merb-auth-core', '=1.0.1', :require => 'merb-auth-core' +add_dependency 'merb-auth-more', '=1.0.1', :require => 'merb-auth-more' +add_dependency 'merb-auth-slice-password', '=1.0.1', :require => 'merb-auth-slice-password' +add_dependency 'merb-slices', '=1.0.1', :require => 'merb-slices' +add_dependency 'merb-param-protection', '=1.0.1', :require => 'merb-param-protection' +add_dependency 'merb_datamapper', '=1.0.1' + +add_dependency 'nokogiri', '>=1.0.6' +add_dependency 'webrat', '=0.3.2' config/dependencies.rb @@ -1,7 +1,10 @@ +require File.dirname(__FILE__) + "/rubundler" +r = Rubundler.new +r.setup_env +r.setup_requirements + # Go to http://wiki.merbivore.com/pages/init-rb -require 'config/dependencies.rb' - use_orm :datamapper use_test :rspec use_template_engine :erb config/init.rb @@ -32,7 +32,7 @@ Merb::Router.prepare do # resources :posts # Adds the required routes for merb-auth using the password slice - slice(:merb_auth_slice_password, :name_prefix => nil, :path_prefix => "") + add_slice(:merb_auth_slice_password) match("/openid/login" ).to(:controller => :users, :action => :login ).name(:openid) match("/openid/register").to(:controller => :open_id, :action => :register).name(:signup) @@ -45,4 +45,4 @@ Merb::Router.prepare do # Change this for your home page to be available at / match('/').to(:controller => 'users', :action =>'index') -end \ No newline at end of file +end config/router.rb @@ -12,11 +12,6 @@ begin # Plugins and the default strategies Merb::Authentication.user_class = User - - # Mixin the salted user mixin - require 'merb-auth-more/mixins/salted_user' - Merb::Authentication.user_class.class_eval{ include Merb::Authentication::Mixins::SaltedUser } - # Setup the session serialization class Merb::Authentication @@ -28,17 +23,5 @@ begin user.nil? ? user : user.id end end - -rescue - Merb.logger.error <<-TEXT - - You need to setup some kind of user class with merb-auth. - Merb::Authentication.user_class = User - - If you want to fully customize your authentication you should use merb-core directly. - - See merb/merb-auth/setup.rb and strategies.rb to customize your setup - - TEXT end merb/merb-auth/setup.rb @@ -5,5 +5,5 @@ # # To load and set the order of strategy processing -Merb::Slices::config[:"merb-auth-slice-password"][:no_default_strategies] = true +MerbAuthSlicePassword[:no_default_strategies] = true Merb::Authentication.activate!(:default_openid) merb/merb-auth/strategies.rb @@ -1,23 +1,23 @@ #!/usr/bin/env ruby -require 'yaml' -begin - root = File.expand_path(File.dirname(__FILE__) + '/..') - ENV["GEM_HOME"] = root + '/gems' - ENV["GEM_PATH"] = root + '/gems' +require File.dirname(__FILE__) + "/../config/rubundler" +r = Rubundler.new +r.setup_env - gem_config = YAML.load_file(root + "/config/gems.yml") - - require 'rubygems' - gem 'merb-core', gem_config['gems'].find { |g| g['name'] == 'merb-core' }['version'] +begin require 'merb-core' - Merb.start_environment(:adapter => 'runner', :environment => ENV['MERB_ENV'] || 'development') DataMapper.repository.adapter.query "SELECT 1" - puts "OK, You can start Merb successfully!" rescue SystemExit => e - exit 0 + if e.backtrace.first =~ %r|/lib/merb-core/bootloader.rb:736:in `exit'| + puts "OK, You can start Merb successfully!" + exit 0 + else + puts "Got a SystemExit which was unexpected: #{e.message}" + puts e.backtrace + exit 2 + end rescue Exception => e puts "Got an exception: #{e.class}, #{e.message}" puts e.backtrace script/check @@ -1,52 +1,20 @@ #!/usr/bin/env ruby -require 'yaml' - if env = ARGV.shift ENV["MERB_ENV"] = env end -root = File.expand_path(File.dirname(__FILE__) + "/..") - -gem_config = YAML.load_file(root + "/config/gems.yml") -command_source = "gem --config-file #{root}/.gemrc" - -File.open("#{root}/.gemrc", "w") do |f| - f.puts({ - :sources => gem_config['sources'], - :update_sources => true, - :bulk_threshold => 1000, - :verbose => false, - 'gemhome' => root + '/gems', - 'gempath' => [root + '/gems'], - :backtrace => false, - :benchmark => false - }.to_yaml) -end - -File.open('config/dependencies.rb', 'w') do |fp| - fp.puts "# auto generated from config/gems.yml" - gem_config['gems'].each do |g| - name_and_version = "#{g['name']}" - if v = g['version'] - name_and_version << " --version='#{v}'" - end - - fp.puts "dependency '#{g['require']}', '#{g['version'].gsub(%r![<>=]!, '')}'" if g['require'] - next if system("#{command_source} spec #{name_and_version} >/dev/null 2>/dev/null") - puts "Installing #{name_and_version}" - unless system("#{command_source} install #{name_and_version} --no-ri --no-rdoc") - abort "Failed to install #{g.inspect}" - end - +require File.dirname(__FILE__) + "/../config/rubundler" +r = Rubundler.new +r.update + +r.check do + if system("#{root}/script/check #{ENV['MERB_ENV']} >/dev/null 2>/dev/null") + puts "Merb is ready to rumble!" + else + puts "Merb is not ready!" + puts "Check the database.yml" + puts "Run script/check for more info" + exit 1 end end - -if system("#{root}/script/check #{ENV['MERB_ENV']} >/dev/null 2>/dev/null") - puts "Merb is ready to rumble!" -else - puts "Merb is not ready!" - puts "Check the database.yml" - puts "Run script/check for more info" - exit 1 -end script/update script/merb script/merb-gen script/rake script/spec 509e57f1536bca07f109d806adf700cf1d09186d Corey Donohoe atmos@atmos.org http://github.com/atmos/merb-openid-example/commit/795cbe7bc8f6a93b9d719093f89a20a7322adf96 795cbe7bc8f6a93b9d719093f89a20a7322adf96 2008-11-24T01:56:01-08:00 2008-11-24T01:56:01-08:00 update to the latest tcs gem packager, build is busted but we're freezing to specific versions. will correct tomorrow 9b264edadd584c490a8585f7bb954ac7557c3998 Corey Donohoe atmos@atmos.org