Changeset 1340

Show
Ignore:
Timestamp:
01/31/08 12:53:19 (8 months ago)
Author:
wayneesegu..@gmail.com
Message:

Preparing merb_sequel for 0.9 release.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_sequel/Rakefile

    r1240 r1340  
    44PLUGIN   = "merb_sequel" 
    55NAME     = "merb_sequel" 
    6 VERSION  = "0.5" 
     6VERSION  = "0.9" 
    77AUTHOR   = "Wayne E. Seguin, Lance Carlson" 
    88EMAIL    = "wayneeseguin@gmail.com, lancecarlson@gmail.com" 
    …… 
    2424  spec.extra_rdoc_files = ["README", "LICENSE", 'TODO'] 
    2525  # Dependencies 
    26   spec.add_dependency("merb",         ">= 0.5") 
     26  spec.add_dependency("merb",         ">= 0.9") 
    2727  spec.add_dependency("sequel",       ">= 1.0.0") 
    28   spec.add_dependency("sequel_model", ">= 0.2") 
     28  spec.add_dependency("sequel_model", ">= 0.3.3") 
    2929  spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*") 
    3030end 

  • plugins/merb_sequel/lib/merb/orms/sequel/connection.rb

    r1244 r1340  
    3737 
    3838          if File.exists?(config_file) 
    39             puts "#{Time.now.httpdate}: Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ..." 
     39            Merb.logger.info "Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ..." 
    4040            connection = ::Sequel.connect(config_options(config)) 
    4141            Merb.logger.error("Connection Error: #{e}") unless connection 
    …… 
    4343          else 
    4444            copy_sample_config 
    45             puts "#{Time.now.httpdate}: No database.yml file found in #{Merb.root}/config." 
    46             puts "A sample file was created called config/database.sample.yml for you to copy and edit." 
     45            Merb.logger.set_log(STDERR) 
     46            Merb.logger.error "No database.yml file found in #{Merb.root}/config." 
     47            Merb.logger.error "A sample file was created called config/database.sample.yml for you to copy and edit." 
    4748            exit(1) 
    4849          end 

  • plugins/merb_sequel/lib/merb_sequel.rb

    r1243 r1340  
    1 # make sure we're running inside Merb 
    21if defined?(Merb::Plugins) 
    3   if Merb::BootLoader.app_loaded? 
    4     puts "Warning: The merb_sequel gem must be loaded before the application" 
    5   else 
    6     require "merb/orms/sequel/connection" 
    7     Merb::Orms::Sequel.connect 
    8     Merb::Orms::Sequel.register_session_type 
    9   end 
    10    
     2  require "merb/orms/sequel/connection" 
     3  Merb::Orms::Sequel.connect 
     4  Merb::Orms::Sequel.register_session_type 
    115  Merb::Plugins.add_rakefiles "merbtasks" 
    126end