metasploit-runner 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb75550e85c0732ecd62feb3eb1c8c149f5f7a3
-  data.tar.gz: 9ca0b010c3becf3364811bdafe0cb1498fcb0175
+  metadata.gz: ade37ee5ad6a5f514b47ade631cc9c3c2504ef65
+  data.tar.gz: f3ca83cd02dec9d40044cd9e6d0f9b636c394bd3
 SHA512:
-  metadata.gz: c2f222fa88b8fb2ae7805ef8c4fa8d97811b355e1a61b70944ffa4fc7fc802627974adf58bb5f431c1ebe064c077ea04e168ee1ef31c80fa3dbdca029e59e654
-  data.tar.gz: c4726d89905d7a30a0725d79e17c2f88db1ef24d318265a5dfefb6685621174a69472a923d6b752b3e7eeb14fd83fe559e1b976efdf99712dfdbe0e7b26e627f
+  metadata.gz: 7b8567fecac69cb76a7b1f3ebced3073aff8356a86e0d62d5b0cc361ca93d8a504d1f29d3b3627aadec406e13cb2625c090511256ac5ddedd9d9b9287fd069f9
+  data.tar.gz: 3a8e4a7e9bd96837186a965a73da69b92d1681ced7b00e9043f49a6d4cd12d08a5b7f5a79e127cac353db45f8646daea9ed216f9dbfe0243b580938c9f7491d2

data/lib/MetasploitPenTestScript/version.rb

@@ -1,3 +1,3 @@
 module MetasploitPenTestScript
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/metasploit/exploit.rb

@@ -68,16 +68,18 @@ module Metasploit
     end
 
     def self.wait_for_task_to_stop_running(rpc_client, status_message, task_id)
-      sleep(3)
-      status = rpc_client.call('pro.task_status', task_id)
-      puts status_message
-      progress = status.fetch(task_id, {}).fetch('progress', {})
-      puts "This task is #{progress} % complete"
-      info = status.fetch(task_id, {}).fetch('info', {})
-      puts "I am currently executing: #{info}"
-      status = status.fetch(task_id, {}).fetch('status', {})
-
-      wait_for_task_to_stop_running(rpc_client, status_message, task_id) if status == CONSTANTS::RUNNING_IMPORT_STATUS
+      loop do
+        sleep(3)
+        status = rpc_client.call('pro.task_status', task_id)
+        puts status_message
+        progress = status.fetch(task_id, {}).fetch('progress', {})
+        puts "This task is #{progress} % complete"
+        info = status.fetch(task_id, {}).fetch('info', {})
+        puts "I am currently executing: #{info}"
+        status = status.fetch(task_id, {}).fetch('status', {})
+
+        break if status != CONSTANTS::RUNNING_IMPORT_STATUS
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Nathan Gibson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msfrpc-client