merb-exceptions 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,63 +1,65 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Email and web hook exceptions for Merb."
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Andy Kent"
-GEM_EMAIL  = "andy@new-bamboo.co.uk"
-
-GEM_NAME    = "merb-exceptions"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-spec = Gem::Specification.new do |s|
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.markdown", "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', "~> #{Merb::VERSION}")
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{lib,spec}/**/*")
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
+
+# Load this library's version information
+require File.expand_path('../lib/merb-exceptions/version', __FILE__)
+
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Exceptions::VERSION
+
+    gemspec.name        = "merb-exceptions"
+    gemspec.description = "Merb plugin that supports exception notification"
+    gemspec.summary     = "Merb plugin that provides Email and web hook exceptions for Merb."
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
+    gemspec.authors     = [ "Andy Kent" ]
+    gemspec.email       = "andy@new-bamboo.co.uk"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(LICENSE Rakefile README.markdown TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core',   "~> #{Merb::VERSION}"
+    gemspec.add_dependency 'merb-mailer', "~> #{Merb::VERSION}"
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
+
+  end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new("spec") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 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']
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Exceptions::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/merb-exceptions/exceptions_helper.rb

@@ -12,15 +12,23 @@ module MerbExceptions
           request = self.request
 
           details = {}
-          details['exceptions']      = request.exceptions
-          details['params']          = params
-          details['environment']     = request.env.merge( 'process' => $$ )
-          details['url']             = "#{request.protocol}#{request.env["HTTP_HOST"]}#{request.uri}"
+          details['exceptions']  = request.exceptions
+          details['params']      = params
+          details['params']      = self.class._filter_params(params)
+          details['environment'] = request.env.merge( 'process' => $$ )
+          details['url']         = "#{request.protocol}#{request.env["HTTP_HOST"]}#{request.uri}"
           MerbExceptions::Notification.new(details).deliver!
         rescue Exception => e
           exceptions = request.exceptions << e
           Merb.logger.fatal!("Exception Notification Failed:\n" + (exceptions).inspect)
-          File.open(Merb.root / 'log' / 'notification_errors.log', 'a') do |log|
+
+          log_dir = Merb.root / 'log'
+          unless File.directory?(log_dir)
+            require 'fileutils'
+            FileUtils.mkdir_p(log_dir)
+          end
+
+          File.open(log_dir / 'notification_errors.log', 'a') do |log|
             log.puts("Exception Notification Failed:")
             exceptions.each do |e|
               log.puts(Merb.exception(e))

data/lib/merb-exceptions/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Exceptions
+    VERSION = '1.1.0.pre'.freeze
+  end
+end

data/spec/default_exception_extensions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe MerbExceptions::DefaultExceptionExtensions do
 

data/spec/exceptions_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe MerbExceptions::DefaultExceptionExtensions do
 

data/spec/notification_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 include MerbExceptions
 include NotificationSpecHelper

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,9 +1,22 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
-require "merb-core"
-require "spec"
+
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-core'
+
+# Use current merb-mailer sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-mailer/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-mailer'
+
+# The lib under test
 require "merb-exceptions"
 
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
+
+
 class Application < Merb::Controller
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-exceptions
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Andy Kent
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,37 +20,60 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
-description: Email and web hook exceptions for Merb.
+- !ruby/object:Gem::Dependency 
+  name: merb-mailer
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.pre
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Merb plugin that supports exception notification
 email: andy@new-bamboo.co.uk
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
 - LICENSE
+- TODO
 files: 
 - LICENSE
 - README.markdown
 - Rakefile
+- TODO
+- lib/merb-exceptions.rb
 - lib/merb-exceptions/default_exception_extensions.rb
 - lib/merb-exceptions/exceptions_helper.rb
 - lib/merb-exceptions/notification.rb
 - lib/merb-exceptions/templates/email.erb
-- lib/merb-exceptions.rb
+- lib/merb-exceptions/version.rb
 - spec/default_exception_extensions_spec.rb
 - spec/exceptions_helper_spec.rb
 - spec/notification_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -61,9 +84,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
@@ -71,6 +94,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Email and web hook exceptions for Merb.
+summary: Merb plugin that provides Email and web hook exceptions for Merb.
 test_files: []