@@ -23,7 +23,6 @@ Hoe.spec('ronin') do ['chars', '>=0.1.2'], ['parameters', '>=0.1.8'], ['contextify', '>=0.1.3'], - ['reverse-require', '>=0.3.1'], ['repertoire', '>=0.2.3'], ['thor', '>=0.11.5'] ] Rakefile @@ -19,8 +19,9 @@ # require 'ronin/ui/command_line/exceptions/unknown_command' +require 'ronin/version' -require 'reverse_require' +require 'set' require 'extlib' module Ronin @@ -40,11 +41,25 @@ module Ronin # def CommandLine.commands unless class_variable_defined?('@@ronin_commands') - pattern = File.join('lib',COMMANDS_DIR,'*.rb') + @@ronin_commands = SortedSet[] - @@ronin_commands = Gem.find_resources(pattern).map { |path| - File.basename(path).gsub(/\.rb$/,'') - }.uniq + add_paths = lambda { |paths| + paths.each do |path| + @@ronin_commands << File.basename(path).gsub(/\.rb$/,'') + end + } + + pattern = File.join(File.dirname(__FILE__),File.basename(COMMANDS_DIR),'*.rb') + add_paths.call(Dir[pattern]) + + pattern = File.join(COMMANDS_DIR,'*.rb') + deps = Gem.source_index.find_name('ronin') + + deps.each do |dep| + dep.dependent_gems.each do |deps| + add_paths.call(Gem.searcher.matching_files(deps.first,pattern)) + end + end end return @@ronin_commands lib/ronin/ui/command_line/command_line.rb @@ -41,7 +41,7 @@ module Ronin puts 'Available commands:' indent do - CommandLine.commands.sort.each { |name| puts name } + CommandLine.commands.each { |name| puts name } end end end lib/ronin/ui/command_line/commands/help.rb bd63fb5184d5cb78a080287f22184ba1afd3beca postmodern postmodern.mod3@gmail.com http://github.com/postmodern/ronin/commit/557dce1147077a4d767eca4ca11eb7b11ec1f62e 557dce1147077a4d767eca4ca11eb7b11ec1f62e 2009-10-15T04:26:08-07:00 2009-10-15T04:26:08-07:00 Rewrote UI::CommandLine.commands to not use reverse_require. * Made CommandLine.commands return a SortedSet. a04d9c069af853ae1a8dd2f0cf179b45cdff0b80 postmodern postmodern.mod3@gmail.com