tkellem 0.8.0 → 0.8.1

data/README.md

@@ -17,11 +17,9 @@ functionality.
 
 This will have to do as a quickstart guide, for now:
 
-    $ git clone git://github.com/codekitchen/tkellem.git
-    $ cd tkellem
-    $ bundle install
-    $ bundle exec bin/tkellem start
-    $ bundle exec bin/tkellem admin
+    $ gem install tkellem
+    $ tkellem start
+    $ tkellem admin
     > help
     > listen ircs://0.0.0.0:8765
     > user --add <my-name> --admin
@@ -37,3 +35,7 @@ Then connect to tkellem with an irc client:
     nickname: <my-name>
     login: <my-name>@freenode
     server password: <my-new-password>
+
+Note that all config and log files are stored in ~/.tkellem of the user
+you run `tkellem start` as. You also need to run `tkellem admin` as this
+same user, in order to have access to the admin console.

data/lib/tkellem/bouncer.rb

@@ -205,6 +205,14 @@ class Bouncer
 
     # We're all initialized, allow connections
     @connected = true
+
+    @network_user.at_connect.each do |line|
+      cmd, args = line.split(' ', 2)
+      next unless cmd && args && cmd[0] == '/'[0]
+      msg = IrcMessage.parse("#{cmd[1..-1].upcase} #{args}")
+      send_msg(msg)
+    end
+
     @waiting_clients.each do |client|
       client.say_as_tkellem("Now connected.")
       connect_client(client)

data/lib/tkellem/migrations/002_at_connect_columns.rb

@@ -0,0 +1,7 @@
+class AtConnectColumns < ActiveRecord::Migration
+  def self.up
+    add_column 'networks', 'at_connect', 'text'
+    add_column 'network_users', 'at_connect', 'text'
+  end
+end
+

data/lib/tkellem/models/network.rb

@@ -7,6 +7,12 @@ class Network < ActiveRecord::Base
   # can join them.
   belongs_to :user
 
+  serialize :at_connect, Array
+
+  def at_connect
+    read_attribute(:at_connect) || []
+  end
+
   def public?
     !user
   end

data/lib/tkellem/models/network_user.rb

@@ -4,9 +4,17 @@ class NetworkUser < ActiveRecord::Base
   belongs_to :network
   belongs_to :user
 
+  serialize :at_connect, Array
+
   def nick
     read_attribute(:nick) || user.name
   end
+
+  # we use the network's at_connect until it is modified and overwritten for
+  # this specific network user
+  def at_connect
+    read_attribute(:at_connect).presence || network.at_connect.presence || []
+  end
 end
 
 end

data/lib/tkellem/tkellem_bot.rb

@@ -127,9 +127,9 @@ class TkellemBot
       register(name)
       cattr_accessor :model
       self.model = model
-      options.set('add', '--add', '-a', "Add a #{model.name}")
-      options.set('remove', '--remove', '-r', "Remove a #{model.name}")
-      options.set('list', '--list', '-l', "List the current #{model.name.pluralize}")
+      options.set('add', '--add', '-a', "Add a #{model}")
+      options.set('remove', '--remove', '-r', "Remove a #{model}")
+      options.set('list', '--list', '-l', "List the current #{model.to_s.pluralize}")
     end
 
     def show(m)
@@ -254,6 +254,39 @@ class TkellemBot
     end
   end
 
+  class AtConnectCommand < CRUDCommand
+    register_crud 'atconnect', 'At-Connect'
+
+    # options.set('network', '--network=network', '-n', 'Network to modify at-connect on')
+    options.set('username', '--user=username', '-u', 'Modify a user-specific network for another user')
+
+    def list(args, user, network = nil)
+      network_name, network, user = NetworkCommand.get_network(args, user) unless network
+      raise(Command::ArgumentError, "No network found") unless network
+      r "At connect:"
+      network.at_connect.each { |line| r "    /#{line}" }
+    end
+
+    def remove(args, user)
+      network_name, network, user = NetworkCommand.get_network(args, user)
+      raise(Command::ArgumentError, "No network found") unless network
+      line = args[:rest].join(' ')
+      network.at_connect = network.at_connect.reject { |l| l == line }
+      network.save
+      list(args, user, network)
+    end
+
+    def add(args, user)
+      network_name, network, user = NetworkCommand.get_network(args, user)
+      raise(Command::ArgumentError, "No network found") unless network
+      line = args[:rest].join(' ')
+      raise(Command::ArgumentError, "atconnect commands must start with a /") unless line[0] == '/'[0]
+      network.at_connect = network.at_connect + [line]
+      network.save
+      list(args, user, network)
+    end
+  end
+
   class NetworkCommand < CRUDCommand
     register_crud 'network', Host
 
@@ -269,7 +302,7 @@ class TkellemBot
       "#{host.network.name}#{' (public)' if host.network.public?} " + host.network.hosts.map { |h| "[#{h}]" }.join(' ')
     end
 
-    def get_network(args, user)
+    def self.get_network(args, user)
       network_name = args[:rest].shift
       if args['username']
         if Command.admin_user?(user)
@@ -281,12 +314,16 @@ class TkellemBot
 
       network = Network.first(:conditions => { :name => network_name, :user_id => user.id }) if user
       network ||= Network.first(:conditions => { :name => network_name, :user_id => nil })
-      if network && network.public? && !self.class.admin_user?(user)
+      if network && network.public? && !admin_user?(user)
         raise Command::ArgumentError, "Only admins can modify public networks"
       end
       return network_name, network, user
     end
 
+    def get_network(args, user)
+      self.class.get_network(args, user)
+    end
+
     def remove(args, user)
       network_name, network, user = get_network(args, user)
       if network

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: tkellem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Brian Palmer
@@ -136,6 +136,7 @@ files:
 - lib/tkellem/irc_message.rb
 - lib/tkellem/irc_server.rb
 - lib/tkellem/migrations/001_init_db.rb
+- lib/tkellem/migrations/002_at_connect_columns.rb
 - lib/tkellem/models/host.rb
 - lib/tkellem/models/listen_address.rb
 - lib/tkellem/models/network.rb