merb_sequel 0.9.7 → 0.9.8

data/Rakefile

@@ -18,7 +18,7 @@ GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com"
 
 GEM_NAME    = "merb_sequel"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency("merb-core", ">= 0.9.7")
+  s.add_dependency("merb-core", ">= 0.9.8")
   s.add_dependency("sequel",    ">= 1.4.0")
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
 end
@@ -45,35 +45,34 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-##############################################################################
-# Installation
-##############################################################################
 desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
-  end
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
 end
 
-##############################################################################
-# Specs
-##############################################################################
-desc "Run all specs"
-Spec::Rake::SpecTask.new("specs") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
 end
 
-desc "Run all specs and generate an rcov report"
-Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.rcov = true
-  t.rcov_dir = 'coverage'
-  t.rcov_opts = ['--exclude', 'gems', '--exclude', 'spec']
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"] 
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
+  end
 end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

data/lib/generators/resource_controller.rb

@@ -1,6 +1,6 @@
 Merb::Generators::ResourceControllerGenerator.template :controller_sequel, :orm => :sequel do |t|
-  t.source = File.dirname(__FILE__), "templates/resource_controller/app/controllers/%file_name%.rb"
-  t.destination = "app/controllers", base_path, "#{file_name}.rb"
+  t.source = File.dirname(__FILE__) / "templates/resource_controller/app/controllers/%file_name%.rb"
+  t.destination = "app/controllers" / base_path / "#{file_name}.rb"
 end
 
 [:index, :show, :edit, :new].each do |view|

data/specs/spec_helper.rb

@@ -1,2 +1 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), "..", "lib")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Wayne E. Seguin, Lance Carlson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 +03:00
+date: 2008-10-07 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: sequel