0
@@ -1,48 +1,19 @@
0
 = Welcome to Blerb!
0
 
0
 == Installation
0
-  * Install merb-core, merb-more and merb-plugins from wycats repo on github
0
-  
0
-  * Install merb-core
0
-    * git clone git://github.com/wycats/merb-core.git
0
-    * cd merb-core
0
-    * rake install
0
-    * sudo cp bin/merb /usr/bin/merb
0
-    * or use one-liner: git clone git://github.com/wycats/merb-core.git && cd merb-core && rake install && sudo cp bin/merb /usr/bin/merb
0
-    
0
-  * Install merb-more
0
-    * git clone git://github.com/wycats/merb-more.git
0
-    * cd merb-more
0
-    * cd merb-action-args
0
-    * rake install
0
-    * cd ../merb-assets
0
-    * rake install
0
-    * cd ../merb-test
0
-    * rake install
0
-    * cd ../merb-mailer
0
-    * rake install
0
-    * or use one-liner: git clone git://github.com/wycats/merb-more.git && cd merb-more/merb-action-args && rake install && cd ../merb-assets && rake install && cd ../merb-test && rake install && cd ../merb-mailer && rake install
0
-    
0
-  * Install merb-plugins
0
-    * git clone git://github.com/wycats/merb-plugins.git
0
-    * cd merb-plugins
0
-    * cd merb_datamapper
0
-    * rake install
0
-    * cd ../merb_helpers
0
-    * rake install
0
-    * cd ../merb_rspec
0
-    * rake install
0
-    * or use one-liner: git clone git://github.com/wycats/merb-plugins.git && cd merb-plugins/merb_datamapper && rake install && cd ../merb_helpers && rake install && cd ../merb_rspec && rake install
0
-    
0
+  * from your working directory, say ~/code/, clone the blerb repository:
0
   * git clone git://github.com/hornbeck/blerb-core.git - anon checkout
0
   * git clone git@github.com:hornbeck/blerb-core.git   - commit access
0
   * cd blerb-core
0
+  * use script/install to update or install merb-* in the parent directory (e.g. ~/code/merb-core/):
0
+  * script/install_merb
0
   * cp config/database.yml.sample config/database.yml
0
   * fill in the correct database credentials
0
   * cp config/settings.sample.yml config/settings.yml
0
   * fill in the correct blog settings
0
   * rake dm:auto_migrate
0
-  * script/blerb
0
+  * to start a webserver, run the merb command:
0
+  * merb
0
 
0
 Blerb should now be running on port 4000, so open up your browser and visit localhost:4000!
0
 

0
@@ -3,18 +3,15 @@ Gem.clear_paths
0
 Gem.path.unshift(File.join(File.dirname(__FILE__), "gems"))
0
 
0
 require 'rake'
0
-require 'rake/rdoctask'
0
-require 'rake/testtask'
0
 require 'spec/rake/spectask'
0
 require 'fileutils'
0
 require 'merb-core'
0
-require 'rubigen'
0
 
0
 $RAKE_ENV = true
0
 
0
-Merb.start :environment => (ENV['MERB_ENV'] || 'development'),
0
-           :adapter     => 'runner',
0
-           :merb_root  => File.dirname(__FILE__)
0
+init_file = File.join(File.dirname(__FILE__) / "config" / "init")
0
+
0
+Merb.load_dependencies(init_file)
0
            
0
 include FileUtils
0
 # # # Get Merb plugins and dependencies