Sutto-marvin 0.1.0.20081014 → 0.1.0.20081016

data/bin/marvin

@@ -21,7 +21,7 @@ if ARGV.include?("-h") || ARGV.include?("--help")
   exit
 end
 
-if ARGV.length >= 1
+if ARGV.length >= 1 && !["start", "stop", "run", "restart"].include?(ARGV[0])
   if ARGV[0].to_s.downcase != "create"
     puts "'#{ARGV[0]}' isn't a valid command. - Please use #{__FILE__} --help"
     exit(1)
@@ -44,13 +44,20 @@ if ARGV.length >= 1
   
   puts "Copying start script - script/run"
   copy "script/run"
+  copy "script/daemon-runner"
   FileUtils.chmod 0755, j(DEST, "script/run")
+  FileUtils.chmod 0755, j(DEST, "script/daemon-runner")
   
   puts "Copying example handler"
   copy "handlers/hello_world.rb"
   
   puts "Done!"
-  
+elsif ARGV.length >= 1
+  if !File.exist?("script/daemon-runner")
+    puts "Woops! This isn't a marvin directory."
+    exit(1)
+  end
+  exec "script/daemon-runner #{ARGV.map {|a| a.include?(" ") ? "\"#{a}\"" : a }.join(" ")}"
 else
   if !File.exist?("script/run")
     puts "Woops! This isn't a marvin directory."

data/config/setup.rb

@@ -9,7 +9,6 @@ Marvin::Loader.before_connecting do
   # Example Handler use.
   # LoggingHandler.register! if Marvin::Settings.use_logging
   
-  # Register using Marvin::MiddleMan.
-  #HelloWorld.register!(Marvin::MiddleMan)
+  HelloWorld.register!
   
 end

data/lib/marvin/abstract_client.rb

@@ -23,7 +23,7 @@ module Marvin
       self.class.setup
       logger.debug "Initializing the current instance"
       self.channels = []
-      (self.connections ||= []) << self
+      self.connections << self
       logger.debug "Setting the client for each handler"
       self.handlers.each { |h| h.client = self if h.respond_to?(:client=) }
       logger.debug "Dispatching the default :client_connected event"
@@ -167,7 +167,6 @@ module Marvin
     def handle_incoming_numeric(opts = {})
       code = opts[:code].to_i
       args = Marvin::Util.arguments(opts[:data])
-      logger.debug "Dispatching processed numeric - #{code}"
       dispatch_event :incoming_numeric_processed, {:code => code, :data => args}
     end
     

data/lib/marvin/core_ext.rb

@@ -1,9 +1,3 @@
-class String
-  def /(other)
-    File.join(self, other)
-  end
-end
-
 class File
   def self.present_dir
     File.dirname(__FILE__)

data/lib/marvin/irc/event.rb

@@ -11,8 +11,9 @@ module Marvin::IRC
       return {} unless self.raw_arguments
       results = {}
       values = self.raw_arguments.to_a
-      self.keys.each do |key|
-        results[key] = values.shift
+      last_index = self.keys.size - 1
+      self.keys.each_with_index do |key, i|
+        results[key] = (i == last_index ? values.join(" ").strip : values.shift)
       end
       return results
     end

data/lib/marvin/loader.rb

@@ -3,6 +3,9 @@ module Marvin
     
     cattr_accessor :setup_block
     
+    cattr_accessor :start_hooks, :stop_hooks
+    self.stop_hooks, self.start_hooks = [], []
+    
     def self.before_connecting(&blk)
       self.setup_block = blk
     end
@@ -11,6 +14,14 @@ module Marvin
       Marvin::Logger.setup
     end
     
+    def self.before_run(&blk)
+      self.start_hooks << blk unless blk.blank?
+    end
+    
+    def self.after_stop(&blk)
+      self.stop_hooks << blk unless blk.blank?
+    end
+    
     def load_handlers
       handlers = Dir[Marvin::Settings.root / "handlers/**/*.rb"].map { |h| h[0..-4] }
       handlers.each do |handler|
@@ -35,11 +46,13 @@ module Marvin
       self.load_settings
       self.load_handlers
       self.pre_connect_setup
+      self.start_hooks.each { |h| h.call }
       Marvin::Settings.default_client.run
     end
     
     def stop!
       Marvin::Settings.default_client.stop
+      self.stop_hooks.each { |h| h.call }
       Marvin::DataStore.dump!
     end
     

data/lib/marvin/logger.rb

@@ -8,7 +8,8 @@ module Marvin
     class << self
       
       def setup
-        self.logger ||= ::Logger.new(STDOUT)
+        log_path = Marvin::Settings.root / "log/#{Marvin::Settings.environment}.log"
+        self.logger ||= ::Logger.new(Marvin::Settings.daemon? ? log_path : STDOUT)
       end
       
       def method_missing(name, *args, &blk)

data/lib/marvin/parsers/regexp_parser.rb

@@ -88,7 +88,7 @@ module Marvin
                      :nick, :ident, :host, :data
 
       register_event :numeric, /^\:(\S+) ([0-9]+) (.*)$/,
-                     :host, :code, :data
+                     :server, :code, :data
     end 
   end
 end

data/lib/marvin/parsers/simple_parser/default_events.rb

@@ -0,0 +1,37 @@
+class Marvin::Parsers::SimpleParser < Marvin::AbstractParser
+  module DefaultEvents
+    
+    def self.included(parent)
+      parent.class_eval do
+        extend ClassMethods
+        # Register the default set of events with commands
+        register_event :nick,    :NICK,    :new_nick
+        register_event :quit,    :QUIT,    :message
+        register_event :ping,    :PING,    :data
+        register_event :join,    :JOIN,    :target
+        register_event :invite,  :INVITE,  :target,  :channel
+        register_event :message, :PRIVMSG, :target,  :message
+        register_event :part,    :PART,    :target,  :message
+        register_event :mode,    :MODE,    :target,  :mode               
+        register_event :kick,    :KICK,    :target,  :channel, :reason
+        register_event :topic,   :TOPIC,   :target,  :topic
+        # Add the default numeric event
+        register_event :numeric, :numeric, :code, :data
+        # And a few others reserved for special purposed
+        register_event :action,  :action,  :message
+        register_event :ctcp,    :ctcp,    :message
+      end
+    end
+    
+    module ClassMethods
+      
+      # Register an event from a given name,
+      # command as well as a set of arguments.
+      def register_event(name, command, *args)
+        event = Marvin::Parsers::SimpleParser::EventWithPrefix.new(name, *args)
+        self.events[command] = event
+      end
+      
+    end
+  end
+end

data/lib/marvin/parsers/simple_parser/event_extensions.rb

@@ -0,0 +1,14 @@
+# An extension to Marvin::IRC::Event which
+# lets a user specify a prefix to use.
+class Marvin::Parsers::SimpleParser < Marvin::AbstractParser
+  
+  class EventWithPrefix < Marvin::IRC::Event
+    attr_accessor :prefix
+    
+    def to_hash
+      super.merge(prefix.blank? ? {} : prefix.to_hash)
+    end
+    
+  end
+  
+end

data/lib/marvin/parsers/simple_parser/prefixes.rb

@@ -0,0 +1,34 @@
+# A Set of prefixes for a given IRC line
+# as parsed from an incoming line.
+class Marvin::Parsers::SimpleParser < Marvin::AbstractParser
+  
+  class Prefix; end
+  
+  class ServerNamePrefix < Prefix
+    attr_accessor :server_name
+    
+    def initialize(name)
+      self.server_name = name
+    end
+    
+    def to_hash
+      {:server => self.server_name}
+    end
+    
+  end
+  
+  class UserPrefix < Prefix
+    attr_accessor :nick, :ident, :host
+    
+    def initialize(nick, ident = nil, host = nil)
+      self.nick = nick
+      self.ident = ident
+      self.host = host
+    end
+    
+    def to_hash
+      {:host => self.host, :nick => self.nick, :ident => self.ident}
+    end
+  end
+  
+end

data/lib/marvin/parsers/simple_parser.rb

@@ -0,0 +1,101 @@
+require File.dirname(__FILE__) / "simple_parser/prefixes"
+require File.dirname(__FILE__) / "simple_parser/event_extensions"
+require File.dirname(__FILE__) / "simple_parser/default_events"
+
+module Marvin
+  module Parsers
+    class SimpleParser < Marvin::AbstractParser
+      
+      cattr_accessor :events
+      self.events ||= {}
+      
+      attr_accessor :arguments, :prefix, :current_line, :parts, :event
+      
+      def initialize(line)
+        self.current_line = line
+        parse!
+      end
+      
+      def to_event
+        if self.event.blank?
+          parse!
+          return nil
+        else
+          return self.event
+        end
+      end
+      
+      private
+    
+      def parse!
+        # Split the message
+        line = self.current_line
+        if line[0] == ?:
+          prefix_text, line = line.split(" ", 2)
+        else
+          prefix_text = nil
+        end
+        extract_prefix! prefix_text
+        
+        head, tail = line.split(":", 2)
+        self.parts = head.split(" ")
+        self.parts << tail
+        command = self.parts.shift.upcase.to_sym
+        if command.to_s =~ /^[0-9]{3}$/
+          # Other Command
+          self.parts.unshift(command.to_s) # Reappend the command
+          process_event self.events[:numeric]
+        elsif self.events.has_key? command
+          # Registered Command
+          process_event self.events[command]
+        else
+          # Unknown Command
+          self.event = nil
+        end
+      end
+      
+      def process_event(prototype, skip_mutation = false)
+        self.event = prototype.dup
+        self.event.prefix = self.prefix
+        self.event.raw_arguments = self.parts
+        mutate_event! unless skip_mutation
+      end
+      
+      def mutate_event!
+        # Do nothing by default
+        name, contents = self.event.name, self.event.raw_arguments.last
+        # mutate for ctcp and actions
+        if name == :message && contents[0..0] == "\001" && contents[-1..-1] == "\001"
+          if message.index("ACTION: ") == 1
+            message = message[9..-2]
+            new_event = :action
+          else
+            message = message[1..-2]
+            new_event = :ctcp
+          end
+          self.parts = [message]
+          process_event self.events[new_event], true
+        end
+      end
+      
+      def extract_prefix!(text)
+        return if text.blank?
+        full_prefix = text[1..-1]
+        prefix = full_prefix
+        # Ugly regexp for nick!ident@host format
+        # Officially this should be less-terse, but hey
+        # it's a simple parser.
+        if full_prefix =~ /^([^@!]+)\!\~?([^@]+)@(.*)$/
+          prefix = UserPrefix.new($1, $2, $3)
+        else
+          # TODO: Validate the hostname here.
+          prefix = ServerNamePrefix.new(prefix.strip)
+        end
+        self.prefix = prefix
+        return prefix
+      end
+      
+      include DefaultEvents
+    end 
+  end
+end

data/lib/marvin/parsers.rb

@@ -2,6 +2,6 @@ module Marvin
   module Parsers
     # Default Parsers
     autoload :RegexpParser, 'marvin/parsers/regexp_parser'
-    
+    autoload :SimpleParser, 'marvin/parsers/simple_parser'
   end
 end

data/lib/marvin/settings.rb

@@ -16,6 +16,10 @@ module Marvin
         self.setup!(options)
       end
       
+      def daemon?
+        defined?(IS_DAEMON) && IS_DAEMON
+      end
+      
       def setup!(options = {})
         self.environment ||= "development"
         self.configuration = {}

data/lib/marvin.rb

@@ -1,7 +1,7 @@
 $:.unshift File.dirname(__FILE__) # Append the current working dir to the front of the line.
 
 require 'rubygems'
-require 'active_support'
+require 'extlib'
 require 'marvin/core_ext'
 
 # Make all exceptions available
@@ -30,4 +30,14 @@ module Marvin
   
   Settings.setup # Load Settings etc.
   
+end
+
+def p(text)
+  res = Marvin::Parsers::SimpleParser.parse(text)
+  if res.blank?
+    puts "Unrecognized Result"
+  else
+    STDOUT.puts "Event: #{res.to_incoming_event_name}"
+    STDOUT.puts "Args:  #{res.to_hash.inspect}"
+  end
 end

data/script/daemon-runner

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'daemons'
+
+DIR = File.join(File.dirname(__FILE__), "..")
+
+Daemons.run(File.join(DIR, "script/run --is-daemon"),
+            {:mode => :exec,
+             :dir => DIR,
+             :dir_mode => :normal,
+             :log_output => true,
+             :app_name => 'marvin'})

data/script/run

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-# Set the root of Marvin
 
 if File.exist?(File.dirname(__FILE__) + "/../lib/marvin.rb")
   $:.unshift(File.dirname(__FILE__) + "/../lib/")
 end
 
 MARVIN_ROOT = File.join(File.dirname(__FILE__), "..")
+IS_DAEMON = ARGV.include?("--is-daemon")
+
 # And Require Marvin.
 require 'marvin'
 
@@ -15,4 +16,4 @@ trap "SIGINT" do
   exit
 end
 
-Marvin::Loader.run!
+Marvin::Loader.run!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-marvin
 version: !ruby/object:Gem::Version 
-  version: 0.1.0.20081014
+  version: 0.1.0.20081016
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -24,6 +24,7 @@ extra_rdoc_files: []
 files: 
 - lib/marvin
 - lib/marvin/abstract_client.rb
+- lib/marvin/abstract_parser.rb
 - lib/marvin/base.rb
 - lib/marvin/command_handler.rb
 - lib/marvin/core_ext.rb
@@ -32,6 +33,7 @@ files:
 - lib/marvin/exception_tracker.rb
 - lib/marvin/exceptions.rb
 - lib/marvin/irc
+- lib/marvin/irc/abstract_server.rb
 - lib/marvin/irc/client.rb
 - lib/marvin/irc/event.rb
 - lib/marvin/irc/socket_client.rb
@@ -39,22 +41,26 @@ files:
 - lib/marvin/loader.rb
 - lib/marvin/logger.rb
 - lib/marvin/middle_man.rb
+- lib/marvin/parsers
+- lib/marvin/parsers/regexp_parser.rb
+- lib/marvin/parsers/simple_parser
+- lib/marvin/parsers/simple_parser/default_events.rb
+- lib/marvin/parsers/simple_parser/event_extensions.rb
+- lib/marvin/parsers/simple_parser/prefixes.rb
+- 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
 - bin/marvin
-- config/settings.yml
 - config/settings.yml.sample
 - config/setup.rb
 - handlers/hello_world.rb
 - handlers/logging_handler.rb
 - handlers/tweet_tweet.rb
+- script/daemon-runner
 - script/run
-- lib/marvin/parsers/regexp_parser.rb
-- lib/marvin/parsers.rb
-- lib/marvin/irc/abstract_server.rb
-- lib/marvin/abstract_parser.rb
 has_rdoc: true
 homepage: http://github.com/sutto/marvin
 post_install_message: