merb_test_unit 0.9.3 → 0.9.4

data/Rakefile

@@ -1,49 +1,69 @@
 require 'rubygems'
+require 'rubygems/specification'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
-PLUGIN = "merb_test_unit"
-NAME = "merb_test_unit"
-VERSION = "0.9.3"
-AUTHOR = "Yehuda Katz"
-EMAIL = "ykatz@engineyard.com"
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-test_unit/"
-SUMMARY = "Merb plugin that provides Test::Unit support"
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "Merb plugin that provides Test::Unit support"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
+
+GEM_AUTHOR = "Yehuda Katz"
+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.4") + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.3')
+  s.extra_rdoc_files = ["README", "LICENSE"]
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
+  s.author = GEM_AUTHOR
+  s.email = GEM_EMAIL
+  s.homepage = PROJECT_URL
+  s.add_dependency('merb-core', '>= 0.9.4')
   s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,test_unit_generators}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,test_unit_generators}/**/*")  
 end
 
-windows = (PLATFORM =~ /win32|cygwin/) rescue nil
-
-SUDO = windows ? "" : "sudo"
-
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "Install merb_test_unit"
+desc "create a gemspec file"
+task :make_spec do
+  File.open("#{NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
+end
+
+##############################################################################
+# Installation
+##############################################################################
+
+desc "Install the gem"
 task :install => [:package] do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
 end
 
 namespace :jruby do
-
-  desc "Run :package and install the resulting .gem with jruby"
+"Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
   end
-
 end

data/lib/asserts/controller_asserts.rb

@@ -3,22 +3,22 @@ module Merb::Test::Unit::ControllerAsserts
   include Merb::Test::ControllerHelper
     
   def assert_redirect(target)
-    assert [307, *(300..305)].include?(target.respond_to?(:status) ? target.status : target), redirect_failure_message(target)
+    assert([307, *(300..305)].include?(target.respond_to?(:status) ? target.status : target), redirect_failure_message(target))
   end
   
   def assert_redirect_to(expected, target)
     location = target.headers['Location']
     
     assert_redirect(target)
-    assert_equal expected, location, redirect_to_failure_message(expected, location)
+    assert_equal(expected, location, redirect_to_failure_message(expected, location))
   end
   
   def assert_success(target)
-    assert (200..207).include?(target.respond_to?(:status) ? target.status : target), success_failure_message(target)
+    assert((200..207).include?(target.respond_to?(:status) ? target.status : target), success_failure_message(target))
   end
   
   def assert_missing(target)
-    assert (400..417).include?(target.respond_to?(:status) ? target.status : target), missing_failure_message(target)
+    assert((400..417).include?(target.respond_to?(:status) ? target.status : target), missing_failure_message(target))
   end
   
   private

data/lib/asserts/hpricot_asserts.rb

@@ -39,9 +39,9 @@ module Merb::Test::Unit::HpricotAsserts
     end
     
     if(equality[:count] != 0)
-      assert ret, "#{ message } \"#{ css_query }\" with \"#{ equality.inspect }\" was not found."
+      assert(ret, "#{ message } \"#{ css_query }\" with \"#{ equality.inspect }\" was not found.")
     else
-      assert ret, "#{ message } \"#{ css_query }\" with \"#{ equality.reject{|k,v| k == :count}.inspect }\" was found, but you specified :count => 0."
+      assert(ret, "#{ message } \"#{ css_query }\" with \"#{ equality.reject{|k,v| k == :count}.inspect }\" was found, but you specified :count => 0.")
     end
     ret
   end

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: merb_test_unit
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Yehuda Katz
-autorequire: merb_test_unit
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-03 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: 
 description: Merb plugin that provides Test::Unit support
 email: ykatz@engineyard.com
@@ -30,7 +31,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 - LICENSE
-- TODO
 files: 
 - LICENSE
 - README
@@ -57,7 +57,7 @@ files:
 - 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://merb-plugins.rubyforge.org/merb-test_unit/
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -77,8 +77,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 plugin that provides Test::Unit support