Merge pull request #339 from rapid7/model-fixes

Fixes a stack trace when deleting files

data/sql/migrate/20120411173220_rename_workspace_members.rb

@@ -0,0 +1,9 @@
+class RenameWorkspaceMembers < ActiveRecord::Migration
+  def up
+    rename_table :project_members, :workspace_members
+  end
+
+  def down
+    rename_table :workspace_members, :project_members
+  end
+end

lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/loot.rb

@@ -13,8 +13,12 @@ module MetasploitDataModels::ActiveRecordModels::Loot
       private
 
       def delete_file
-        c = Pro::Client.get
-        c.loot_delete_file(self[:id])
+				c = Pro::Client.get rescue nil
+				if c
+					c.loot_delete_file(self[:id])
+				else
+					::File.unlink(self.path) rescue nil
+				end
       end
     }
   end

lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/report.rb

@@ -16,8 +16,12 @@ module MetasploitDataModels::ActiveRecordModels::Report
       private
 
       def delete_file
-        c = Pro::Client.get
-        c.report_delete_file(self[:id])
+				c = Pro::Client.get rescue nil
+				if c
+					c.report_delete_file(self[:id]) 
+				else
+					::File.unlink(self.path) rescue nil
+				end
       end
     }
   end

lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/report_template.rb

@@ -9,8 +9,12 @@ module MetasploitDataModels::ActiveRecordModels::ReportTemplate
       private
 
       def delete_file
-        c = Pro::Client.get
-        c.report_template_delete_file(self[:id])
+				c = Pro::Client.get rescue nil
+				if c
+					c.report_template_delete_file(self[:id]) 
+				else
+					::File.unlink(self.path) rescue nil
+				end
       end
     }
   end

lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/session.rb

@@ -18,7 +18,7 @@ module MetasploitDataModels::ActiveRecordModels::Session
       private
 
       def stop
-        c = Pro::Client.get
+				c = Pro::Client.get rescue nil 
         c.session_stop(self.local_id) rescue nil # ignore exceptions (XXX - ideally, stopped an already-stopped session wouldn't throw XMLRPCException)
       end
     }

lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/task.rb

@@ -15,8 +15,12 @@ module MetasploitDataModels::ActiveRecordModels::Task
       private
 
       def delete_file
-        c = Pro::Client.get
-        c.task_delete_log(self[:id])
+				c = Pro::Client.get rescue nil
+				if c
+					c.task_delete_log(self[:id]) if c
+				else
+					::File.unlink(self.path) rescue nil
+				end
       end
     }
   end