Changeset 453

Show
Ignore:
Timestamp:
08/30/07 20:02:14 (1 year ago)
Author:
duane.johns..@gmail.com
Message:

Moved the conf/ dir to config/ to match the rails dir structure since everything else matches.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/README

    r418 r453  
    255255 
    256256right now you add your routes in 
    257 the appdir/conf/router.rb file. So by default it runs on port 4000 
     257the appdir/config/router.rb file. So by default it runs on port 4000 
    258258 
    259259        $ cd /path/to/your/merb/app 
    …… 
    308308            parts 
    309309            mailers 
    310           conf 
     310          config 
    311311          lib 
    312312          public 

  • trunk/app_generators/merb/merb_generator.rb

    r452 r453  
    3030      m.file_copy_each %w( application.herb ), "app/views/layout" 
    3131      m.file_copy_each %w( database.yml merb.yml merb_init.rb router.rb upload.conf ), "conf" 
    32       m.file_copy_each %w( development.rb production.rb test.rb ), "conf/environments" 
     32      m.file_copy_each %w( development.rb production.rb test.rb ), "config/environments" 
    3333      m.file_copy_each %w( 001_add_sessions_table.rb ), "schema/migrations" 
    3434 
    …… 
    8383      app/parts 
    8484      app/views/layout 
    85       conf/environments 
     85      config/environments 
    8686      lib 
    8787      log 

  • trunk/app_generators/merb/templates/Rakefile

    r427 r453  
    2121task :merb_init do 
    2222  require 'merb' 
    23   require File.dirname(__FILE__)+'/conf/merb_init.rb' 
     23  require File.dirname(__FILE__)+'/config/merb_init.rb' 
    2424end   
    2525 

  • trunk/app_generators/merb/templates/app/controllers/no_route_found.rb

    r452 r453  
    44    <<-TEXT 
    55    <p>Welcome to Merb! You're seeing this page because you need to edit 
    6     app/controllers/no_route_found.rb and probably conf/router.rb too.</p> 
     6    app/controllers/no_route_found.rb and probably config/router.rb too.</p> 
    77     
    88    <p>If you're having trouble, please feel free to come chat at irc.freenode.net, 

  • trunk/app_generators/merb/templates/config/merb.yml

    r452 r453  
    3030 
    3131# Uncomment to use the merb upload progress 
    32 #:config: conf/upload.conf 
     32#:config: config/upload.conf 
    3333 
    3434# Uncomment to cache templates in dev mode. Templates are cached 

  • trunk/app_generators/merb/templates/config/merb_init.rb

    r444 r453  
    1717#Get Database Config 
    1818puts "Connecting to database..." 
    19 conn_options = YAML::load(Erubis::Eruby.new(IO.read("#{MERB_ROOT}/conf/database.yml")).result(binding)) 
     19conn_options = YAML::load(Erubis::Eruby.new(IO.read("#{MERB_ROOT}/config/database.yml")).result(binding)) 
    2020ActiveRecord::Base.establish_connection conn_options["#{MERB_ENV}"]  
    2121 
    2222#Get Environment File 
    23 require "#{MERB_ROOT}/conf/environments/#{MERB_ENV}" 
     23require "#{MERB_ROOT}/config/environments/#{MERB_ENV}" 
    2424 
    2525#  

  • trunk/examples/skeleton/Rakefile

    r423 r453  
    2121task :merb_init do 
    2222  require 'merb' 
    23   require File.dirname(__FILE__)+'/conf/merb_init.rb' 
     23  require File.dirname(__FILE__)+'/config/merb_init.rb' 
    2424end   
    2525 

  • trunk/examples/skeleton/conf/merb.yml

    r411 r453  
    2929 
    3030# Uncomment to use the merb upload progress 
    31 #:config: conf/upload.conf 
     31#:config: config/upload.conf 
    3232 
    3333# Uncomment to cache templates in dev mode. Templates are cached 

  • trunk/examples/skeleton/conf/merb_init.rb

    r441 r453  
    1515#Get Database Config 
    1616puts "Connecting to database..." 
    17 conn_options = YAML::load(Erubis::Eruby.new(IO.read("#{MERB_ROOT}/conf/database.yml")).result(binding)) 
     17conn_options = YAML::load(Erubis::Eruby.new(IO.read("#{MERB_ROOT}/config/database.yml")).result(binding)) 
    1818ActiveRecord::Base.establish_connection conn_options["#{MERB_ENV}"]  
    1919 
    2020#Get Environment File 
    21 require "#{MERB_ROOT}/conf/environments/#{MERB_ENV}" 
     21require "#{MERB_ROOT}/config/environments/#{MERB_ENV}" 
    2222 
    2323 

  • trunk/lib/merb/server.rb

    r444 r453  
    2121      } 
    2222      begin 
    23         options = defaults.merge(YAML.load(Erubis::Eruby.new(IO.read("#{defaults[:merb_root]}/conf/merb.yml")).result(binding))) 
     23        options = defaults.merge(YAML.load(Erubis::Eruby.new(IO.read("#{defaults[:merb_root]}/config/merb.yml")).result(binding))) 
    2424      rescue 
    2525        options = defaults 
    …… 
    165165      def initialize_merb 
    166166        require 'merb' 
    167         require @@merb_opts[:merb_root] / 'conf/router.rb' 
    168         require @@merb_opts[:merb_root] / 'conf/merb_init.rb' 
     167        require @@merb_opts[:merb_root] / 'config/router.rb' 
     168        require @@merb_opts[:merb_root] / 'config/merb_init.rb' 
    169169      end   
    170170       
    …… 
    325325        puts "Starting merb drb server on port: #{port}" 
    326326        require 'merb/merb_drb_server' 
    327         drb_init = File.join(@@merb_opts[:merb_root], "/conf/merb_drb_init") 
     327        drb_init = File.join(@@merb_opts[:merb_root], "/config/merb_drb_init") 
    328328        require drb_init if File.exist?(drb_init) 
    329329        DRb.start_service("druby://#{@@merb_opts[:host]}:#{port}", Merb::DrbServiceProvider) 

  • trunk/lib/tasks/db.rake

    r411 r453  
    77  Merb::Server.config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
    88  MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment] 
    9   load MERB_ROOT+'/conf/merb_init.rb' 
     9  load MERB_ROOT+'/config/merb_init.rb' 
    1010end 
    1111 

  • trunk/specs/merb/merb_generator_spec.rb

    r427 r453  
    3535      app/views 
    3636      app/views/layout 
    37       conf 
    38       conf/environments 
     37      config 
     38      config/environments 
    3939      lib 
    4040      log 
    …… 
    5858      app/mailers/layout/application.erb 
    5959      app/views/layout/application.herb 
    60       conf/database.yml 
    61       conf/environments/development.rb 
    62       conf/environments/production.rb 
    63       conf/environments/test.rb 
    64       conf/merb.yml 
    65       conf/merb_init.rb 
    66       conf/router.rb 
    67       conf/upload.conf 
     60      config/database.yml 
     61      config/environments/development.rb 
     62      config/environments/production.rb 
     63      config/environments/test.rb 
     64      config/merb.yml 
     65      config/merb_init.rb 
     66      config/router.rb 
     67      config/upload.conf 
    6868      Rakefile 
    6969      schema/migrations/001_add_sessions_table.rb