config.example.yml spec/vanilla_app_spec.rb @@ -3,6 +3,5 @@ pkg *.db .DS_Store *~ -vanilla-authorization.yml tmp -defensio.yml +config.yml .gitignore @@ -32,7 +32,7 @@ Thee Darke Invocation $ gem install soup sqlite3-ruby rack ratom RedCloth BlueCloth -$ rake bootstrap +$ rake setup ... a bunch of stuff gets created README @@ -71,8 +71,9 @@ task :upgrade => ["upgrade:dynasnips"] desc 'Add a user (or change an existing password)' task :add_user => :prepare do puts "Adding a new user" - credential_file = File.join(Vanilla::App.root,'config','vanilla-authorization.yml') - credentials = YAML.load(File.open(credential_file)) rescue {} + # config_file = ENV['VANILLA_CONFIG'] || 'config.yml' + # config_file = YAML.load(File.open(config_file)) rescue {} + app = Vanilla::App.new(ENV['VANILLA_CONFIG']) print "Username: " username = STDIN.gets.chomp.strip print "Password: " @@ -82,14 +83,15 @@ task :add_user => :prepare do if password != confirm_password raise "Passwords don't match!" else - credentials[username] = MD5.md5(password).to_s - File.open(credential_file, "w") { |f| f.write credentials.to_yaml } + app.config[:credentials] ||= {} + app.config[:credentials][username] = MD5.md5(password).to_s + app.config.save! puts "User '#{username}' added." end end desc 'Generate file containing secret for cookie-based session storage' -task :generate_secret_file do +task :generate_secret do # Adapted from old rails secret generator. require 'openssl' if !File.exist?("/dev/urandom") @@ -103,8 +105,10 @@ task :generate_secret_file do end data = OpenSSL::BN.rand(2048, -1, false).to_s secret = OpenSSL::Digest::SHA512.new(data).hexdigest - File.open(File.join(Vanilla::App.root,'config','secret.yml'),'w') {|f| f.write({"secret" => secret}.to_yaml)} - puts "Secret file generated." + app = Vanilla::App.new(ENV['VANILLA_CONFIG']) + app.config[:secret] = secret + app.config.save! + puts "Secret generated." end @@ -123,7 +127,11 @@ EOM puts <<-EOM -Generating the file that will contain the secret for cookie-based session storage. +Now I'm going to generate your configuration. This will be stored either in +'config.yml' in the current directory, or in the path you provide via the +environment variable VANILLA_CONFIG. + +Generating the secret for cookie-based session storage. EOM Rake::Task[:generate_secret_file].invoke Rakefile @@ -6,4 +6,4 @@ use Rack::Session::Cookie, :key => 'vanilla.session', :expire_after => 2592000, :secret => YAML.load(File.read(File.join(Vanilla::App.root,'config','secret.yml')))['secret'] use Rack::Static, :urls => ["/public"], :root => File.join(File.dirname(__FILE__), *%w[vanilla]) -run Vanilla::App.new \ No newline at end of file +run Vanilla::App.new(ENV['VANILLA_CONFIG']) \ No newline at end of file config.ru @@ -4,9 +4,10 @@ require 'vanilla/request' module Vanilla class App - attr_reader :request, :response + attr_reader :request, :response, :config - def initialize + def initialize(config_file=nil) + prepare_configuration(config_file) Soup.prepare end @@ -83,9 +84,15 @@ module Vanilla "[snip '#{snip_name}' cannot be found]" end - def self.root - File.dirname(__FILE__) - end + private + def prepare_configuration(config_file) + config_file ||= "config.yml" + @config = YAML.load(File.open(config_file)) rescue {} + @config[:filename] = config_file + def @config.save! + File.open(self[:filename], 'w') { |f| f.puts self.to_yaml } + end + end end end lib/vanilla/app.rb @@ -27,8 +27,7 @@ class Login < Dynasnip end def post(*args) - credentials = YAML.load(File.open(File.join(Vanilla::App.root,'config','vanilla-authorization.yml'))) - if credentials[cleaned_params[:name]] == MD5.md5(cleaned_params[:password]).to_s + if app.config[:credentials][cleaned_params[:name]] == MD5.md5(cleaned_params[:password]).to_s app.request.session['logged_in_as'] = cleaned_params[:name] login_controls else lib/vanilla/dynasnips/login.rb lib/vanilla/config/secret.yml.example lib/vanilla/config/vanilla-authorization.yml.example spec/vanilla_rack_app_spec.rb b4eed26f3f2011eb924a34f915680c9992f8c26f James Adam james@lazyatom.com http://github.com/lazyatom/vanilla-rb/commit/3e44c1fc51ad326d2f77a71bf676d21a01c80959 3e44c1fc51ad326d2f77a71bf676d21a01c80959 2008-12-13T05:19:43-08:00 2008-12-13T05:19:43-08:00 There should be a simple, unified way of configuring a running Vanilla application, which doesn't involve putting the config into Vanilla itself. This should make it simpler for Vanilla to simply be a gem in the future. b99be67fd2a3a7998980454d5efefc8c55dffbe6 James Adam james@lazyatom.com