fantasy-irc 0.2.1 → 0.2.2

data/README.md

@@ -22,17 +22,17 @@ TODO: Write usage instructions here
 
 ## Getting support
 
-There is a support channel on irc.jdqirc.net in #fantasy where you
-can get live help on the gem. Getting answers in a IRC channel can
-take some time but as you are reading the README of a IRC gem, you
-probably already knew this.
+There is a support channel on freenode in #fantasy where you can get
+live help on the gem. Getting answers in a IRC channel can take some
+time but as you are reading the README of a IRC gem, you probably
+already knew this.
 
 TLDR:
 
 Support?
 
-    irc.jdqirc.net #fantasy
-    irc://irc.jdqirc.net/fantasy
+    irc.freenode.net #fantasy
+    irc://irc.freenode.net/fantasy
 
 ## Contributing
 

data/fantasy-irc.gemspec

@@ -8,9 +8,8 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.name              = "fantasy-irc"
   s.require_paths     = ['lib']
-  s.version           = "0.2.1"
+  s.version           = "0.2.2"
 
   s.rubyforge_project = s.name
   s.add_runtime_dependency "array-unique", "~> 1.1.1"
-  s.add_runtime_dependency "ddate", "~> 1.0.0"
 end

data/lib/fantasy-irc/irc.rb

@@ -54,6 +54,9 @@ module Fantasy
             if not @connected then
                 raise "not connected to a server!"
             end
+
+            # remove everything after a newline
+            s.gsub!(/\n.*$/, "")
             puts "<-- #{s}"
             @data[:socket].puts "#{s}\n"
         end
@@ -108,7 +111,8 @@ module Fantasy
 
                 elsif (tok[1] == "JOIN") then
                     # user joined
-                    room = self.rooms.by_name(tok[2][1,tok[2].length])
+                    room_name = tok[2].gsub(/^:/, '') # remove leadig : (on some networks, but not all!)
+                    room = self.rooms.by_name(room_name)
                     user = self.users.create(tok[0][1,tok[0].length])
 
                     # add user to room and room to user
@@ -161,8 +165,8 @@ module Fantasy
 
                     puts "!!! user #{user} quit."
                     # remove user from all rooms
-                    self.rooms.all.values.each do |room|
-                        room.users.delete user
+                    self.rooms.all.values.each do |r|
+                        r.users.delete user
                     end
                     user.reset
 
@@ -186,7 +190,6 @@ module Fantasy
             @running = Time.now.to_i
             last_tick = @running
             last_ping = @running
-            last_session_ping = @running
 
             loop do
                 time_now = Time.now

data/lib/fantasy-irc/plugins.rb

@@ -12,7 +12,22 @@ module Fantasy
         end
 
         def load name
-            Kernel::load "plugins/#{name}.rb"
+            local  = File.join(File.dirname($0), "plugins")
+            vendor = File.join(File.dirname(__FILE__), "..", "plugins")
+            [*name].each do |n|
+                file = "#{n}.rb"
+                local_file  = File.join(local, file)
+                vendor_file = File.join(vendor, file)
+                if File.exists?(local_file)
+                    puts "[plugin] Loading #{file} (local)."
+                    Kernel.load local_file
+                elsif File::exists?(vendor_file)
+                    puts "[plugin] Loading #{file} (vendor)."
+                    Kernel.load vendor_file
+                else
+                    puts "[plugin] #{file} could not be found."
+                end
+            end
         end
 
         def command command, data, args
@@ -56,7 +71,14 @@ class Plugin
         @handlers.each do |pattern, block|
             if command.match(pattern) then
                 puts "#{block} handles #{command}"
-                break block.call data, args
+                begin
+                    block.call data, args
+                rescue Exception => e
+                    puts "#{block} failed with Exception #{e}"
+                    puts e.backtrace
+                end
+
+                break
             end
         end
     end

data/lib/fantasy-irc/users.rb

@@ -46,6 +46,7 @@ module Fantasy
                 puts "New User #{self.object_id} with name #{@name}"
                 @connection = connection
                 @rooms = Array::Unique.new
+                @ignored = false
             end
 
             # resets user information

data/lib/plugins/hackersays.rb

@@ -0,0 +1,36 @@
+require 'json'
+require 'open-uri'
+require 'timeout'
+
+class HackerSays < Plugin
+    def initialize name
+        super
+        self.handle(/^hackersays$/i) do |data|
+            begin
+                Timeout::timeout(2) {
+                    say_quote(data[:room])
+                }
+            rescue Timeout::Error
+                data[:room].say("Request to hackersays.com timed out.")
+            end
+        end
+    end
+
+    def say_quote room
+        quote = get_quote()
+        if quote.nil?
+            room.say "Could not fetch a quote. :-("
+        else
+            room.say "\u{201C}#{quote['c']}\u{201D} \u{2014} \002#{quote['a']}\002 \00315[Quote \##{quote['id']}]\003"
+        end
+    end
+
+private
+
+    def get_quote
+        return JSON::load(open("http://hackersays.com/quote").read)
+    end
+end
+
+plugin = HackerSays.new "hackersays"
+$bot.plugins.add(plugin)

data/lib/plugins/magic8ball.rb

@@ -0,0 +1,41 @@
+class Magic8Ball < Plugin
+    attr_reader :answers
+
+    def initialize name
+        super
+
+        @answers = [
+            # Positive
+            "It is certain",
+            "It is decidedly so",
+            "Without a doubt",
+            "Yes - definitely",
+            "You may rely on it",
+            "As I see it, yes",
+            "Most likely",
+            "Outlook good",
+            "Yes",
+            "Signs point to yes",
+            # Neutral
+            "Reply hazy, try again",
+            "Ask again later",
+            "Better not tell you now",
+            "Cannot predict now",
+            "Concentrate and ask again",
+            # Negative
+            "Don't count on it",
+            "My reply is no",
+            "My sources say no",
+            "Outlook not so good",
+            "Very doubtful"
+        ]
+    end
+end
+
+plugin = Magic8Ball.new "8ball"
+
+plugin.handle(/^8ball$/i) do |data|
+    data[:room].say plugin.answers.sample
+end
+
+$bot.plugins.add(plugin)

data/lib/plugins/nettools.rb

@@ -1,22 +1,22 @@
 plugin = Plugin.new "nettools"
 
 plugin.handle(/^ping$/i) do |data, args|
-    if args.empty? then
+    if args.empty?
         next data[:room].say "ping needs more arguments"
     end
 
-    if args[0].match(/[^a-z0-9\.-]/i) then
+    if args[0].match(/[^a-z0-9\.-]/i)
         next data[:room].say "invalid characters in argument"
     end
 
     Thread.new do
         ping = `/usr/bin/env ping -w 3 -c 1 -- #{args[0]} 2>&1`
 
-        if ping.match /unknown host (.+)/ then
+        if ping.match(/unknown host (.+)/)
             data[:room].say "unknown host #{$1}"
-        elsif ping.match /^(64 bytes.+)/ then
+        elsif ping.match(/^(64 bytes.+)/)
             data[:room].say "#{$1}"
-        elsif ping.match /0 received/m then
+        elsif ping.match(/0 received/m)
             data[:room].say "no reply :-("
         else
             data[:room].say "bogus hostname"
@@ -27,11 +27,11 @@ plugin.handle(/^ping$/i) do |data, args|
 end
 
 plugin.handle(/^host$/i) do |data, args|
-    if args.empty? then
+    if args.empty?
         next data[:room].say "host needs more arguments"
     end
 
-    if args[0].match(/^a-z0-9\.-/i) then
+    if args[0].match(/^a-z0-9\.-/i)
         next data[:room].say "invalid characters in argument"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fantasy-irc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array-unique
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: ddate
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 description: A modular, event-driven IRC client/bot Ruby gem with plugin support
 email:
 - v2px@v2px.de
@@ -65,6 +49,8 @@ files:
 - lib/fantasy-irc/rooms.rb
 - lib/fantasy-irc/users.rb
 - lib/plugins/datetime.rb
+- lib/plugins/hackersays.rb
+- lib/plugins/magic8ball.rb
 - lib/plugins/math.rb
 - lib/plugins/nettools.rb
 - lib/plugins/random.rb