coffeemaker 0.0.1.beta.1 → 0.0.1.beta.2

data/lib/coffeemaker/bot/irc/commands.rb

@@ -12,9 +12,11 @@ module Coffeemaker
           send_command :part, channel
         end
 
-        def message(recipient, text)
+        def privmsg(recipient, text)
           send_command :privmsg, recipient, ":#{text}"
         end
+
+        alias :msg :privmsg
       end
     end
   end

data/lib/coffeemaker/bot/irc.rb

@@ -5,25 +5,23 @@ require 'active_support/core_ext/module/delegation'
 module Coffeemaker
   class Bot
     class Irc
-      include EM::Deferrable
-
       attr_reader :connection
-      delegate :join, :part, :privmsg, to: :connection
+      attr_accessor :on_message
+      delegate :join, :part, :msg, :privmsg, to: :connection
 
       def initialize(options)
-        @host     = options.delete(:irc_host)
-        @port     = options.delete(:irc_port)
-        @callback = options.delete(:on_message)
-        @options  = options
+        @host       = options.delete(:irc_host)
+        @port       = options.delete(:irc_port)
+        @on_message = options.delete(:on_message)
+        @options    = options
       end
 
       def start
         @connection = EM.connect(@host, @port, Connection) do |c|
           c.host       = @host
           c.port       = @port
-          c.on_message = @callback
+          c.on_message = @on_message
           c.options    = @options
-          c.callback { succeed }
         end
       end
 

data/lib/coffeemaker/bot.rb

@@ -2,14 +2,15 @@ require 'coffeemaker/bot/irc'
 
 module Coffeemaker
   class Bot
+    attr_reader :irc
+
     def initialize(options)
       @irc = Irc.new(options)
     end
 
     def start(&block)
-      @irc.start.callback do
-        block.call(@irc) if block_given?
-      end
+      @irc.start
+      block.call(@irc) if block_given?
     end
 
     def stop

data/lib/coffeemaker/version.rb

@@ -1,3 +1,3 @@
 module Coffeemaker
-  VERSION = "0.0.1.beta.1"
+  VERSION = "0.0.1.beta.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coffeemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.1
+  version: 0.0.1.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &23452580 !ruby/object:Gem::Requirement
+  requirement: &8603680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
-  version_requirements: *23452580
+  version_requirements: *8603680
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &23450520 !ruby/object:Gem::Requirement
+  requirement: &8602360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23450520
+  version_requirements: *8602360
 description: IRC bot that serves as foundation for greater ideas. "Not Invented Here"
   applies greatly.
 email: