em-imap 0.2.2 → 0.3.0

data/README.md

@@ -1,4 +1,4 @@
-An [EventMachine](http://eventmachine.org/) based [IMAP](http://tools.ietf.org/html/rfc3501) client.
+An [EventMachine](http://rubyeventmachine.com/) based [IMAP](http://tools.ietf.org/html/rfc3501) client.
 
 ## Installation
 

data/lib/em-imap.rb

@@ -11,6 +11,7 @@ require 'em-imap/continuation_synchronisation'
 require 'em-imap/formatter'
 require 'em-imap/command_sender'
 require 'em-imap/response_parser'
+require 'em-imap/deferrable_ssl'
 require 'em-imap/connection'
 
 require 'em-imap/authenticators'

data/lib/em-imap/client.rb

@@ -61,12 +61,22 @@ module EventMachine
 
       ## 6.2 Client Commands - Not Authenticated State
 
-      # This would start tls negotiations, until this is implemented,
-      # simply pass true as the first parameter to EM::IMAP.connect.
+      # Run a STARTTLS handshake.
       #
+      # C: "STARTTLS\r\n"
+      # S: "OK go ahead\r\n"
+      # C: <tls handshake>
+      # S: <tls handshake>
+      #
+      # Succeeds with the OK response after the TLS handshake is complete.
       def starttls
-        raise NotImplementedError
+        tagged_response("STARTTLS").bind! do |response|
+          @connection.start_tls.transform{ response }
+        end
       end
+      # the IMAP command is STARTTLS, the eventmachine method is start_tls.
+      # Let's be nice to everyone and make both work.
+      alias_method :start_tls, :starttls
 
       # Authenticate using a custom authenticator.
       #

data/lib/em-imap/connection.rb

@@ -7,6 +7,7 @@ module EventMachine
 
       include IMAP::CommandSender
       include IMAP::ResponseParser
+      include IMAP::DeferrableSSL
 
       # Create a new connection to an IMAP server.
       #

data/lib/em-imap/deferrable_ssl.rb

@@ -0,0 +1,29 @@
+module EventMachine
+  module IMAP
+
+    # By default it's hard to tell when the SSL handshake has finished.
+    # We thus wrap start_tls so that it returns a deferrable that will
+    # tell us when it's done.
+    module DeferrableSSL
+      # Run a TLS handshake and return a deferrable that succeeds when it's
+      # finished
+      #
+      # TODO: expose certificates so they can be verified.
+      def start_tls
+        unless @ssl_deferrable
+          @ssl_deferrable = DG::blank
+          bothback{ @ssl_deferrable.fail }
+          super
+        end
+        @ssl_deferrable
+      end
+
+      # Hook into ssl_handshake_completed so that we know when to succeed
+      # the deferrable we returned above.
+      def ssl_handshake_completed
+        @ssl_deferrable.succeed
+        super
+      end
+    end
+  end
+end

metadata

@@ -1,49 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: em-imap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
   prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &22042360 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *22042360
-- !ruby/object:Gem::Dependency
-  name: deferrable_gratification
-  requirement: &22041860 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: eventmachine
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *22041860
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &22041400 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: deferrable_gratification
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *22041400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec
 description: Allows you to connect to an IMAP4rev1 server in a non-blocking fashion.
 email:
 - conrad@rapportive.com
@@ -53,13 +68,14 @@ extra_rdoc_files: []
 files:
 - lib/em-imap.rb
 - lib/em-imap/listener.rb
+- lib/em-imap/response_parser.rb
+- lib/em-imap/client.rb
+- lib/em-imap/continuation_synchronisation.rb
+- lib/em-imap/deferrable_ssl.rb
 - lib/em-imap/formatter.rb
+- lib/em-imap/connection.rb
 - lib/em-imap/command_sender.rb
 - lib/em-imap/authenticators.rb
-- lib/em-imap/connection.rb
-- lib/em-imap/continuation_synchronisation.rb
-- lib/em-imap/client.rb
-- lib/em-imap/response_parser.rb
 - LICENSE.MIT
 - README.md
 homepage: http://github.com/rapportive-oss/em-imap
@@ -83,8 +99,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An EventMachine based IMAP client.
 test_files: []
+has_rdoc: