merb 0.9.7 → 0.9.8

data/Rakefile

@@ -1,10 +1,10 @@
 ## THESE ARE CRUCIAL
 module Merb
   # Set this to the version of merb-core that you are building against/for
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 
   # Set this to the version of merb-more you plan to release
-  MORE_VERSION = "0.9.7"
+  MORE_VERSION = "0.9.8"
 end
 
 GEM_VERSION = Merb::VERSION
@@ -17,7 +17,8 @@ include FileUtils
 
 gems = %w[
   merb-action-args merb-assets merb-gen merb-haml
-  merb-builder merb-mailer merb-parts merb-cache merb-slices merb-jquery
+  merb-builder merb-mailer merb-parts merb-cache merb-slices
+  merb-jquery merb-helpers
 ]
 
 merb_more_spec = Gem::Specification.new do |s|
@@ -63,42 +64,46 @@ Rake::GemPackageTask.new(merb_spec) do |package|
   package.gem_spec = merb_spec
 end
 
-gem_home = ENV['GEM_HOME'] ? "GEM_HOME=#{ENV['GEM_HOME']}" : ""
-desc "Install it all"
-task :install => [:install_gems, :package] do
-  sh %{#{sudo} gem install #{install_home} --local pkg/merb-more-#{Merb::MORE_VERSION}.gem  --no-update-sources}
-  sh %{#{sudo} gem install #{install_home} --local pkg/merb-#{Merb::MORE_VERSION}.gem --no-update-sources}
+desc "Install all gems"
+task :install do
+  Merb::RakeHelper.install('merb-more', :version => Merb::MORE_VERSION)
+  Merb::RakeHelper.install_package("pkg/merb-#{Merb::MORE_VERSION}.gem")
+end
+
+desc "Uninstall all gems"
+task :uninstall => :uninstall_gems do
+  Merb::RakeHelper.uninstall('merb-more', :version => Merb::MORE_VERSION)
+  Merb::RakeHelper.uninstall('merb', :version => Merb::MORE_VERSION)
 end
 
 desc "Build the merb-more gems"
 task :build_gems do
   gems.each do |dir|
-    Dir.chdir(dir){ sh "rake package" }
+    Dir.chdir(dir) { sh "#{Gem.ruby} -S rake package" }
   end
 end
 
 desc "Install the merb-more sub-gems"
 task :install_gems do
   gems.each do |dir|
-    Dir.chdir(dir){ sh "rake install" }
+    Dir.chdir(dir) { sh "#{Gem.ruby} -S rake install" }
   end
 end
 
 desc "Uninstall the merb-more sub-gems"
 task :uninstall_gems do
-  gems.each do |sub_gem|
-    sh %{#{sudo} gem uninstall #{sub_gem}}
+  gems.each do |dir|
+    Dir.chdir(dir) { sh "#{Gem.ruby} -S rake uninstall" }
   end
 end
 
 desc "Clobber the merb-more sub-gems"
 task :clobber_gems do
-  gems.each do |gem|
-    Dir.chdir(gem){ sh "rake clobber" }
+  gems.each do |dir|
+    Dir.chdir(dir) { sh "#{Gem.ruby} -S rake clobber" }
   end
 end
 
-
 task :package => ["lib/merb-more.rb"]
 desc "Create merb-more.rb"
 task "lib/merb-more.rb" do
@@ -122,7 +127,6 @@ task :bundle => [:package, :build_gems] do
   end
 end
 
-
 RUBY_FORGE_PROJECT = "merb"
 
 GROUP_NAME    = "merb"
@@ -154,11 +158,10 @@ namespace :release do
   desc "Publish Merb More gem to RubyForge, one by one."
   task :merb_more_gems => [ :build_gems ] do
     gems.each do |gem|
-      Dir.chdir(gem){ sh "rake release" }
+      Dir.chdir(gem){ sh "#{Gem.ruby} -S rake release" }
     end
   end
 
-
   desc "Publish Merb release files to RubyForge."
   task :merb => [ :package ] do
     require 'rubyforge'
@@ -179,3 +182,13 @@ namespace :release do
   end
 end
 
+desc "Run spec examples for Merb More gems, one by one."
+task :spec do
+  gems.each do |gem|
+    Dir.chdir(gem) { sh "#{Gem.ruby} -S rake spec" }
+  end
+end
+
+desc 'Default: run spec examples for all the gems.'
+task :default => 'spec'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 +03:00
+date: 2008-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-more
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel