Merge branch 'master' of git://github.com/rapid7/metasploit-framework

rapid7 · Nov 3, 2012 · d0cf759 · d0cf759
2 parents da4012a + d4fc99e
commit d0cf759
Show file tree

Hide file tree

Showing 170 changed files with 3,916 additions and 2,297 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gem 'activesupport', '>= 3.0.0'
 # Needed for Msf::DbManager
 gem 'activerecord'
 # Database models shared between framework and Pro.
-gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git'
+gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.3.0'
 # Needed for module caching in Mdm::ModuleDetails
 gem 'pg', '>= 0.11'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,9 @@
 GIT
   remote: git://github.com/rapid7/metasploit_data_models.git
-  revision: dd6c3a31c5ad8b55f4913b5ba20307178ba9c7bf
+  revision: 73f26789500f278dd6fd555e839d09a3b81a05f4
+  tag: 0.3.0
   specs:
-    metasploit_data_models (0.0.2)
+    metasploit_data_models (0.3.0)
       activerecord
       activesupport
       pg
@@ -27,7 +28,7 @@ GEM
     coderay (1.0.8)
     diff-lcs (1.1.3)
     i18n (0.6.1)
-    method_source (0.8)
+    method_source (0.8.1)
     multi_json (1.3.6)
     pg (0.14.1)
     pry (0.9.10)

diff --git a/lib/gemcache/ruby/1.9.1/bin/mdm_console b/lib/gemcache/ruby/1.9.1/bin/mdm_console
@@ -10,13 +10,9 @@ require 'rubygems'
 
 version = ">= 0"
 
-if ARGV.first
-  str = ARGV.first
-  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-  if str =~ /\A_(.*)_\z/
-    version = $1
-    ARGV.shift
-  end
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
 end
 
 gem 'metasploit_data_models', version

diff --git a/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/.gitignore b/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/.gitignore
diff --git a/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/Gemfile b/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/Gemfile
diff --git a/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/README.mdown b/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/README.mdown
diff --git a/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/Rakefile b/lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/Rakefile
diff --git a/...gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models.rb b/...gemcache/ruby/1.9.1/gems/metasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models.rb
diff --git a/...sploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/api_key.rb b/...sploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/api_key.rb
diff --git a/...asploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/client.rb b/...asploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/client.rb
diff --git a/...etasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/cred.rb b/...etasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/cred.rb
diff --git a/...loit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/cred_file.rb b/...loit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/cred_file.rb
diff --git a/...tasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/event.rb b/...tasploit_data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/event.rb
diff --git a/...ata_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/exploit_attempt.rb b/...ata_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/exploit_attempt.rb
diff --git a/...data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/exploited_host.rb b/...data_models-0.0.2.43DEV/lib/metasploit_data_models/active_record_models/exploited_host.rb