Merge pull request #34 from rapid7/master

aaa

Author: Pedro Ribeiro

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.12.24)
+    metasploit-framework (4.12.33)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -14,9 +14,9 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.1.13)
+      metasploit-payloads (= 1.1.21)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.0.6)
+      metasploit_payloads-mettle (= 0.0.8)
       msgpack
       nessus_rest
       net-ssh
@@ -36,13 +36,15 @@ PATH
       rex-arch
       rex-bin_tools
       rex-core
+      rex-encoder
       rex-java
       rex-mime
       rex-nop
       rex-ole
       rex-powershell
       rex-random_identifier
       rex-registry
+      rex-rop_builder
       rex-socket
       rex-sslscan
       rex-struct2
@@ -100,7 +102,7 @@ GEM
     bcrypt (3.1.11)
     bit-struct (0.15.0)
     builder (3.2.2)
-    capybara (2.8.1)
+    capybara (2.9.2)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -121,9 +123,9 @@ GEM
       multi_test (>= 0.1.2)
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
-    cucumber-rails (1.4.4)
+    cucumber-rails (1.4.5)
       capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 3)
+      cucumber (>= 1.3.8, < 4)
       mime-types (>= 1.16, < 4)
       nokogiri (~> 1.5)
       railties (>= 3, < 5.1)
@@ -153,7 +155,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-credential (2.0.3)
+    metasploit-credential (2.0.4)
       metasploit-concern
       metasploit-model
       metasploit_data_models
@@ -165,8 +167,8 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.1.13)
-    metasploit_data_models (2.0.0)
+    metasploit-payloads (1.1.21)
+    metasploit_data_models (2.0.4)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       arel-helpers
@@ -176,18 +178,18 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.0.6)
+    metasploit_payloads-mettle (0.0.8)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     msgpack (1.0.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
-    nessus_rest (0.1.4)
+    nessus_rest (0.1.6)
     net-ssh (3.2.0)
     network_interface (0.0.1)
     nokogiri (1.6.8)
@@ -202,7 +204,7 @@ GEM
       pcaprub (~> 0.12)
     patch_finder (1.0.2)
     pcaprub (0.12.4)
-    pg (0.18.4)
+    pg (0.19.0)
     pg_array_parser (0.0.9)
     pkg-config (1.1.7)
     postgres_ext (3.0.0)
@@ -229,33 +231,41 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rb-readline-r7 (0.5.2.0)
     recog (2.0.22)
       nokogiri
     redcarpet (3.3.4)
     rex-arch (0.1.1)
       rex-text
-    rex-bin_tools (0.1.0)
+    rex-bin_tools (0.1.1)
       metasm
       rex-arch
       rex-core
       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
     rex-nop (0.1.0)
       rex-arch
     rex-ole (0.1.2)
       rex-text
-    rex-powershell (0.1.64)
+    rex-powershell (0.1.66)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.0)
       rex-text
     rex-registry (0.1.0)
+    rex-rop_builder (0.1.0)
+      metasm
+      rex-core
+      rex-text
     rex-socket (0.1.0)
       rex-core
     rex-sslscan (0.1.0)
@@ -267,7 +277,7 @@ GEM
       rex-text
     rkelly-remix (0.0.6)
     robots (0.10.1)
-    rspec-core (3.5.3)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -284,7 +294,7 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubyntlm (0.6.0)
+    rubyntlm (0.6.1)
     rubyzip (1.2.0)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
@@ -297,14 +307,14 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.12)
     sshkey (1.8.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.6)
+    tzinfo-data (1.2016.7)
       tzinfo (>= 1.0.0)
     windows_error (0.0.2)
     xpath (2.0.0)
@@ -331,4 +341,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.12.5
+   1.13.2