marvin 0.8.0.2 → 0.8.1

data/README.markdown

@@ -0,0 +1,9 @@
+Marvin - an evented ruby IRC library
+------------------------------------
+
+Welcome to the home of Marvin - a ruby library (usable as a framework) for working with IRC
+in an evented fashion. This app is currently undergoing major changes and master is used to
+reflect ongoing development. If you'd like to play with an older version, checkout the
+_v0.4.0_ tag or the _legacy_ branch. Thanks!
+
+-- Darcy

data/examples/example_dsl.rb

@@ -0,0 +1,54 @@
+require 'marvin'
+Marvin::DSL.run do
+  
+  configure do |c|
+    c.real_name = "Marvin Bot of Doom"
+    c.user_name = "MarvinBot"
+    c.nicks     = "Marvin", "Marvin_", "Marvin__"
+  end
+  
+  logging do
+    
+    setup do
+      @file = File.open(Marvin::Settings.root.join("logs", "irc.log"), "w+")
+    end
+    
+    incoming do |server, nick, target, message|
+      @file.puts "<< #{Time.now} <#{target}:#{server}> #{nick}: #{message}"
+    end
+    
+    outgoing do |server, nick, target, message|
+      @file.puts ">> #{Time.now} <#{target}:#{server}> #{nick}: #{message}"
+    end
+    
+    teardown do
+      @file.close if @file
+    end
+    
+  end
+  
+  handler do
+    
+    on :incoming_action do
+      reply "Hey! Are we related?" if from.include?(client.nickname)
+    end
+    
+  end
+  
+  commands do
+    
+    prefix_is "!"
+    
+    command :awesome, "Tells you how awesome you are" do
+      reply "You are #{25 + rand(75)}% awesome!"
+    end
+    
+  end
+  
+  server "irc.freenode.net" do
+    
+    join "#marvin-testing", "#relayrelay"
+    
+  end
+  
+end

data/lib/marvin.rb

@@ -5,7 +5,7 @@ require 'perennial'
 module Marvin
   include Perennial
   
-  VERSION = [0, 8, 0, 2]
+  VERSION = [0, 8, 1, 0]
   
   # Client
   autoload :TestClient,       'marvin/test_client'

data/lib/marvin/abstract_client.rb

@@ -34,8 +34,6 @@ module Marvin
       logger.info "Initializing the current instance"
       @channels = []
       connections << self
-      logger.info "Setting the client for each handler"
-      setup_handlers
       logger.info "Dispatching the default :client_connected event"
       dispatch :client_connected
     end
@@ -60,9 +58,9 @@ module Marvin
       Marvin::Reloading.reload! if @@development
     end
     
-    def dispatch(*args)
+    def pre_dispatching
       process_development
-      super
+      setup_handlers
     end
     
     # Sets the current class-wide settings of this IRC Client

data/lib/marvin/irc/client.rb

@@ -52,7 +52,7 @@ module Marvin::IRC
       def receive_line(line)
         return unless @connected
         line = line.strip
-        logger.debug "<< #{line}"
+        logger.debug "[#{host_with_port}] << #{line}"
         @client.receive_line(line)
       rescue Exception => e
         logger.warn "Uncaught exception raised; Likely in Marvin"
@@ -62,7 +62,7 @@ module Marvin::IRC
       def send_line(*lines)
         return unless @connected
         lines.each do |line|
-          logger.debug ">> #{line.strip}"
+          logger.debug "[#{host_with_port}] >> #{line.strip}"
           send_data line
         end
       end
@@ -105,6 +105,7 @@ module Marvin::IRC
           EventMachine.run do
             unless connections.data == false
               connections.each_pair do |server, configuration|
+                configuration ||= Marvin::Nash.new
                 connect(configuration.merge(:server => server.to_s))
               end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marvin
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.2
+  version: 0.8.1
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-27 00:00:00 +08:00
+date: 2009-10-05 00:00:00 +08:00
 default_executable: marvin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0.0
+        version: 1.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -42,6 +42,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: |-
   Marvin is a library (also usable in framework / application form) that
   makes it simple and fast to build applications around IRC. With an emphasis
@@ -54,10 +74,16 @@ executables:
 - marvin
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
 files: 
 - bin/marvin
+- handlers/debug_handler.rb
+- handlers/hello_world.rb
+- handlers/keiki_thwopper.rb
+- handlers/simple_logger.rb
+- handlers/tweet_tweet.rb
+- lib/marvin.rb
 - lib/marvin/abstract_client.rb
 - lib/marvin/abstract_parser.rb
 - lib/marvin/base.rb
@@ -66,32 +92,31 @@ files:
 - lib/marvin/command_handler.rb
 - lib/marvin/console.rb
 - lib/marvin/core_commands.rb
+- lib/marvin/distributed.rb
 - lib/marvin/distributed/client.rb
 - lib/marvin/distributed/handler.rb
 - lib/marvin/distributed/protocol.rb
 - lib/marvin/distributed/server.rb
-- lib/marvin/distributed.rb
 - lib/marvin/dsl.rb
 - lib/marvin/exception_tracker.rb
 - lib/marvin/exceptions.rb
+- lib/marvin/irc.rb
 - lib/marvin/irc/client.rb
 - lib/marvin/irc/event.rb
 - lib/marvin/irc/replies.rb
-- lib/marvin/irc.rb
 - lib/marvin/logging_handler.rb
 - lib/marvin/middle_man.rb
+- lib/marvin/parsers.rb
 - lib/marvin/parsers/command.rb
+- lib/marvin/parsers/prefixes.rb
 - lib/marvin/parsers/prefixes/host_mask.rb
 - lib/marvin/parsers/prefixes/server.rb
-- lib/marvin/parsers/prefixes.rb
 - lib/marvin/parsers/ragel_parser.rb
 - lib/marvin/parsers/ragel_parser.rl
 - lib/marvin/parsers/simple_parser.rb
-- lib/marvin/parsers.rb
 - lib/marvin/settings.rb
 - lib/marvin/test_client.rb
 - lib/marvin/util.rb
-- lib/marvin.rb
 - templates/boot.erb
 - templates/connections.yml.erb
 - templates/debug_handler.erb
@@ -105,18 +130,14 @@ files:
 - test/parser_test.rb
 - test/test_helper.rb
 - test/util_test.rb
-- handlers/debug_handler.rb
-- handlers/hello_world.rb
-- handlers/keiki_thwopper.rb
-- handlers/simple_logger.rb
-- handlers/tweet_tweet.rb
-has_rdoc: false
+- README.markdown
+has_rdoc: true
 homepage: http://sutto.net/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -134,9 +155,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Evented IRC Library for Ruby, built on EventMachine and Perennial.
-test_files: []
-
+test_files: 
+- test/abstract_client_test.rb
+- test/parser_comparison.rb
+- test/parser_test.rb
+- test/test_helper.rb
+- test/util_test.rb
+- examples/example_dsl.rb