merb_test_unit 0.9.7 → 0.9.8

data/Rakefile

@@ -18,7 +18,7 @@ GEM_EMAIL  = "ykatz@engineyard.com"
 
 GEM_NAME    = "merb_test_unit"
 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.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,test_unit_generators}/**/*")  
 end
@@ -45,25 +45,34 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+desc "Install the gem"
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-##############################################################################
-# Installation
-##############################################################################
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
 
-desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
 end
 
-namespace :jruby do
-"Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_test_unit
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 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: 
 description: Merb plugin that provides Test::Unit support
 email: ykatz@engineyard.com
@@ -42,20 +42,6 @@ files:
 - lib/merb_test_unit
 - lib/merb_test_unit/merbtasks.rb
 - lib/merb_test_unit.rb
-- test_unit_generators/merb_controller_test
-- test_unit_generators/merb_controller_test/merb_controller_test_generator.rb
-- test_unit_generators/merb_controller_test/templates
-- test_unit_generators/merb_controller_test/templates/test
-- test_unit_generators/merb_controller_test/templates/test/functional
-- test_unit_generators/merb_controller_test/templates/test/functional/%controller_full_file_path%_test.rb
-- test_unit_generators/merb_model_test
-- test_unit_generators/merb_model_test/merb_model_test_generator.rb
-- test_unit_generators/merb_model_test/templates
-- test_unit_generators/merb_model_test/templates/test
-- test_unit_generators/merb_model_test/templates/test/unit
-- test_unit_generators/merb_model_test/templates/test/unit/%model_file_name%_test.rb
-- test_unit_generators/merb_resource_controller_test
-- test_unit_generators/merb_resource_controller_test/merb_resource_controller_test_generator.rb
 has_rdoc: true
 homepage: http://merbivore.com
 post_install_message: 

data/test_unit_generators/merb_controller_test/merb_controller_test_generator.rb

@@ -1,47 +0,0 @@
-class MerbControllerTestGenerator < Merb::GeneratorBase
-  attr_reader :controller_modules, 
-              :controller_class_name, 
-              :controller_file_name,
-              :controller_base_path,
-              :full_controller_const
-  
-  def initialize(args, runtime_args = {})
-    @base =             File.dirname(__FILE__)
-    super    
-    @controller_modules     = runtime_args[:controller_modules]
-    @controller_class_name  = runtime_args[:controller_class_name]
-    @controller_file_name   = runtime_args[:controller_file_name]
-    @controller_base_path   = runtime_args[:controller_base_path]
-    @full_controller_const  = runtime_args[:full_controller_const]
-  end
-  
-  def manifest
-    record do |m|
-      @m = m
-    
-      @assigns = {  
-                    :controller_modules         => controller_modules, 
-                    :controller_class_name      => controller_class_name,
-                    :controller_full_file_path  => controller_file_name,
-                    :controller_file_name       => controller_file_name.split("/").last,
-                    :controller_base_path       => controller_base_path,
-                    :full_controller_const      => full_controller_const
-                  }
-      
-      # make sure the directory is availalbe
-      m.directory File.join("test", "functional", "#{controller_base_path}")
-                  
-      copy_dirs
-      copy_files
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
-      Creates a basic Test::Unit Functional test stub.
-
-      USAGE: #{spec.name}"
-    EOS
-  end
-end

data/test_unit_generators/merb_controller_test/templates/test/functional/%controller_full_file_path%_test.rb

@@ -1,17 +0,0 @@
-require File.join(File.dirname(__FILE__), "<%= Array.new((controller_modules.size + 1),'..').join("/") %>",'test_helper')
-
-# Re-raise errors caught by the controller.
-class <%= full_controller_const %>; def rescue_action(e) raise e end; end
-
-class <%= full_controller_const %>Test < Test::Unit::TestCase
-
-  def setup
-    @controller = <%= full_controller_const %>.build(fake_request)
-    @controller.dispatch('index')
-  end
-
-  # Replace this with your real tests.
-  def test_should_be_setup
-    assert false
-  end
-end

data/test_unit_generators/merb_model_test/merb_model_test_generator.rb

@@ -1,34 +0,0 @@
-class MerbModelTestGenerator < Merb::GeneratorBase
-  attr_reader :model_attributes, :model_class_name, :model_file_name
-  
-  def initialize(args, runtime_args = {})
-    @base =             File.dirname(__FILE__)
-    super    
-    @model_file_name  = runtime_args[:model_file_name]
-    @model_attributes = runtime_args[:model_attributes]
-    @model_class_name = runtime_args[:model_class_name]
-
-  end
-  
-  def manifest
-    record do |m|
-      @m = m
-    
-      @assigns = {  :model_file_name  => model_file_name, 
-                    :model_attributes => model_attributes,
-                    :model_class_name => model_class_name
-                  }
-      copy_dirs
-      copy_files
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
-      Creates a basic Test::Unit unit test stub.
-
-      USAGE: #{spec.name}"
-    EOS
-  end   
-end

data/test_unit_generators/merb_model_test/templates/test/unit/%model_file_name%_test.rb

@@ -1,9 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper' )
-
-class <%= "#{model_class_name}Test" %> < Test::Unit::TestCase
-
-  def test_should_be_tested
-    assert false
-  end
-
-end

data/test_unit_generators/merb_resource_controller_test/merb_resource_controller_test_generator.rb

@@ -1,31 +0,0 @@
-class MerbControllerTestGenerator < Merb::GeneratorBase
-  attr_reader :controller_modules, 
-              :controller_class_name, 
-              :controller_file_name,
-              :controller_base_path,
-              :full_controller_const
-  
-  def initialize(args, runtime_args = {})
-    @base =             File.dirname(__FILE__)
-    super    
-    @args = args
-    @runtime_args = runtime_args
-  end
-  
-  def manifest
-    record do |m|
-      @m = m
-    
-      m.dependency "merb_controller_test", @args, @runtime_args
-    end
-  end
-  
-  protected
-  def banner
-    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
-      Creates a basic Test::Unit Functional test stub.
-
-      USAGE: #{spec.name}"
-    EOS
-  end
-end