one more require conflict

docs/email

@@ -0,0 +1,17 @@
+Email
+========
+
+Install Notes
+-------------
+
+  1. address
+
+
+Developer Notes
+---------------
+
+data
+  - address
+
+payload
+  - refer to docs/github_payload

github-services.rb

@@ -1,5 +1,5 @@
 $:.unshift *Dir["#{File.dirname(__FILE__)}/vendor/**/lib"]
-%w( rack sinatra tinder json net/http net/https socket timeout xmlrpc/client openssl basecamp xmpp4r xmpp4r-simple ).each { |f| require f }
+%w( rack sinatra tinder json net/http net/https socket timeout xmlrpc/client openssl basecamp xmpp4r xmpp4r-simple tmail net/smtp ).each { |f| require f }
 
 module GitHub
   def service(name, &block)

services/email.rb

@@ -0,0 +1,28 @@
+# Inspired by: http://github.com/adamhjk/github-commit-email/tree
+service :email do |data, payload|
+
+  body = <<-EOH
+Commits to #{payload['repository']['name']} (#{payload['repository']['url']})
+Ref: #{payload['ref']} 
+
+EOH
+  payload['commits'].each do |gitsha, commit|
+  body << <<-EOH
+#{gitsha} by #{commit['author']['name']} (#{commit['author']['email']}) @ #{commit['timestamp']}
+#{commit['url']}
+
+#{commit['message']}
+
+EOH
+  end
+
+  message = TMail::Mail.new
+  message.set_content_type("text", "plain")
+  message.subject = "GitHub commit notice for #{payload['repository']['owner']['name']}-#{payload['repository']['name']}"
+  message.date = Time.now
+  message.body = body
+
+  Net::SMTP.start('localhost', 25) do |smtp|
+    smtp.send_message message.to_s, "#{payload['repository']['owner']['name']}-#{payload['repository']['name']}@github.com", data['address']
+  end
+end

vendor/.require_paths

@@ -0,0 +1,3 @@
+lib
+ext/tmailscanner
+bin

vendor/tmail-1.2.3.1/.require_paths

@@ -0,0 +1,3 @@
+lib
+ext/tmailscanner
+bin

vendor/tmail-1.2.3.1/CHANGES

@@ -0,0 +1,74 @@
+=== 1.2.3.1 / 2008-04-11
+
+* Closed #19429 - Installing TMail on Windows with the gem
+
+=== 1.2.3 / 2008-04-11
+
+* Closed #18881 - TMail goes into an endless loop if sent an crafted email
+* Closed #19203 - TMail errors in Ruby 1.9.1 on invalid multibyte chars.
+* Closed #18814 - Fixed attchment.rb failing on mail part that had a nil content-type
+* Closed #18516 - Fix TMail::Mail#preamble, and add #preamble= (Charles Lowe) (233)
+* Applied patch #18515 to remove ftools from test case (Charles Lowe) (232)
+* A lot of documentation patches to the mail and utils and net files.  Also added "log/BugTrackingLog.txt" for myself as my bug log got clobbered by the new changelog.txt format. (231)
+
+=== 1.2.2 / 2008-03-07
+
+* Fixed install bug with gem pacakge (1.2.1 was not compiling on gem install)
+* A _LOT_ more documentation...!
+* More documentation - (Mikel)
+* Applied Ruby 1.9 patches to the library - All tests passing now - (Mikel)
+* Closed #17719 - Fixed UNIXMbox code - readonly was not working and raising an exception.  Now works.
+* Closed #18038 - Multiple froms not being parsed correctly, added a test case to cover this and show the correct handling - (Mikel)
+
+=== 1.2.1 / 2008-01-11
+
+* More documentation (Mikel)
+* Added 15 test cases from the Rails ActionMailer to TMail
+* Changed mailscanner to tmailscanner (mailscanner is copyrighted)
+* Closed Bug -  Handled quote boundary being gready on content-type header (M. Mondragon)
+* Closed #16025 - Fixed scanner.rb so it passes same tests as scanner.c
+* Closed #16283 - Handled incorrect decoding of attachments (M. Aoki - garyo)
+* Closed #16899 - HeaderField.new_from_port and added test cases to cover this code (Maarten O.)
+* Closed #16900 - UNIXMbox.fromaddr missing port param and does not return Envelope Sender (Maarten O.)
+
+=== 1.2.0 / 2007-11-29
+
+* 5 major enhancements:
+  * Extensive documentation work. (mikel)
+  * Renamed scanner_c.c to mailscanner.c. (trans)
+  * Removed base64 c extension. It's speed benefit was negligable (only 0.2 sec over 10000 sizable encode/decode runs) (trans)
+  * Closed 15445 - TMail::Mail#create_forward now returns a new Mail object that has the original mail as an encoded 7 bit multipart attachment.  Also moved create_forward and create_reply from tmail/net into tmail/interface as it makes more sense to have it there. (mikel)
+  * Closed 15643 - TMail::Mail#reply_addresses was returning an empty array if reply_to was set to nil (ie, the header field existed but was empty) instead of returning the from address or default. (mikel)
+  * Closed 16025 - TMail scanner.rb would not parse ATOM chars correctly making it fail tests where the C version passed them.  Fixed this by updating the Scanner.rb version to be in step with the C version (there was an extra @ symbol in the ATOM CHARS definition that was not in the C version.) (mikel)
+  * Fixed scanner.rb so that it would pass the same tests that the C version does - had a sundry @ symbol inside of the ATOM CHARS
+* 3 minor enhancements:
+  * Renamed scanner_c.c to tmailscanner.c (trans)
+  * Changed TMail::Mail#sender to have a default "default" value of nil to be in alignment with all the other interface methods (mikel)
+  * Made base64_decode and base64_encode into ! versions as they are destructive on the mail body (encodes the body to base64 or decodes it), made aliases for base64_decode and base64_encode to point back to the bang versions.  Doing this with a view to change base64_encode to a non destructive version (returns the encoded body) in future versions. (mikel)
+
+=== 1.1.1 / 2007-11-05
+
+* 3 major enhancement:
+  * Created unified package, for installation in any platform.
+  * Added require_arch.rb to facilitate multi-platform support.
+  * If compilation fails, set NORUBYEXT="true" and reinstall.
+* 3 minor enhancement:
+  * Fixed line wrapping of long header fields so that they wrap at the correct whitespace points.
+  * Fixed bug where re-assigning the mail.body to existing mail object that already had a parsed body would not re-parse the body.
+  * Started documenting the source code... lots more to do.
+
+=== 1.1.0 / 2007-10-28
+
+* 1 minor enhancements:
+  * Changed the quoting of paramaters in the header fields to wrap double quotes around fields that are needed to be quoted.
+  * Removed keeping double quotes around a filename that does not need double quotes per RFC 1521
+  * More clean up and getting tests passing.  Now standing at 2 failures out of 3366 assertions.  One is the incorrect handling of "@"@test.com (returns @@test.com) and the other is a japanese encoding issue.
+
+=== 1.0.0 / 2007-10-28
+
+* 1 major enhancement:
+  * TMail is now released as a GEM!
+* 2 minor enhancements:
+  * Fixed bug 15077 - TMail now recognizes attachments as soon as they are added to the body.
+  * Refactored handling of quotations in header fields - now cleaner
+

vendor/tmail-1.2.3.1/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2001-2007 Minero Aoki
+Changes Copyright (c) 2007 Mikel Lindsaar
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

vendor/tmail-1.2.3.1/MANIFEST

@@ -0,0 +1,191 @@
+CHANGES
+doc
+ext
+ext/Makefile
+ext/tmailscanner
+ext/tmailscanner/tmail
+ext/tmailscanner/tmail/depend
+ext/tmailscanner/tmail/extconf.rb
+ext/tmailscanner/tmail/MANIFEST
+ext/tmailscanner/tmail/tmailscanner.c
+lib
+lib/tmail
+lib/tmail/address.rb
+lib/tmail/attachments.rb
+lib/tmail/base64.rb
+lib/tmail/compat.rb
+lib/tmail/config.rb
+lib/tmail/core_extensions.rb
+lib/tmail/encode.rb
+lib/tmail/header.rb
+lib/tmail/index.rb
+lib/tmail/interface.rb
+lib/tmail/loader.rb
+lib/tmail/mail.rb
+lib/tmail/mailbox.rb
+lib/tmail/main.rb
+lib/tmail/Makefile
+lib/tmail/mbox.rb
+lib/tmail/net.rb
+lib/tmail/obsolete.rb
+lib/tmail/parser.rb
+lib/tmail/parser.y
+lib/tmail/port.rb
+lib/tmail/quoting.rb
+lib/tmail/require_arch.rb
+lib/tmail/scanner.rb
+lib/tmail/scanner_r.rb
+lib/tmail/stringio.rb
+lib/tmail/utils.rb
+lib/tmail/version.rb
+lib/tmail.rb
+LICENSE
+log
+log/BugTrackingLog.txt
+log/Changelog.txt
+log/fixme.rdoc
+log/Fixme.txt
+log/Testlog.txt
+log/Todo.txt
+meta
+meta/MANIFEST
+meta/project.yaml
+meta/unixname
+meta/VERSION
+NOTES
+Rakefile
+README
+sample
+sample/bench_base64.rb
+sample/data
+sample/data/multipart
+sample/data/normal
+sample/data/sendtest
+sample/data/simple
+sample/data/test
+sample/extract-attachements.rb
+sample/from-check.rb
+sample/multipart.rb
+sample/parse-bench.rb
+sample/parse-test.rb
+sample/sendmail.rb
+setup.rb
+site
+site/contributing
+site/contributing/index.html
+site/css
+site/css/clean.css
+site/css/layout.css
+site/css/style.css
+site/download
+site/download/index.html
+site/img
+site/img/envelope.jpg
+site/img/mailman.gif
+site/img/stamp-sm.jpg
+site/img/stamp.jpg
+site/img/stampborder.jpg
+site/img/tfire.jpg
+site/img/tmail.png
+site/index.html
+site/js
+site/js/jquery.js
+site/log
+site/log/changelog.xml
+site/log/Changelog.xsl
+site/outdated
+site/outdated/BUGS
+site/outdated/DEPENDS
+site/outdated/doc.ja
+site/outdated/doc.ja/address.html
+site/outdated/doc.ja/basics.html
+site/outdated/doc.ja/config.html
+site/outdated/doc.ja/details.html
+site/outdated/doc.ja/index.html
+site/outdated/doc.ja/mail.html
+site/outdated/doc.ja/mailbox.html
+site/outdated/doc.ja/port.html
+site/outdated/doc.ja/tmail.html
+site/outdated/doc.ja/usage.html
+site/outdated/Incompatibilities
+site/outdated/Incompatibilities.ja
+site/outdated/NEWS
+site/outdated/rdd
+site/outdated/rdd/address.rrd.m
+site/outdated/rdd/basics.rd.m
+site/outdated/rdd/config.rrd.m
+site/outdated/rdd/details.rd.m
+site/outdated/rdd/index.rhtml.m
+site/outdated/rdd/mail.rrd.m
+site/outdated/rdd/mailbox.rrd.m
+site/outdated/rdd/port.rrd.m
+site/outdated/rdd/tmail.rrd.m
+site/outdated/rdd/usage.rd.m
+site/outdated/README.ja
+site/quickstart
+site/quickstart/index.html
+site/quickstart/quickstart.html
+site/quickstart/usage.html
+site/reference
+site/reference/address.html
+site/reference/config.html
+site/reference/index.html
+site/reference/mail.html
+site/reference/mailbox.html
+site/reference/port.html
+site/reference/tmail.html
+test
+test/extctrl.rb
+test/fixtures
+test/fixtures/mailbox
+test/fixtures/mailbox_without_any_from_or_sender
+test/fixtures/mailbox_without_from
+test/fixtures/mailbox_without_return_path
+test/fixtures/raw_attack_email_with_zero_length_whitespace
+test/fixtures/raw_base64_decoded_string
+test/fixtures/raw_base64_email
+test/fixtures/raw_base64_encoded_string
+test/fixtures/raw_email
+test/fixtures/raw_email10
+test/fixtures/raw_email11
+test/fixtures/raw_email12
+test/fixtures/raw_email13
+test/fixtures/raw_email2
+test/fixtures/raw_email3
+test/fixtures/raw_email4
+test/fixtures/raw_email5
+test/fixtures/raw_email6
+test/fixtures/raw_email7
+test/fixtures/raw_email8
+test/fixtures/raw_email9
+test/fixtures/raw_email_multiple_from
+test/fixtures/raw_email_quoted_with_0d0a
+test/fixtures/raw_email_reply
+test/fixtures/raw_email_simple
+test/fixtures/raw_email_with_bad_date
+test/fixtures/raw_email_with_illegal_boundary
+test/fixtures/raw_email_with_mimepart_without_content_type
+test/fixtures/raw_email_with_multipart_mixed_quoted_boundary
+test/fixtures/raw_email_with_nested_attachment
+test/fixtures/raw_email_with_partially_quoted_subject
+test/fixtures/raw_email_with_quoted_illegal_boundary
+test/kcode.rb
+test/temp_test_one.rb
+test/test_address.rb
+test/test_attachments.rb
+test/test_base64.rb
+test/test_encode.rb
+test/test_header.rb
+test/test_helper.rb
+test/test_mail.rb
+test/test_mbox.rb
+test/test_port.rb
+test/test_quote.rb
+test/test_scanner.rb
+test/test_utils.rb
+work
+work/script
+work/script/make
+work/script/rdoc
+work/script/setup
+work/script/test

vendor/tmail-1.2.3.1/NOTES

@@ -0,0 +1,7 @@
+[ANN] TMail 1.2.3.1 - Minor Fix to Installer
+
+This release just handles a bug with installing the gem on a Windows platform.
+
+It is otherwise identical to 1.2.3
+
+Mikel