Sutto-marvin 0.2.4 → 0.3.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-patch: 4
+patch: 0
 major: 0
-minor: 2
+minor: 3

data/handlers/debug_handler.rb

@@ -1,5 +1,10 @@
 # Use this class to debug stuff as you 
 # go along - e.g. dump events etc.
-class DebugHandler < Marvin::Base
+class DebugHandler < Marvin::CommandHandler
   
+  exposes :about
+  def about(*args)
+    reply "Marvin v#{Marvin::VERSION::STRING} running on Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM})"
+  end
+    
 end

data/lib/marvin.rb

@@ -10,8 +10,8 @@ require 'marvin/exceptions'
 module Marvin
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    PATCH = 20081120
+    MINOR = 3
+    PATCH = 0
     
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
@@ -21,6 +21,8 @@ module Marvin
   autoload :Distributed,      'marvin/distributed'
   autoload :AbstractClient,   'marvin/abstract_client'
   autoload :Base,             'marvin/base'
+  autoload :Console,          'marvin/console'
+  autoload :CoreCommands,     'marvin/core_commands'
   autoload :ClientMixin,      'marvin/client_mixin'
   autoload :Settings,         'marvin/settings'
   autoload :Logger,           'marvin/logger'

data/lib/marvin/command_handler.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Marvin
   
   # A Simple Marvin handler based on processing
@@ -5,15 +7,19 @@ module Marvin
   class CommandHandler < Base
     
     class_inheritable_accessor :exposed_methods, :command_prefix
+    cattr_accessor :descriptions, :last_description, :exposed_method_names
     
-    self.command_prefix  = ""
-    self.exposed_methods = []
+    self.command_prefix       = ""
+    self.exposed_methods      = Set.new
+    self.descriptions         = {}
+    self.exposed_method_names = Set.new
     
     class << self
       
       def exposes(*args)
-        self.exposed_methods ||= []
-        self.exposed_methods += args.map { |a| a.to_sym }.flatten
+        names = args.map { |a| a.to_sym }.flatten
+        self.exposed_methods      += names
+        self.exposed_method_names += names
       end
       
     end
@@ -54,6 +60,21 @@ module Marvin
       end
     end
     
+    class << self
+      
+      def desc(desc)
+        self.last_description = desc
+      end
+      
+      def method_added(name)
+        unless last_description.blank?
+          descriptions[name.to_sym] = self.last_description
+          self.last_description = nil
+        end
+      end
+      
+    end
+    
   end
   
 end

data/lib/marvin/console.rb

@@ -1,54 +1,77 @@
-MARVIN_ROOT = File.join(File.dirname(__FILE__), "../..")
-Marvin::Settings.verbose   = true
-Marvin::Settings.log_level = :debug
-Marvin::Settings.default_client = Marvin::TestClient
-Marvin::Loader.run! :console
-
-def parse(line)
-  Marvin::Settings.default_parser.parse(line)
-end
-
-def logger
-  Marvin::Logger.logger
-end
-
-def client
-  $client ||= Marvin::Settings.default_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
+require 'irb'
+
+module Marvin
+  class Console
+    
+    module BaseExtensions
+      def parse(line)
+        Marvin::Settings.default_parser.parse(line)
+      end
+
+      def logger
+        Marvin::Logger.logger
+      end
+
+      def client
+        $client ||= Marvin::Settings.default_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
+        end
+        return server.connection_implementation
+      end
+    end
+    
+    def initialize(file = $0)
+      @file = file
+      setup_irb
+    end
+    
+    def setup_irb
+      # This is a bit hacky, surely there is a better way?
+      # e.g. some way to specify which scope irb runs in.
+      eval("include Marvin::Console::BaseExtensions", TOPLEVEL_BINDING)
+    end
+    
+    def run
+      IRB.start(@file)
+    end
+    
+    def self.run
+      self.new.run
+    end
+    
   end
-  return server.connection_implementation
 end

data/lib/marvin/loader.rb

@@ -13,7 +13,7 @@ module Marvin
       :server             => Marvin::IRC::Server,
       :ring_server        => Marvin::Distributed::RingServer,
       :distributed_client => Marvin::Distributed::DRbClient,
-      :console            => nil
+      :console            => Marvin::Console
     }
     
     # For each of the known types, define a method
@@ -80,11 +80,11 @@ module Marvin
     
     def run!
       self.register_signals
-      Marvin::Options.parse! unless self.type == :console
+      Marvin::Options.parse!
       Marvin::Daemon.daemonize! if Marvin::Settings.daemon?
       Marvin::Logger.setup
       self.load_settings
-      require(Marvin::Settings.root / "config/setup")
+      require(Marvin::Settings.root / "config" / "setup")
       self.load_handlers
       self.class.invoke_hooks!   :before_run
       attempt_controller_action! :run
@@ -138,7 +138,10 @@ module Marvin
     
     # Register to the Marvin::DataStore methods
     if Marvin::Loader.client?
-      before_run { Marvin::DataStore.load! }
+      before_run do
+        Marvin::CoreCommands.register!
+        Marvin::DataStore.load!
+      end
       after_stop { Marvin::DataStore.dump! }
     end
     

data/lib/marvin/options.rb

@@ -18,9 +18,9 @@ module Marvin
         o.separator   ""
         o.separator   ""
         o.on("-l", "--level=[level]", String, "The log level to use",
-             "Default: #{options[:log_level]}") {|options[:log_level]|}
-        o.on("-v", "--verbose", "Be verbose (print to stdout)") {|options[:verbose]|}
-        o.on("-d", "--daemon",  "Run as a daemon (drop the PID)") {|options[:daemon]|}
+             "Default: #{options[:log_level]}") {|v| options[:log_level] = v}
+        o.on("-v", "--verbose", "Be verbose (print to stdout)") {|v| options[:verbose] = v}
+        o.on("-d", "--daemon",  "Run as a daemon (drop the PID)") {|v| options[:daemon] = v}
         o.on("-k", "--kill", "Kill all of the current type / the running instances") do |kill|
            if kill
             Marvin::Daemon.kill_all(Marvin::Loader.type)

data/script/console

@@ -1,9 +1,3 @@
 #!/usr/bin/env ruby
-
-libs = ["-r irb/completion", "-r lib/marvin", "-r lib/marvin/console"]
-
-cmd = "irb #{libs.join(" ")} --simple-prompt"
-
-puts "Loading Marvin console..."
-
-exec cmd
+require File.join(File.dirname(__FILE__), "..", "config", "boot")
+Marvin::Loader.run! :console

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-marvin
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -14,6 +14,7 @@ default_executable: marvin
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: