lib/ronin/network/extensions/esmtp/net.rb in ronin-support-0.3.0 vs lib/ronin/network/extensions/esmtp/net.rb in ronin-support-0.4.0.rc1

@@ -15,90 +15,10 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/network/extensions/smtp'
+require 'ronin/network/esmtp'
 
 module Net
-  #
-  # @see Ronin::Network::SMTP.message
-  #
-  # @api public
-  #
-  def Net.esmtp_message(options={},&block)
-    Net.smtp_message(options,&block)
-  end
-
-  #
-  # Creates a connection to the ESMTP server.
-  #
-  # @param [String] host
-  #   The host to connect to.
-  #
-  # @param [Hash] options
-  #   Additional options.
-  #
-  # @option options [Integer] :port (Ronin::Network::SMTP.default_port)
-  #   The port to connect to.
-  #
-  # @option options [String] :helo
-  #   The HELO domain.
-  #
-  # @option options [Symbol] :auth
-  #   The type of authentication to use. Can be either `:login`, `:plain`,
-  #   or `:cram_md5`.
-  #
-  # @option options [String] :user
-  #   The user-name to authenticate with.
-  #
-  # @option options [String] :password
-  #   The password to authenticate with.
-  #
-  # @yield [session]
-  #   If a block is given, it will be passed an ESMTP enabled session
-  #   object.
-  #
-  # @yieldparam [Net::SMTP] session
-  #   The ESMTP session.
-  #
-  # @return [Net::SMTP]
-  #   The ESMTP enabled session.
-  #
-  # @api public
-  #
-  def Net.esmtp_connect(host,options={})
-    session = Net.smtp_connect(host,options)
-    session.esmtp = true
-
-    yield session if block_given?
-    return session
-  end
-
-  #
-  # Starts an ESMTP session with the ESMTP enabled server.
-  #
-  # @param [String] host
-  #   The host to connect to.
-  #
-  # @param [Hash] options
-  #   Additional options.
-  #
-  # @yield [session]
-  #   If a block is given, it will be passed an ESMTP enabled session
-  #   object. After the block has returned, the session will be closed.
-  #
-  # @yieldparam [Net::SMTP] session
-  #   The ESMTP session.
-  #
-  # @see Net.esmtp_connect
-  #
-  # @api public
-  #
-  def Net.esmtp_session(host,options={})
-    Net.smtp_session(host,options) do |session|
-      session.esmtp = true
-
-      yield session if block_given?
-    end
-  end
+  extend Ronin::Network::ESMTP
 end