lib/marvin/console.rb in Sutto-marvin-0.4.0 vs lib/marvin/console.rb in Sutto-marvin-0.8.0.0

@@ -3,49 +3,21 @@
 module Marvin
   class Console
     
     module BaseExtensions
       def parse(line)
-        Marvin::Settings.default_parser.parse(line)
+        Marvin::Settings.parser.parse(line)
       end
 
       def logger
         Marvin::Logger.logger
       end
 
       def client
-        $client ||= Marvin::Settings.default_client.new(:port => 6667, :server => "irc.freenode.net")
+        $client ||= Marvin::Settings.client.new(:port => 6667, :server => "irc.freenode.net")
       end
 
-      class ServerMock < Marvin::IRC::Server::BaseConnection
-        def send_line(line)
-          puts ">> #{line}"
-        end
-        def kill_connection!
-          puts "Killing connection"
-        end
-
-        def get_peername
-          # Localhost, HTTP
-          "\034\036\000P\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000"
-        end
-
-        def host
-          "localhost"
-        end
-
-        def port
-          6667
-        end
-
-      end
-
-      def server(reset = false)
-        $server = ServerMock.new(:port => 6667, :host => "localhost") if $server.blank? || reset
-        return $server
-      end
-
       def user(reset = false)
         unless @user_created || reset
           server.receive_line "NICK SuttoL"
           server.receive_line "USER SuttoL 0 * :SuttoL"
           @user_created = true
@@ -64,10 +36,11 @@
       # e.g. some way to specify which scope irb runs in.
       eval("include Marvin::Console::BaseExtensions", TOPLEVEL_BINDING)
     end
     
     def run
-      IRB.start(@file)
+      ARGV.replace []
+      IRB.start
     end
     
     def self.run
       self.new.run
     end
\ No newline at end of file