lib/casserver/load_picnic.rb @@ -28,7 +28,6 @@ lib/casserver/authenticators/test.rb lib/casserver/cas.rb lib/casserver/conf.rb lib/casserver/controllers.rb -lib/casserver/environment.rb lib/casserver/localization.rb lib/casserver/models.rb lib/casserver/postambles.rb Manifest.txt @@ -1,27 +1,13 @@ #!/usr/bin/env ruby -if File.exists?(picnic = File.expand_path(File.dirname(File.expand_path(__FILE__))+'/../vendor/picnic/lib')) - $: << picnic -elsif File.exists?(picnic = File.expand_path(File.dirname(File.expand_path(__FILE__))+'/../../picnic/lib')) - $: << picnic -else - require 'rubygems' - - # make things backwards-compatible for rubygems < 0.9.0 - if respond_to?(:require_gem) - puts "WARNING: aliasing gem to require_gem in #{__FILE__} -- you should update your RubyGems system!" - alias gem require_gem - end - - gem 'picnic' -end +require File.expand_path(File.dirname(__FILE__)+"/../lib/casserver/load_picnic") require 'picnic/cli' cli = Picnic::Cli.new( 'rubycas-server', :app_module => 'CASServer', - :app_file => File.expand_path(File.dirname(File.expand_path(__FILE__))+"/../lib/casserver.rb") + :app_file => File.expand_path(File.dirname(__FILE__)+"/../lib/casserver.rb") ) cli.handle_cli_input bin/rubycas-server @@ -1,24 +1,8 @@ unless Object.const_defined?(:Picnic) $APP_NAME ||= 'rubycas-server' $APP_ROOT ||= File.expand_path(File.dirname(__FILE__)+'/..') - - if File.exists?(picnic = File.expand_path(File.dirname(File.expand_path(__FILE__))+'/../vendor/picnic/lib')) - $: << picnic - elsif File.exists?(picnic = File.expand_path(File.dirname(File.expand_path(__FILE__))+'/../../picnic/lib')) - $: << picnic - else - require 'rubygems' - - # make things backwards-compatible for rubygems < 0.9.0 - if respond_to?(:require_gem) - puts "WARNING: aliasing gem to require_gem in #{__FILE__} -- you should update your RubyGems system!" - alias gem require_gem - end - - gem 'picnic' - end - - require 'picnic' + + require 'casserver/load_picnic' end require 'yaml' lib/casserver.rb @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.email = ["matt@zukowski.ca"] s.executables = ["rubycas-server", "rubycas-server-ctl"] s.extra_rdoc_files = ["CHANGELOG.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"] - s.files = ["CHANGELOG.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/rubycas-server", "bin/rubycas-server-ctl", "config.example.yml", "config.ru", "config/hoe.rb", "config/requirements.rb", "custom_views.example.rb", "lib/casserver.rb", "lib/casserver/authenticators/active_directory_ldap.rb", "lib/casserver/authenticators/base.rb", "lib/casserver/authenticators/client_certificate.rb", "lib/casserver/authenticators/google.rb", "lib/casserver/authenticators/ldap.rb", "lib/casserver/authenticators/ntlm.rb", "lib/casserver/authenticators/open_id.rb", "lib/casserver/authenticators/sql.rb", "lib/casserver/authenticators/sql_encrypted.rb", "lib/casserver/authenticators/sql_md5.rb", "lib/casserver/authenticators/sql_rest_auth.rb", "lib/casserver/authenticators/test.rb", "lib/casserver/cas.rb", "lib/casserver/conf.rb", "lib/casserver/controllers.rb", "lib/casserver/environment.rb", "lib/casserver/localization.rb", "lib/casserver/models.rb", "lib/casserver/postambles.rb", "lib/casserver/utils.rb", "lib/casserver/version.rb", "lib/casserver/views.rb", "lib/rubycas-server.rb", "lib/rubycas-server/version.rb", "lib/themes/cas.css", "lib/themes/notice.png", "lib/themes/ok.png", "lib/themes/simple/bg.png", "lib/themes/simple/login_box_bg.png", "lib/themes/simple/logo.png", "lib/themes/simple/theme.css", "lib/themes/urbacon/bg.png", "lib/themes/urbacon/login_box_bg.png", "lib/themes/urbacon/logo.png", "lib/themes/urbacon/theme.css", "lib/themes/warning.png", "po/de_DE/rubycas-server.po", "po/es_ES/rubycas-server.po", "po/fr_FR/rubycas-server.po", "po/ja_JP/rubycas-server.po", "po/pl_PL/rubycas-server.po", "po/ru_RU/rubycas-server.po", "po/rubycas-server.pot", "resources/init.d.sh", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/localization.rake", "tasks/website.rake", "vendor/isaac_0.9.1/LICENSE", "vendor/isaac_0.9.1/README", "vendor/isaac_0.9.1/TODO", "vendor/isaac_0.9.1/VERSIONS", "vendor/isaac_0.9.1/crypt/ISAAC.rb", "vendor/isaac_0.9.1/isaac.gemspec", "vendor/isaac_0.9.1/setup.rb", "vendor/isaac_0.9.1/test/TC_ISAAC.rb"] + s.files = ["CHANGELOG.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/rubycas-server", "bin/rubycas-server-ctl", "config.example.yml", "config.ru", "config/hoe.rb", "config/requirements.rb", "custom_views.example.rb", "lib/casserver.rb", "lib/casserver/authenticators/active_directory_ldap.rb", "lib/casserver/authenticators/base.rb", "lib/casserver/authenticators/client_certificate.rb", "lib/casserver/authenticators/google.rb", "lib/casserver/authenticators/ldap.rb", "lib/casserver/authenticators/ntlm.rb", "lib/casserver/authenticators/open_id.rb", "lib/casserver/authenticators/sql.rb", "lib/casserver/authenticators/sql_encrypted.rb", "lib/casserver/authenticators/sql_md5.rb", "lib/casserver/authenticators/sql_rest_auth.rb", "lib/casserver/authenticators/test.rb", "lib/casserver/cas.rb", "lib/casserver/conf.rb", "lib/casserver/controllers.rb", "lib/casserver/localization.rb", "lib/casserver/models.rb", "lib/casserver/postambles.rb", "lib/casserver/utils.rb", "lib/casserver/version.rb", "lib/casserver/views.rb", "lib/rubycas-server.rb", "lib/rubycas-server/version.rb", "lib/themes/cas.css", "lib/themes/notice.png", "lib/themes/ok.png", "lib/themes/simple/bg.png", "lib/themes/simple/login_box_bg.png", "lib/themes/simple/logo.png", "lib/themes/simple/theme.css", "lib/themes/urbacon/bg.png", "lib/themes/urbacon/login_box_bg.png", "lib/themes/urbacon/logo.png", "lib/themes/urbacon/theme.css", "lib/themes/warning.png", "po/de_DE/rubycas-server.po", "po/es_ES/rubycas-server.po", "po/fr_FR/rubycas-server.po", "po/ja_JP/rubycas-server.po", "po/pl_PL/rubycas-server.po", "po/ru_RU/rubycas-server.po", "po/rubycas-server.pot", "resources/init.d.sh", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/localization.rake", "tasks/website.rake", "vendor/isaac_0.9.1/LICENSE", "vendor/isaac_0.9.1/README", "vendor/isaac_0.9.1/TODO", "vendor/isaac_0.9.1/VERSIONS", "vendor/isaac_0.9.1/crypt/ISAAC.rb", "vendor/isaac_0.9.1/isaac.gemspec", "vendor/isaac_0.9.1/setup.rb", "vendor/isaac_0.9.1/test/TC_ISAAC.rb"] s.has_rdoc = true s.homepage = %q{http://rubycas-server.rubyforge.org} s.post_install_message = %q{ rubycas-server.gemspec lib/casserver/environment.rb f872fca290a3e563ef8e41137ce5ddd33543f7d2 zuk zuk@roughest.net http://github.com/gunark/rubycas-server/commit/804e0bc3f304d068399bb58d6ebe8bf80bbfd154 804e0bc3f304d068399bb58d6ebe8bf80bbfd154 2009-04-27T14:10:29-07:00 2009-04-27T14:10:29-07:00 - cleaner loading of the picnic gem -- now automatically looks for github gems (e.g. zuk-picnic) - require_gem aliasing for compatibility with old RubyGems has been removed -- i.e. rubycas-server will no longer work with old versions of RubyGems (the ones that use 'require_gem' instead of 'gem')! 5d08e55aec08556c18d255fbcc3eed9913bc7dab zuk zuk@roughest.net