merb 0.9.8 → 0.9.9

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Engine Yard
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -0,0 +1,3 @@
+merb
+====
+

data/Rakefile

@@ -1,194 +1,102 @@
-## THESE ARE CRUCIAL
-module Merb
-  # Set this to the version of merb-core that you are building against/for
-  VERSION = "0.9.8"
-
-  # Set this to the version of merb-more you plan to release
-  MORE_VERSION = "0.9.8"
-end
-
-GEM_VERSION = Merb::VERSION
-
-require "rake/clean"
-require "rake/gempackagetask"
+require 'rubygems'
+require 'rake/gempackagetask'
+require 'rubygems/specification'
+require 'date'
+require 'merb-core/version'
 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-slices
-  merb-jquery merb-helpers
+NAME = "merb"
+AUTHOR = "Merb Team"
+EMAIL = "team@merbivore.com"
+HOMEPAGE = "http://merbivore.com/"
+SUMMARY = "(merb-core + merb-more + DM) == Merb stack"
+
+# For RubyForge release task
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = HOMEPAGE
+PROJECT_SUMMARY     = SUMMARY
+PROJECT_DESCRIPTION = SUMMARY
+
+GEM_AUTHOR = AUTHOR
+GEM_EMAIL  = EMAIL
+
+GEM_NAME    = NAME
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = Merb::VERSION  + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+gems = [
+  ["merb-core", "~> #{GEM_VERSION}"],
+  ["merb-more", "~> #{GEM_VERSION}"],
+  ["dm-core", "~> 0.9.6"],
+  ["do_sqlite3", "~> 0.9.6"],
+  ["dm-timestamps", "~> 0.9.6"],
+  ["dm-types", "~> 0.9.6"],
+  ["dm-aggregates", "~> 0.9.6"],
+  ["dm-migrations", "~> 0.9.6"],
+  ["dm-validations", "~> 0.9.6"],
+  ["dm-sweatshop", "~> 0.9.6"]
 ]
 
-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
-  s.author       = "Ezra Zygmuntowicz"
-  s.email        = "ez@engineyard.com"
-  s.homepage     = "http://www.merbivore.com"
-  s.summary      = "(merb - merb-core) == merb-more.  The Full Stack. Take what you need; leave what you don't."
-  s.description  = s.summary
-  s.files        = %w( LICENSE README Rakefile TODO lib/merb-more.rb )
-  s.add_dependency "merb-core", ">= #{Merb::VERSION}"
-  gems.each do |gem|
-    s.add_dependency gem, [">= #{Merb::VERSION}", "<= 1.0"]
-  end
-end
-
 merb_spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'merb'
-  s.name         = "merb"
-  s.version      = Merb::MORE_VERSION
+  s.name         = NAME
+  s.version      = GEM_VERSION
   s.platform     = Gem::Platform::RUBY
-  s.author       = "Ezra Zygmuntowicz"
-  s.email        = "ez@engineyard.com"
-  s.homepage     = "http://www.merbivore.com"
-  s.summary      = "(merb-core + merb-more) == all of Merb"
-  s.description  = s.summary
-  s.files        = %w( LICENSE README Rakefile TODO )
-  s.add_dependency "merb-core", "= #{Merb::VERSION}"
-  s.add_dependency "merb-more", "= #{Merb::MORE_VERSION}"
-  s.add_dependency "mongrel", ">= 1.0.1"
-end
-
-CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "lib/merb-more.rb"]
-
-Rake::GemPackageTask.new(merb_more_spec) do |package|
-  package.gem_spec = merb_more_spec
+  s.author       = AUTHOR
+  s.email        = EMAIL
+  s.homepage     = HOMEPAGE
+  s.summary      = SUMMARY
+  s.description  = SUMMARY
+  s.files        = %w(LICENSE README Rakefile) + Dir.glob("{lib}/**/*")
+  gems.each do |gem, version|
+    s.add_dependency gem, version
+  end
 end
 
 Rake::GemPackageTask.new(merb_spec) do |package|
   package.gem_spec = merb_spec
 end
 
-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 "#{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 "#{Gem.ruby} -S rake install" }
-  end
-end
+require "extlib/tasks/release"
 
-desc "Uninstall the merb-more sub-gems"
-task :uninstall_gems do
-  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 |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
+task :package => ["lib/merb.rb"]
+desc "Create merb.rb"
+task "lib/merb.rb" do
   mkdir_p "lib"
-  File.open("lib/merb-more.rb","w+") do |file|
-    file.puts "### AUTOMATICALLY GENERATED.  DO NOT EDIT."
-    gems.each do |gem|
-      next if gem == "merb-gen"
-      file.puts "require '#{gem}'"
+  File.open("lib/merb.rb","w+") do |file|
+    file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT!"
+    gems.each do |pair|
+      g, _ = pair
+      file.puts "require '#{g}'"
     end
   end
 end
 
 desc "Bundle up all the merb-more gems"
-task :bundle => [:package, :build_gems] do
+task :bundle => [:package] do
   mkdir_p "bundle"
-  cp "pkg/merb-#{Merb::MORE_VERSION}.gem", "bundle"
-  cp "pkg/merb-more-#{Merb::MORE_VERSION}.gem", "bundle"
+  cp "pkg/merb-#{GEM_VERSION}.gem", "bundle"
+  cp "pkg/merb-more-#{GEM_VERSION}.gem", "bundle"
   gems.each do |gem|
     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 "#{Gem.ruby} -S 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}" }
+desc "Install the gem"
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
+end
 
-    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
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
 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" }
+desc "create a gemspec file"
+task :make_spec do
+  File.open("#{NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
 end
-
-desc 'Default: run spec examples for all the gems.'
-task :default => 'spec'
-

data/lib/merb.rb

@@ -0,0 +1,11 @@
+### AUTOMATICALLY GENERATED. DO NOT EDIT!
+require 'merb-core'
+require 'merb-more'
+require 'dm-core'
+require 'do_sqlite3'
+require 'dm-timestamps'
+require 'dm-types'
+require 'dm-aggregates'
+require 'dm-migrations'
+require 'dm-validations'
+require 'dm-sweatshop'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
-- Ezra Zygmuntowicz
+- Merb Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +03:00
+date: 2008-10-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-more
@@ -28,22 +28,92 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: dm-core
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 0.9.6
     version: 
-description: (merb-core + merb-more) == all of Merb
-email: ez@engineyard.com
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-timestamps
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-aggregates
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-sweatshop
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
+description: (merb-core + merb-more + DM) == Merb stack
+email: team@merbivore.com
 executables: []
 
 extensions: []
@@ -54,9 +124,9 @@ files:
 - LICENSE
 - README
 - Rakefile
-- TODO
+- lib/merb.rb
 has_rdoc: false
-homepage: http://www.merbivore.com
+homepage: http://merbivore.com/
 post_install_message: 
 rdoc_options: []
 
@@ -80,6 +150,6 @@ rubyforge_project: merb
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: (merb-core + merb-more) == all of Merb
+summary: (merb-core + merb-more + DM) == Merb stack
 test_files: []