Land rapid7#7316, use new rex-encoder gem

Author: pbarry-r7

Gemfile.lock

@@ -36,6 +36,7 @@ PATH
       rex-arch
       rex-bin_tools
       rex-core
+      rex-encoder
       rex-java
       rex-mime
       rex-nop
@@ -244,6 +245,10 @@ GEM
       rex-struct2
       rex-text
     rex-core (0.1.2)
+    rex-encoder (0.1.0)
+      metasm
+      rex-arch
+      rex-text
     rex-java (0.1.2)
     rex-mime (0.1.1)
       rex-text

lib/rex.rb

@@ -41,6 +41,7 @@ module Rex
 #
 # REX Gems
 #
+
 # Text manipulation library for things like generating random string
 require 'rex/text'
 # Library for Generating Randomized strings valid as Identifiers such as variable names
@@ -59,12 +60,15 @@ module Rex
 require 'rex/ole'
 # Library for creating and/or parsing MIME messages
 require 'rex/mime'
+# Library for polymorphic encoders
+require 'rex/encoder'
+# Architecture subsystem
+require 'rex/arch'
 
 # Generic classes
 require 'rex/exceptions'
 require 'rex/transformer'
 require 'rex/random_identifier'
-require 'rex/text'
 require 'rex/time'
 require 'rex/job_container'
 require 'rex/file'
@@ -75,12 +79,6 @@ module Rex
 # Thread factory
 require 'rex/thread_factory'
 
-# Encoding
-require 'rex/encoder/xor'
-require 'rex/encoding/xor'
-
-# Architecture subsystem
-require 'rex/arch'
 
 # Assembly
 require 'rex/assembly/nasm'