tkellem 0.8.10 → 0.8.11

data/README.md

@@ -40,6 +40,19 @@ 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.
 
+## Devices
+
+Each user can connect with multiple devices. Devices are specified in your
+login by appending `:<device-name>` to your login. Example:
+
+    login: <my-name>@freenode:work-machine
+
+If there is no `:<device-name>` appended to your login, tkellem just uses a
+default device.
+
+Using multiple devices simply marks separate points in the backlog so you
+get only the relevant backlog on a per-device basis.
+
 ## Upgrading
 
 Upgrading is as simple as:

data/lib/tkellem/bouncer.rb

@@ -111,12 +111,12 @@ class Bouncer
       ready! if msg.command == "376" # end of MOTD
       false
     when 'JOIN'
-      debug "#{msg.target_user} joined #{msg.args.last}"
-      @rooms << msg.args.last if msg.target_user == @nick
+      debug "#{msg.target_user} joined #{msg.args.first}"
+      @rooms << msg.args.first if msg.target_user == @nick
       true
     when 'PART'
-      debug "#{msg.target_user} left #{msg.args.last}"
-      @rooms.delete(msg.args.last) if msg.target_user == @nick
+      debug "#{msg.target_user} left #{msg.args.first}"
+      @rooms.delete(msg.args.first) if msg.target_user == @nick
       true
     when 'PING'
       send_msg("PONG tkellem!tkellem :#{msg.args.last}")

data/lib/tkellem/tkellem_bot.rb

@@ -389,7 +389,8 @@ class TkellemBot
         unless target
           create_public = (self.class.admin_user?(user) && opts['public'])
           raise(Command::ArgumentError, "Only public networks can be created without a user") unless create_public || user
-          raise(Command::ArgumentError, "Creating user networks has been disabled by the admins") unless Setting.get('allow_user_networks') == 'true'
+          admin_or_user_networks = self.class.admin_user?(user) || Setting.get('allow_user_networks') == 'true'
+          raise(Command::ArgumentError, "Creating user networks has been disabled by the admins") unless admin_or_user_networks
           target = Network.create(:name => opts['network'], :user => (create_public ? nil : user))
           unless create_public
             NetworkUser.create(:user => user, :network => target)

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 end

data/resources/bot_command_descriptions.yml

@@ -64,4 +64,4 @@ SETTING:
 
     Examples:
         SETTING
-        SETTING public_registration true
+        SETTING user_registration open

metadata

@@ -1,109 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tkellem
-version: !ruby/object:Gem::Version 
-  hash: 43
+version: !ruby/object:Gem::Version
+  version: 0.8.11
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 10
-  version: 0.8.10
 platform: ruby
-authors: 
+authors:
 - Brian Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
+      - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - brian@codekitchen.net
-executables: 
+executables:
 - tkellem
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -153,39 +148,31 @@ files:
 - tkellem.gemspec
 homepage: http://github.com/codekitchen/tkellem
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: IRC bouncer with multi-client support
-test_files: 
+test_files:
 - spec/bouncer_connection_spec.rb
 - spec/irc_message_spec.rb
 - spec/irc_server_spec.rb
 - spec/spec_helper.rb
+has_rdoc: