tkellem 0.9.3 → 0.9.4

data/Gemfile

@@ -13,4 +13,5 @@ end
 group :development do
   gem 'guard-rspec'
   gem 'rspec-nc'
+  gem 'debugger'
 end

data/Gemfile.lock

@@ -1,52 +1,55 @@
 PATH
   remote: .
   specs:
-    tkellem (0.9.3)
+    tkellem (0.9.4)
       activerecord (~> 4.0.0.rc2)
       eventmachine (~> 1.0.3)
+      geoip (~> 1.3.2)
       rails-observers (~> 0.1.1)
       sqlite3 (~> 1.3.3)
+      tzinfo
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
+    activemodel (4.0.1.rc3)
+      activesupport (= 4.0.1.rc3)
       builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
-      builder (~> 3.1.0)
-    activerecord (4.0.0.rc2)
-      activemodel (= 4.0.0.rc2)
+    activerecord (4.0.1.rc3)
+      activemodel (= 4.0.1.rc3)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0.rc2)
+      activesupport (= 4.0.1.rc3)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0.rc2)
+    activesupport (4.0.1.rc3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.9)
+    arel (4.0.1)
+    atomic (1.1.14)
     builder (3.1.4)
     coderay (1.0.9)
     colorize (0.5.8)
+    columnize (0.3.6)
     coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       thor
+    debugger (1.6.2)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.4)
-    erubis (2.7.0)
     eventmachine (1.0.3)
     ffi (1.9.0)
     formatador (0.2.4)
+    geoip (1.3.3)
     guard (1.8.1)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
@@ -56,7 +59,7 @@ GEM
     guard-rspec (3.0.2)
       guard (>= 1.8)
       rspec (~> 2.13)
-    i18n (0.6.4)
+    i18n (0.6.5)
     listen (1.2.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -73,17 +76,8 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails-observers (0.1.1)
-      railties (~> 4.0.0.beta)
-    railties (4.0.0.rc2)
-      actionpack (= 4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
@@ -107,18 +101,19 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.4.5)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     terminal-notifier (1.4.2)
     thor (0.18.1)
-    thread_safe (0.1.0)
+    thread_safe (0.1.3)
       atomic
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   coveralls
+  debugger
   guard-rspec
   mocha (= 0.14.0)
   rspec (~> 2.13.0)

data/lib/tkellem/bouncer.rb

@@ -29,6 +29,7 @@ class Bouncer
     @data = {}
     # clients waiting for us to connect to the irc server
     @waiting_clients = []
+    @awaiting_replies = {}
 
     connect!
   end
@@ -91,6 +92,8 @@ class Bouncer
     when 'NICK'
       @nick = msg.args.last
       true
+    when 'WHO'
+      client
     else
       true
     end
@@ -98,9 +101,14 @@ class Bouncer
     if forward
       # send to server
       send_msg(msg)
+      flag_for_reply(msg.command, forward) if forward != true
     end
   end
 
+  def flag_for_reply(command, conn)
+    @awaiting_replies[command] = conn
+  end
+
   def server_msg(msg)
     return if plugins.any? do |plugin|
       !plugin.server_msg(self, msg)
@@ -154,13 +162,19 @@ class Bouncer
         @nick = msg.args.last
       end
       true
+    when '352'
+      @awaiting_replies['WHO'] || true
+    when '315'
+      @awaiting_replies.delete('WHO') || true
     else
       true
     end
 
-    if forward
+    if forward == true
       # send to clients
       @active_conns.each { |c,s| c.send_msg(msg) }
+    elsif forward && @active_conns.include?(forward)
+      forward.send_msg(msg)
     end
   end
 

data/lib/tkellem/irc_message.rb

@@ -1,4 +1,7 @@
 # encoding: utf-8
+
+require 'active_support/core_ext/time'
+
 module Tkellem
 
 class IrcMessage < Struct.new(:prefix, :command, :args, :ctcp)

data/lib/tkellem/plugins/backlog.rb

@@ -1,10 +1,12 @@
 # encoding: utf-8
 require 'backwards_file_reader'
 require 'fileutils'
+require 'geoip'
 require 'pathname'
 require 'time'
 
 require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/time'
 
 require 'tkellem/irc_message'
 require 'tkellem/tkellem_bot'
@@ -44,10 +46,23 @@ class Backlog
     true
   end
 
-
   #### IMPL
 
-  class Device < Struct.new(:network_user, :device_name, :positions)
+  def self.geoip(conn)
+    if !defined?(@geoip)
+      begin
+        @geoip = GeoIP.new('/usr/share/GeoIP/GeoIPCity.dat')
+      rescue Errno::ENOENT
+        @geoip = nil
+      end
+    end
+    geoip_info = @geoip && @geoip.country(Socket.unpack_sockaddr_in(conn.get_peername).last)
+    tz = geoip_info.respond_to?(:timezone) && geoip_info.timezone && ActiveSupport::TimeZone[geoip_info.timezone]
+    country = geoip_info.respond_to?(:country_code2) && geoip_info.country_code2
+    [tz, country]
+  end
+
+  class Device < Struct.new(:network_user, :device_name, :positions, :time_zone, :country)
     def initialize(*a)
       super
       self.positions = {}
@@ -117,6 +132,9 @@ class Backlog
 
   def client_connected(conn)
     device = get_device(conn)
+    tz, country = self.class.geoip(conn)
+    device.time_zone = tz || device.time_zone
+    device.country = country || device.country
     behind = all_existing_ctxs.select do |ctx_name|
       eof = stream_size(ctx_name)
       # default to the end of file, rather than the beginning, for new devices
@@ -142,6 +160,10 @@ class Backlog
     "backlog:#{@bouncer.log_name}"
   end
 
+  def now_timestamp
+    Time.now.utc.iso8601
+  end
+
   def server_msg(msg)
     case msg.command
     when /3\d\d/, 'JOIN', 'PART'
@@ -154,7 +176,7 @@ class Backlog
         # incoming pm, fake ctx to be the sender's nick
         ctx = msg.prefix.split(/[!~@]/, 2).first
       end
-      write_msg(ctx, Time.now.strftime("%d-%m-%Y %H:%M:%S") + " < #{'* ' if msg.action?}#{msg.prefix}: #{msg.args.last}")
+      write_msg(ctx, "#{now_timestamp} < #{'* ' if msg.action?}#{msg.prefix}: #{msg.args.last}")
     end
   end
 
@@ -163,7 +185,7 @@ class Backlog
     when 'PRIVMSG'
       return if msg.ctcp? && !msg.action?
       ctx = msg.args.first
-      write_msg(ctx, Time.now.strftime("%d-%m-%Y %H:%M:%S") + " > #{'* ' if msg.action?}#{msg.args.last}")
+      write_msg(ctx, "#{now_timestamp} > #{'* ' if msg.action?}#{msg.args.last}")
     end
   end
 
@@ -179,32 +201,34 @@ class Backlog
       start_pos = device.pos(ctx_name)
       get_stream(ctx_name, true) do |stream|
         stream.seek(start_pos)
-        send_backlog(conn, ctx_name, stream)
+        send_backlog(conn, ctx_name, stream, device.time_zone)
         device.update_pos(ctx_name, stream.pos)
       end
     end
   end
 
   def send_backlog_since(conn, start_time, contexts)
-    debug "scanning for backlog from #{start_time.inspect}"
+    debug "scanning for backlog from #{start_time.iso8601}"
     contexts.each do |ctx_name|
       get_stream(ctx_name, true) do |stream|
         last_line_len = 0
         BackwardsFileReader.scan(stream) do |line|
           # remember this last line length so we can scan past it
           last_line_len = line.length
-          timestamp = Time.parse(line[0,19]) rescue nil
+          timestamp = Time.parse(line[0,20]) rescue nil
           !timestamp || timestamp >= start_time
         end
         stream.seek(last_line_len, IO::SEEK_CUR)
-        send_backlog(conn, ctx_name, stream)
+        send_backlog(conn, ctx_name, stream, get_device(conn).time_zone)
       end
     end
   end
 
-  def send_backlog(conn, ctx_name, stream)
+  def send_backlog(conn, ctx_name, stream, time_zone)
     while line = stream.gets
       timestamp, msg = self.class.parse_line(line, ctx_name)
+      timestamp = timestamp.in_time_zone(time_zone) if timestamp && time_zone
+      timestamp = timestamp.localtime if timestamp && !time_zone
       next unless msg
       privmsg = msg.args.first[0] != '#'[0]
       if msg.prefix
@@ -233,15 +257,18 @@ class Backlog
   end
 
   def self.parse_line(line, ctx_name)
-    timestamp = Time.parse(line[0, 19])
+    timestamp = Time.parse(line[0, 20])
+    # older log lines have a timestamp that is one character shorter, which is
+    # why the regular expressions below optionally allow a space in front of
+    # the directional < >
     case line[20..-1]
-    when %r{^> (\* )?(.+)$}
+    when %r{^ ?> (\* )?(.+)$}
       msg = IrcMessage.new(nil, 'PRIVMSG', [ctx_name, $2])
       if $1 == '* '
         msg.ctcp = 'ACTION'
       end
       return timestamp, msg
-    when %r{^< (\* )?([^ ]+): (.+)$}
+    when %r{^ ?< (\* )?([^ ]+): (.+)$}
       msg = IrcMessage.new($2, 'PRIVMSG', [ctx_name, $3])
       if $1 == '* '
         msg.ctcp = 'ACTION'
@@ -275,4 +302,44 @@ class BacklogCommand < TkellemBot::Command
   end
 end
 
+class TimezoneCommand < TkellemBot::Command
+  register 'timezone'
+
+  def self.admin_only?
+    false
+  end
+
+  def execute
+    backlog = Backlog.get_instance(bouncer)
+    device = backlog.get_device(conn)
+
+    if !args.empty?
+      arg = args.join(' ')
+      tz = ActiveSupport::TimeZone[arg]
+      if !tz
+        conn.say_as_tkellem "Unknown time zone '#{arg}'; please use an IANA time zone"
+        return
+      end
+      device.time_zone = tz
+    end
+
+    if !device.time_zone
+      conn.say_as_tkellem "<time zone not set; using #{Time.now.zone}>"
+      return
+    end
+
+    # try to find a friendlier name to show the user
+    begin
+      country_zone = TZInfo::Country.get(device.country).zone_info.detect { |z| z.identifier == device.time_zone.name }
+      if country_zone
+        conn.say_as_tkellem country_zone.description_or_friendly_identifier
+        return
+      end
+    rescue TZInfo::InvalidCountryCode
+    end
+
+    conn.say_as_tkellem device.time_zone.tzinfo.friendly_identifier
+  end
+end
+
 end

data/lib/tkellem/tkellem_bot.rb

@@ -9,7 +9,7 @@ class TkellemBot
   # an admin
   def self.run_command(line, bouncer, conn, &block)
     args = Shellwords.shellwords(line)
-    command_name = args.shift.upcase
+    command_name = args.shift.try(:upcase)
     command = commands[command_name]
 
     unless command

data/lib/tkellem/tkellem_server.rb

@@ -95,7 +95,7 @@ class TkellemServer
     @bouncers[key] = Bouncer.new(network_user)
   end
 
-  def stop_bouncer(obj)
+  def stop_bouncer(network_user)
     key = bouncers_key(network_user)
     bouncer = @bouncers.delete(key)
     if bouncer

data/lib/tkellem/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Tkellem
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/irc_message_spec.rb

@@ -42,10 +42,10 @@ end
 describe IrcMessage, "#with_timestamp" do
   it "should prefix a timestamp to the last arg" do
     line = IrcMessage.parse(":some_long_prefix COMMAND first second :long arg here")
-    timestamp = Time.parse("Thu Nov 29 14:33:20 2001")
+    timestamp = Time.parse("2001-11-29T19:33:20")
     ts_line = line.with_timestamp(timestamp)
     ts_line.should be_a(IrcMessage)
-    ts_line.to_s.should == ":some_long_prefix COMMAND first second :2001-11-29 14:33:20> long arg here"
+    ts_line.to_s.should == ":some_long_prefix COMMAND first second :2001-11-29 19:33:20> long arg here"
   end
 
   it "should not prefix the date if the message is < 24 hours old" do

data/spec/plugins/backlog_spec.rb

@@ -18,5 +18,27 @@ describe Backlog do
       cmp("dude!~dude@12:34:56")
       cmp("dude!~dude@12:34:56", "hey dude: test")
     end
+
+    context "timestamps" do
+      it "should parse legacy timestamps" do
+        Time.use_zone("US/Mountain") do
+          timestamp, msg = Backlog.parse_line(%{10-07-2013 10:10:36 < test: hello}, '#testroom')
+          timestamp.should == Time.zone.parse("10-07-2013 10:10:36")
+          msg.prefix.should == 'test'
+          msg.command.should == 'PRIVMSG'
+          msg.args.should == ['#testroom', 'hello']
+        end
+      end
+
+      it "should parse utc timestamps" do
+        Time.use_zone("US/Mountain") do
+          timestamp, msg = Backlog.parse_line(%{2013-07-26T23:06:10Z < test: hello}, '#testroom')
+          timestamp.should == Time.parse("2013-07-26T23:06:10Z")
+          msg.prefix.should == 'test'
+          msg.command.should == 'PRIVMSG'
+          msg.args.should == ['#testroom', 'hello']
+        end
+      end
+    end
   end
 end

data/tkellem.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "activerecord", "~> 4.0.0.rc2"
   s.add_dependency "sqlite3", "~> 1.3.3"
   s.add_dependency "rails-observers", "~> 0.1.1"
+  s.add_dependency "tzinfo"
+  s.add_dependency "geoip", "~> 1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkellem
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -75,6 +75,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: geoip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 description: 
 email:
 - brian@codekitchen.net
@@ -152,18 +184,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2551777789450779146
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2551777789450779146
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -177,3 +203,4 @@ test_files:
 - spec/irc_server_spec.rb
 - spec/plugins/backlog_spec.rb
 - spec/spec_helper.rb
+has_rdoc: