coffeemaker 0.1.1 → 0.1.2

data/coffeemaker.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "eventmachine", "~> 1.0.0.beta.3"
+  s.add_runtime_dependency "eventmachine", "~> 1.0.0"
   s.add_runtime_dependency "activesupport"
 end

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

@@ -13,19 +13,22 @@ module Coffeemaker
         include ::EM::Protocols::LineText2
         include ::Coffeemaker::Bot::Irc::Commands
 
-        attr_accessor :port, :host, :nick, :on_message, :on_connect
+        attr_accessor :port, :host, :nick, :on_message, :on_connect, :logger, :ssl, :user, :pass
 
         def connection_completed
-          @reconnecting = false
-          @connected    = true
-          _send_command :user, [@nick] * 4
-          _send_command :nick, @nick
-          on_connect.call if on_connect
-          succeed
+          return complete_connection unless @ssl
+          start_tls
+        end
+
+        def ssl_handshake_completed
+          @logger.info "ssl handshake completed"
+          complete_connection
         end
 
         def receive_line(data)
           msg = ::Coffeemaker::Bot::Irc::Message.new(data)
+          @logger.debug "received #{data}"
+
           case msg.command
           when :ping
             send_command :pong
@@ -35,9 +38,12 @@ module Coffeemaker
         end
 
         def unbind
+          @logger.info "diconnected"
+
           @deferred_status = nil
           if @connected or @reconnecting
             EM.add_timer(1) do
+              @logger.info "reconnecting"
               reconnect(@host, @port)
             end
             @connected    = false
@@ -49,13 +55,32 @@ module Coffeemaker
 
         private
         def _send_command(name, *args)
-          cmd = [name.to_s.upcase] + args
-          send_data("#{cmd.flatten.join(' ')}\r\n")
+          cmd  = [name.to_s.upcase] + args
+          data = "#{cmd.flatten.join(' ')}\r\n"
+
+          @logger.debug "sending #{data}"
+          send_data(data)
         end
 
         def send_command(name, *args)
           callback { _send_command(name, *args) }
         end
+
+        def complete_connection
+          @reconnecting = false
+          @connected    = true
+          @logger.info "connected"
+
+          @logger.info "authenticating"
+          _send_command :user, [@user] * 4
+          _send_command :pass, @pass if @pass
+          _send_command :nick, @nick
+
+          EM.add_timer(1) do
+            on_connect.call if on_connect
+            succeed
+          end
+        end
       end
     end
   end

data/lib/coffeemaker/bot/irc.rb

@@ -6,7 +6,7 @@ module Coffeemaker
   class Bot
     class Irc
       attr_accessor :on_message, :on_connect
-      attr_reader   :host, :port, :nick, :connection
+      attr_reader   :host, :port, :nick, :connection, :logger, :user, :pass
       private       :connection
 
       delegate :join, :part, :msg, :privmsg, to: :connection
@@ -15,16 +15,24 @@ module Coffeemaker
         @host       = options.delete(:irc_host)
         @port       = options.delete(:irc_port)
         @nick       = options.delete(:nick)
+        @pass       = options.delete(:pass)
+        @user       = options.delete(:user)
         @on_message = options.delete(:on_message)
+        @logger     = options.delete(:logger)
+        @ssl        = options.delete(:ssl)
       end
 
       def start
         @connection = EM.connect(@host, @port, Connection) do |c|
           c.host       = @host
           c.port       = @port
+          c.pass       = @pass
+          c.user       = @user
           c.nick       = @nick
           c.on_message = @on_message
           c.on_connect = @on_connect
+          c.logger     = @logger
+          c.ssl        = @ssl
         end
       end
 

data/lib/coffeemaker/runner.rb

@@ -8,16 +8,14 @@ module Coffeemaker
     def initialize(argv)
       @options = default_options
       parse_options!(argv)
-
-      if logfile = @options.delete(:logfile)
-        @logger = Logger.new(logfile =~ /stdout/i ? STDOUT : logfile)
-      end
+      @logger = Logger.new(@options.delete(:logfile))
+      @logger.level = @options.delete(:log_level)
       @channels = @options.delete(:channels)
     end
 
     def start
       EM.run do
-        bot = Coffeemaker::Bot.new(@options)
+        bot = Coffeemaker::Bot.new(@options.merge(:logger => @logger))
         bot.start do |irc|
           @channels.each { |channel| irc.join(channel) }
         end
@@ -35,8 +33,11 @@ module Coffeemaker
         irc_host: 'localhost',
         irc_port: 6667,
         nick: 'coffeemaker',
+        user: 'coffeemaker',
         channels: [],
-        on_message: Proc.new { |msg| @logger.info(msg) if @logger }
+        on_message: Proc.new { |msg| @logger.info(msg) if @logger },
+        logfile: STDOUT,
+        log_level: Logger::INFO
       }
     end
 
@@ -45,11 +46,15 @@ module Coffeemaker
         option.default_argv = argv
         option.banner = "Usage: coffeemaker [options]"
         option.on('-n NICK') { |nick| @options[:nick] = nick }
+        option.on('-u USER') { |user| @options[:user] = user }
+        option.on('-w PASS') { |pass| @options[:pass] = pass }
         option.on('-p PORT', Numeric) { |port| @options[:irc_port] = port }
         option.on('-s HOST') { |host| @options[:irc_host] = host }
         option.on('-c CHANNELS', 'comma-separated list of channels') { |channels| @options[:channels] = channels.split }
-        option.on('-l LOG_FILE', 'path to log file or STDOUT') { |logfile| @options[:logfile] = logfile }
-        option.on('--help') { puts option; exit }
+        option.on('-l LOG_FILE', 'path to log file') { |logfile| @options[:logfile] = logfile }
+        option.on('-d', '--debug') { |debug| @options[:log_level] = Logger::DEBUG }
+        option.on('--ssl') { |ssl| @options[:ssl] = true }
+        option.on_tail('--help') { puts option; exit }
         begin
           option.parse!
         rescue OptionParser::RequiredArgument, OptionParser::InvalidOption

data/lib/coffeemaker/version.rb

@@ -1,3 +1,3 @@
 module Coffeemaker
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coffeemaker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -57,8 +57,6 @@ files:
 - Rakefile
 - bin/coffeemaker
 - coffeemaker.gemspec
-- goliath.rb
-- http.rb
 - lib/coffeemaker.rb
 - lib/coffeemaker/bot.rb
 - lib/coffeemaker/bot/irc.rb
@@ -87,8 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: coffeemaker
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: IRC bot, how unexpected!
 test_files: []
+has_rdoc: 

data/goliath.rb

@@ -1,18 +0,0 @@
-require 'goliath/connection'
-require 'goliath/api'
-
-module Goliath
-  module Constants
-    IRC_CONNECTION = 'IRC_CONNECTION'
-  end
-
-  class Request
-    alias_method :initialize_without_irc, :initialize
-
-    def initialize(app, conn, env)
-      initialize_without_irc(app, conn, env)
-      env[IRC_CONNECTION] = conn.irc
-    end
-  end
-end
-

data/http.rb

@@ -1,57 +0,0 @@
-require 'coffeemaker'
-require 'coffeemaker/goliath'
-require 'json'
-
-module Coffeemaker
-  class HTTP
-    class Connection < Goliath::Connection
-      attr_accessor :irc
-    end
-
-    class Router < Goliath::API
-      get '/:channel' do
-        run Stream.new
-      end
-    end
-
-    class Stream < Goliath::API
-      def on_close(env)
-        env[IRC_CONNECTION].part(env[:channel])
-      end
-
-      def response(env)
-        env[:channel] = params[:channel]
-        env[IRC_CONNECTION].join(env[:channel])
-
-        env[IRC_CONNECTION].on_message = Proc.new do |msg|
-          env.stream_send("#{msg.to_json}\n")
-        end
-        streaming_response(202, {'X-Stream' => 'Goliath'})
-      end
-    end
-
-    def initialize(options)
-      @host    = options.delete(:http_host)
-      @port    = options.delete(:http_port)
-      @options = options
-    end
-
-    def start(irc_connection)
-      Goliath.env = :production
-      @http = EM.start_server(@host, @port, Coffeemaker::HTTP::Connection) do |c|
-        c.port    = 8080
-        c.irc     = irc_connection
-        c.status  = {}
-        c.config  = {}
-        c.options = {}
-        c.logger  = Logger.new(STDOUT)
-        c.app     = Goliath::Rack::Builder.build(Coffeemaker::HTTP::Router, Coffeemaker::HTTP::Router.new)
-        c.api     = Coffeemaker::HTTP::Stream.new
-      end
-    end
-
-    def stop
-      EM.stop_server(@http)
-    end
-  end
-end