Merge branch 'master' of https://github.com/streamio/resque_mailer in…

…to streamio

Conflicts:
	.gitignore
	VERSION
	resque_mailer.gemspec

.gitignore

@@ -20,5 +20,6 @@ doc
 pkg
 .yardoc
 .rvmrc
+*.gem
 
 ## PROJECT::SPECIFIC

CHANGELOG.md

@@ -1,3 +1,9 @@
+### EDGE / 2012-02-17
+
+* Removed Resque dependency for compatibility with Resque forks
+  (mongo-resque, etc)
+* Message decoy acts more like a real message (to\_s)
+
 ### 2.0.3 / 2012-02-17
 
 * Added ability to override local queue name (example scenario: using
@@ -23,7 +29,7 @@
 
 ### 1.0.1 / 2010-12-21
 
-* Respect ActionMailer::Base.perform_deliveries
+* Respect ActionMailer::Base.perform\_deliveries
 
 ### v1.0.0 / 2010-07-28
 

Gemfile

@@ -1,17 +1,9 @@
 source 'http://rubygems.org'
 
-# Add dependencies required to use your gem here.
-# Example:
-#   gem 'activesupport', '>= 2.3.5'
-
-gem 'resque', '>= 1.2.3'
-gem 'actionmailer', '>= 3.0.0'
+gemspec
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'rspec', '>= 2.6.0'
-  gem 'yard', '>= 0.6.0'
-  gem 'bundler', '~> 1.0.0'
-  gem 'jeweler', '~> 1.6.2'
+  gem 'rake', '~> 0.9'
 end

Gemfile.lock

@@ -1,57 +1,54 @@
+PATH
+  remote: .
+  specs:
+    resque_mailer (2.0.4)
+      actionmailer (~> 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
-    builder (2.1.2)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.6.2)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.5.3)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2)
-    redis (2.2.1)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    resque (1.17.1)
-      json (>= 1.4.6, < 1.6)
-      redis-namespace (~> 1.0.2)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -60,24 +57,21 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    tilt (1.3.2)
-    treetop (1.4.9)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.28)
-    vegas (0.1.8)
-      rack (>= 1.0.0)
     yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer (>= 3.0.0)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.2)
-  resque (>= 1.2.3)
-  rspec (>= 2.6.0)
+  rake (~> 0.9)
+  resque_mailer!
+  rspec (~> 2.6)
   yard (>= 0.6.0)

Rakefile

@@ -1,38 +1,7 @@
-# encoding: utf-8
-
-require 'rubygems'
 require 'bundler'
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "resque_mailer"
-    gem.summary = %Q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
-    gem.description = %Q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
-    gem.email = "nap@zerosum.org"
-    gem.homepage = "http://github.com/zapnap/resque_mailer"
-    gem.authors = ["Nick Plante"]
-    gem.add_development_dependency "rspec", ">= 2.6.0"
-    gem.add_development_dependency "resque", ">= 1.2.3"
-    gem.add_development_dependency "actionmailer", ">= 3.0.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::RubygemsDotOrgTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+Bundler.setup(:default, :development)
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
@@ -43,3 +12,15 @@ task :default => :spec
 
 require 'yard'
 YARD::Rake::YardocTask.new
+
+desc "Push a new version to Rubygems"
+task :publish do
+  require 'resque_mailer/version'
+
+  sh "gem build resque_mailer.gemspec"
+  sh "gem push resque_mailer-#{Resque::Mailer::VERSION}.gem"
+  sh "rm resque_mailer-#{Resque::Mailer::VERSION}.gem"
+  sh "git tag v#{Resque::Mailer::VERSION}"
+  sh "git push origin v#{Resque::Mailer::VERSION}"
+  sh "git push origin master"
+end

lib/resque_mailer.rb

@@ -1,3 +1,5 @@
+require 'resque_mailer/version'
+
 module Resque
   module Mailer
     class << self

lib/resque_mailer/version.rb

@@ -0,0 +1,5 @@
+module Resque
+  module Mailer
+    VERSION = "2.0.4"
+  end
+end

resque_mailer.gemspec

@@ -1,76 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{resque_mailer}
-  s.version = "2.0.3"
+require "resque_mailer/version"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Nick Plante}]
-  s.date = %q{2012-02-17}
-  s.description = %q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
-  s.email = %q{nap@zerosum.org}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "CHANGELOG.md",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/resque_mailer.rb",
-    "rails/init.rb",
-    "resque_mailer.gemspec",
-    "spec/resque_mailer_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/zapnap/resque_mailer}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.9}
-  s.summary = %q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
+Gem::Specification.new do |s|
+  s.name        = "resque_mailer"
+  s.version     = Resque::Mailer::VERSION
+  s.authors     = ["Nick Plante"]
+  s.email       = ["nap@zerosum.org"]
+  s.homepage    = "http://github.com/zapnap/resque_mailer"
+  s.summary     = "Rails plugin for sending asynchronous email with ActionMailer and Resque."
+  s.description = "Rails plugin for sending asynchronous email with ActionMailer and Resque."
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_dependency("actionmailer", "~> 3.0")
+  s.add_development_dependency("rspec", "~> 2.6")
+  s.add_development_dependency("yard", ">= 0.6.0")
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<resque>, [">= 1.2.3"])
-      s.add_runtime_dependency(%q<actionmailer>, [">= 3.0.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_development_dependency(%q<resque>, [">= 1.2.3"])
-      s.add_development_dependency(%q<actionmailer>, [">= 3.0.0"])
-    else
-      s.add_dependency(%q<resque>, [">= 1.2.3"])
-      s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
-      s.add_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_dependency(%q<yard>, [">= 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_dependency(%q<resque>, [">= 1.2.3"])
-      s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
-    end
-  else
-    s.add_dependency(%q<resque>, [">= 1.2.3"])
-    s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
-    s.add_dependency(%q<rspec>, [">= 2.6.0"])
-    s.add_dependency(%q<yard>, [">= 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-    s.add_dependency(%q<rspec>, [">= 2.6.0"])
-    s.add_dependency(%q<resque>, [">= 1.2.3"])
-    s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
-  end
+  s.extra_rdoc_files = %w(LICENSE CHANGELOG.md README.md)
+  s.files            = Dir.glob("lib/**/*") + %w(README.md LICENSE CHANGELOG.md)
 end
-

spec/resque_mailer_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+require 'spec_helper'
 
 class FakeResque
   def self.enqueue(*args); end