1.0 almost ready

Rakefile

@@ -10,6 +10,7 @@ include FileUtils
 merb_more_gem_paths = %w[
   merb-action-args 
   merb-assets 
+  merb-slices
   merb-auth
   merb-cache 
   merb-exceptions
@@ -18,7 +19,6 @@ merb_more_gem_paths = %w[
   merb-helpers 
   merb-mailer 
   merb-param-protection
-  merb-slices
   merb_datamapper
 ]
 
@@ -63,6 +63,7 @@ namespace :install do
     merb_more_gems.each do |gem|
       Merb::RakeHelper.install(gem, :version => Merb::VERSION)
     end
+    Merb::RakeHelper.install("merb", :version => Merb::VERSION)
   end
 
 end
@@ -84,7 +85,14 @@ namespace :uninstall do
 end
 
 desc "Install all gems"
-task :install => ['install:core', 'install:more']
+task :install do
+  %x{sudo gem install gems/merb-core-#{Merb::VERSION}.gem}
+  merb_more_gems.each do |gem|
+    %x{sudo gem install gems/#{gem}-#{Merb::VERSION}.gem}
+  end
+  %x{sudo gem install gems/merb-more-#{Merb::VERSION}.gem}
+  %x{sudo gem install gems/merb-#{Merb::VERSION}.gem}
+end
 
 desc "Uninstall all gems"
 task :uninstall => ['uninstall:core', 'uninstall:more']

merb-core/lib/merb-core/version.rb

@@ -1,3 +1,3 @@
 module Merb
-  VERSION = '0.9.14' unless defined?(Merb::VERSION)
+  VERSION = '1.0' unless defined?(Merb::VERSION)
 end

merb-helpers/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require "merb-core"
 require File.join(File.dirname(__FILE__),"..",'lib',"merb-helpers")
 require "date"
+require "webrat"
 
 # Please read merb_helpers_form_spec.rb
 # for more info on how to test helpers
@@ -145,8 +146,9 @@ def calling(&blk) blk; end
 Spec::Runner.configure do |config|
   config.include Merb::Test::Helper
   config.include Merb::Test::RspecMatchers
-  config.include Merb::Test::Rspec::ViewMatchers
   config.include Merb::Test::RequestHelper
+  config.include Webrat::Matchers
+  config.include Webrat::HaveTagMatcher
 
   def with_level(level)
     Merb.logger = Merb::Logger.new(StringIO.new, level)

merb_datamapper/lib/merb_datamapper/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module MerbDataMapper
-    VERSION = "0.9.10"
+    VERSION = "1.0"
   end
 end