infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,973 Commits
7 Branches
556 Tags
419 MiB
Commit Graph

9 Commits (19ba7772f30b4104930443862deb8f435dac27db)

Author SHA1 Message Date
Brandon Turner 19ba7772f3
Revert "Various merge resolutions from master <- staging" 
This reverts commit 149c3ecc63.

Conflicts:
	lib/metasploit/framework/command/base.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/require.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	modules/auxiliary/scanner/smb/smb_login.rb
	msfconsole
 2014-08-22 10:17:44 -05:00
Samuel Huckins 149c3ecc63
Various merge resolutions from master <- staging 
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
 2014-08-15 11:33:31 -05:00
Tod Beardsley ee968db9ef
Include .rubocop.yml from PR #3649 2014-08-14 11:20:19 -05:00
Tod Beardsley 47cb906408
Remove rubocop and msftidy touchpoints 
Rubocop replaces the default YAML library which makes development
testing difficult. It does not cause problems on Travis, but according
to reports, it does cause instability with many individual dev
environments.

While I would love to have a more solid source of this bug report, right
now this was an oral report from @shuckins-r7 (who I tend to believe a
lot).
 2014-08-12 10:37:58 -05:00
Tod Beardsley 49e48566da
Ignore PercentLiteralDelimiters and WordArray 
Per a discussion in IRC, these rules in particular don't
appear to be valuable for Metasploit at this stage.
 2014-07-30 10:28:12 -05:00
Tod Beardsley 1e47383118
Add .rubocop_todo.yml 2014-07-29 16:54:19 -05:00
Tod Beardsley 4871492ec1
Tidy up .rubocopy.yml 
This alphabetizes the configuration for rubocop.yml and preps for a
rubocop auto-config so we're not constantly hit with warnings.
 2014-07-29 16:48:49 -05:00
Jon Hart 7f860a7cdc Add more sensible Rubocop defaults for line length. disable top-level class documentation requirement for modules and don't require big numbers like 12737341238 to be separated with _ -- who does that? 2014-07-15 16:58:11 -07:00
Jon Hart 73736c70b6 Add Rubocop to the Metasploit project 
This is a work in progress because the code base is old and the style
varies wildly, however .rubocop.yml can (and should) be tweaked over
time to change standards as we see fit.  As it stands right now there
are few (if any) modules that pass Rubocop.
 2014-07-15 10:43:08 -07:00