Merge branch 'rapid7' into bug/wrong-file_changed-argument

Author: egypt

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'
 

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)

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