merb-more 0.9.3 → 0.9.4

data/Rakefile

@@ -1,23 +1,27 @@
 ## THESE ARE CRUCIAL
 module Merb
   # Set this to the version of merb-core that you are building against/for
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 
   # Set this to the version of merb-more you plan to release
-  MORE_VERSION = "0.9.3"
+  MORE_VERSION = "0.9.4"
 end
 
+GEM_VERSION = Merb::VERSION
+
 require "rake/clean"
 require "rake/gempackagetask"
+require 'merb-core/tasks/merb_rake_helper'
 require 'fileutils'
 include FileUtils
 
 gems = %w[
   merb-action-args merb-assets merb-gen merb-haml
-  merb-builder merb-mailer merb-parts merb-cache merb-freezer
+  merb-builder merb-mailer merb-parts merb-cache merb-freezer merb-slices merb-jquery
 ]
 
 merb_more_spec = Gem::Specification.new do |s|
+  s.rubyforge_project = 'merb'
   s.name         = "merb-more"
   s.version      = Merb::MORE_VERSION
   s.platform     = Gem::Platform::RUBY
@@ -34,6 +38,7 @@ merb_more_spec = Gem::Specification.new do |s|
 end
 
 merb_spec = Gem::Specification.new do |s|
+  s.rubyforge_project = 'merb'
   s.name         = "merb"
   s.version      = Merb::MORE_VERSION
   s.platform     = Gem::Platform::RUBY
@@ -50,13 +55,6 @@ end
 
 CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
 
-windows = (PLATFORM =~ /win32|cygwin/) rescue nil
-
-SUDO = windows ? "" : "sudo"
-
-# desc "Installs Merb More."
-# task :default => :install
-
 Rake::GemPackageTask.new(merb_more_spec) do |package|
   package.gem_spec = merb_more_spec
 end
@@ -66,12 +64,10 @@ Rake::GemPackageTask.new(merb_spec) do |package|
 end
 
 gem_home = ENV['GEM_HOME'] ? "GEM_HOME=#{ENV['GEM_HOME']}" : ""
-install_home = ENV['GEM_HOME'] ? "-i #{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}
+  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}
 end
 
 desc "Build the merb-more gems"
@@ -91,10 +87,18 @@ end
 desc "Uninstall the merb-more sub-gems"
 task :uninstall_gems do
   gems.each do |sub_gem|
-    sh %{#{SUDO} gem uninstall #{sub_gem}}
+    sh %{#{sudo} gem uninstall #{sub_gem}}
   end
 end
 
+desc "Clobber the merb-more sub-gems"
+task :clobber_gems do
+  gems.each do |gem|
+    Dir.chdir(gem){ sh "rake clobber" }
+  end
+end
+
+
 task :package => ["lib/merb-more.rb"]
 desc "Create merb-more.rb"
 task "lib/merb-more.rb" do
@@ -114,9 +118,64 @@ task :bundle => [:package, :build_gems] do
   cp "pkg/merb-#{Merb::MORE_VERSION}.gem", "bundle"
   cp "pkg/merb-more-#{Merb::MORE_VERSION}.gem", "bundle"
   gems.each do |gem|
-    File.open("#{gem}/Rakefile") do |rakefile|
-      rakefile.read.detect {|l| l =~ /^VERSION\s*=\s*"(.*)"$/ }
-      sh %{cp #{gem}/pkg/#{gem}-#{$1}.gem bundle/}
+    sh %{cp #{gem}/pkg/#{gem}-#{Merb::MORE_VERSION}.gem bundle/}
+  end
+end
+
+
+RUBY_FORGE_PROJECT = "merb"
+
+GROUP_NAME    = "merb"
+PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+PKG_VERSION   = GEM_VERSION + PKG_BUILD
+
+RELEASE_NAME  = "REL #{PKG_VERSION}"
+
+namespace :release do
+  desc "Publish Merb More release files to RubyForge."
+  task :merb_more => [ :package ] do
+    require 'rubyforge'
+    require 'rake/contrib/rubyforgepublisher'
+
+    packages = %w( gem tgz zip ).collect{ |ext| "pkg/merb-more-#{PKG_VERSION}.#{ext}" }
+
+    begin
+      sh %{rubyforge login}
+      sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb-more #{Merb::MORE_VERSION} #{packages.join(' ')}}
+      sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb-more #{Merb::MORE_VERSION} #{packages.join(' ')}}
+    rescue Exception => e
+      puts
+      puts "Release failed: #{e.message}"
+      puts
+      puts "Set PKG_BUILD environment variable if you do a subrelease (0.9.4.2008_08_02 when version is 0.9.4)"
+    end
+  end
+
+  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" }
+    end
+  end
+
+
+  desc "Publish Merb release files to RubyForge."
+  task :merb => [ :package ] do
+    require 'rubyforge'
+    require 'rake/contrib/rubyforgepublisher'
+
+    packages = %w( gem tgz zip ).collect{ |ext| "pkg/merb-#{PKG_VERSION}.#{ext}" }
+
+    begin
+      sh %{rubyforge login}
+      sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
+      sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} merb #{Merb::VERSION} #{packages.join(' ')}}
+    rescue Exception => e
+      puts
+      puts "Release failed: #{e.message}"
+      puts
+      puts "Set PKG_BUILD environment variable if you do a subrelease (0.9.4.2008_08_02 when version is 0.9.4)"
     end
   end
 end
+

data/lib/merb-more.rb

@@ -7,3 +7,5 @@ require 'merb-mailer'
 require 'merb-parts'
 require 'merb-cache'
 require 'merb-freezer'
+require 'merb-slices'
+require 'merb-jquery'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-more
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,122 +9,158 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-action-args
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-assets
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-gen
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-haml
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-builder
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-mailer
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-parts
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-cache
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-freezer
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
+    - - <=
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: merb-slices
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
+    - - <=
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: merb-jquery
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
     - - <=
       - !ruby/object:Gem::Version 
         version: "1.0"
@@ -164,8 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: (merb - merb-core) == merb-more.  The Full Stack. Take what you need; leave what you don't.