Gemfile @@ -4,3 +4,5 @@ development.db tmp webrat.log .DS_Store +bin +vendor .gitignore @@ -1,9 +1,9 @@ +require File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environments', 'default') require 'rubygems' require 'rake/gempackagetask' require 'rubygems/specification' require 'date' -require 'spec/rake/spectask' -require 'cucumber/rake/task' +require 'bundler' GEM = "hancock" GEM_VERSION = "0.0.9" @@ -24,29 +24,29 @@ spec = Gem::Specification.new do |s| s.email = EMAIL s.homepage = HOMEPAGE - # Uncomment this to add a dependency - s.add_dependency "ruby-openid", "~>2.1.4" - s.add_dependency "sinatra", "~>0.9.2" - s.add_dependency "haml", "~>2.0.9" - s.add_dependency "guid", "~>0.1.1" - s.add_dependency "pony", "~>0.3" - - s.add_dependency "dm-core", "~>0.9.11" - s.add_dependency "dm-types", "~>0.9.11" - s.add_dependency "dm-timestamps", "~>0.9.11" - s.add_dependency "dm-validations", "~>0.9.11" + manifest = Bundler::ManifestFile.load(File.dirname(__FILE__) + '/Gemfile') + manifest.dependencies.each do |d| + next unless d.in?(:release) + s.add_dependency(d.name, d.version) + end s.require_path = 'lib' s.autorequire = GEM s.files = %w(LICENSE README.md Rakefile) + Dir.glob("{features,lib,spec}/**/*") end +Rake::GemPackageTask.new(spec) do |pkg| + pkg.gem_spec = spec +end +desc "create a gemspec file" +task :make_spec do + File.open("#{GEM}.gemspec", "w") do |file| + file.puts spec.to_ruby + end +end task :default => [:spec, :features] -task :development_deps do |t| - system("sudo gem install webrat rack-test do_sqlite3") -end - +require 'spec/rake/spectask' desc "Run specs" Spec::Rake::SpecTask.new do |t| t.spec_files = FileList['spec/**/*_spec.rb'] @@ -59,17 +59,7 @@ Spec::Rake::SpecTask.new do |t| #t.rcov_opts << '--only-uncovered' end -Rake::GemPackageTask.new(spec) do |pkg| - pkg.gem_spec = spec -end - -desc "create a gemspec file" -task :make_spec do - File.open("#{GEM}.gemspec", "w") do |file| - file.puts spec.to_ruby - end -end - +require 'cucumber/rake/task' Cucumber::Rake::Task.new(:features) do |t| t.libs << 'lib' t.cucumber_opts = "--format pretty" Rakefile @@ -1,6 +1,5 @@ # thin start -p PORT -R config.ru -require 'ruby-debug' -gem 'sinatra', '~>0.9.2' +require File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environments', 'default') require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'hancock')) DataMapper.setup(:default, "sqlite3:///#{Dir.pwd}/development.db") @@ -25,7 +24,7 @@ class Dragon < Hancock::App :port => '25', :user => 'sso', :pass => 'lolerskates', - :auth => :plain # :plain, :login, :cram_md5, the default is no auth + :auth => :plain, # :plain, :login, :cram_md5, the default is no auth :domain => "example.com" # the HELO domain provided by the client to the server } examples/dragon/config.ru @@ -1,14 +1,11 @@ -ENV['RACK_ENV'] ||= 'test' - -require 'rubygems' +ENV['RACK_ENV'] ||= 'development' +require File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environments', 'default') require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'hancock') -gem 'rspec', '~>1.2.0' + require 'spec' require 'randexp' require 'dm-sweatshop' -gem 'webrat', '~>0.4.4' require 'webrat' -gem 'rack-test', '>=0.4.0' require 'rack/test' require File.join(File.dirname(__FILE__), 'app') @@ -26,6 +23,7 @@ end World do def app @app ||= Rack::Builder.new do + use Rack::Session::Cookie run MySweetSSOServer end end features/support/env.rb @@ -1,26 +1,15 @@ -require 'pp' -require 'rubygems' - -gem 'dm-core', '~>0.9.11' require 'dm-core' require 'dm-validations' require 'dm-timestamps' -gem 'ruby-openid', '~>2.1.7' require 'openid' require 'openid/store/filesystem' require 'openid/extensions/sreg' -gem 'sinatra', '~>0.9.2' require 'sinatra/base' -gem 'haml', '~>2.0.9' require 'haml/engine' require 'sass' - -gem 'guid', '~>0.1.1' require 'guid' - -gem 'pony', '0.3' require 'pony' module Hancock; end @@ -36,13 +25,11 @@ require File.expand_path(File.dirname(__FILE__)+'/sinatra/hancock/openid_server' module Hancock class ConfigurationError < StandardError; end - class App < Sinatra::Default - enable :sessions - set :environment, ENV['RACK_ENV'] || 'development' - #disable :raise_errors + class App < Sinatra::Base disable :show_exceptions set :sreg_params, [:email, :first_name, :last_name, :internal] + set :provider_name, 'Hancock SSO Provider!' set :do_not_reply, nil set :smtp, { :domain => 'example.com' } lib/hancock.rb @@ -1,16 +1,12 @@ -require 'rubygems' -require 'pp' -$:.push +ENV['RACK_ENV'] ||= 'development' +require File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environments', 'default') require File.join(File.dirname(__FILE__), '..', 'lib', 'hancock') -gem 'rspec', '~>1.2.0' +require 'pp' require 'spec' require 'randexp' require 'dm-sweatshop' -gem 'webrat', '~>0.4.4' require 'webrat' - -gem 'rack-test', '>=0.4.0' require 'rack/test' require File.expand_path(File.dirname(__FILE__) + '/app') @@ -21,15 +17,9 @@ DataMapper.setup(:default, 'sqlite3::memory:') DataMapper.auto_migrate! Webrat.configure do |config| - if ENV['SELENIUM'].nil? - config.mode = :rack - else - gem 'selenium-client', '~>1.2.15' - config.mode = :selenium - config.application_framework = :sinatra - config.application_port = 4567 - require 'webrat/selenium' - end + config.mode = :rack_test + config.application_framework = :sinatra + config.application_port = 4567 end Hancock::App.set :environment, :development @@ -37,7 +27,8 @@ Hancock::App.set :do_not_reply, 'sso@example.com' Spec::Runner.configure do |config| def app - @app = Rack::Builder.new do + @app = Rack::Builder.app do + use Rack::Session::Cookie run Hancock::App end end spec/spec_helper.rb 4817ebb013ff50fa02cad294ab4d821644077de3 Corey Donohoe atmos@atmos.org http://github.com/atmos/hancock/commit/b7937183ed10119052638e5f75c5d2f28c77dca7 b7937183ed10119052638e5f75c5d2f28c77dca7 2009-08-09T10:44:13-07:00 2009-08-09T10:44:13-07:00 remove enable :session from default app in favor of using Rack::Session, move to Gemfile for bundling and packaging of hancock 3f7ffb820675f8b63581a9d9985baa46679f4160 Corey Donohoe atmos@atmos.org