tkellem 0.8.8 → 0.8.9

data/lib/tkellem/daemon.rb

@@ -15,7 +15,7 @@ class Tkellem::Daemon
   end
 
   def run
-    OptionParser.new do |opts|
+    opts = OptionParser.new do |opts|
       opts.banner = "Usage #{$0} <command> <options>"
       opts.separator %{\nWhere <command> is one of:
   start      start the jobs daemon
@@ -29,7 +29,8 @@ class Tkellem::Daemon
       opts.separator "\n<options>"
       opts.on("-p", "--path", "Use alternate folder for tkellem data (default #{options[:path]})") { |p| options[:path] = p }
       opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
-    end.parse!(@args)
+    end
+    opts.parse!(@args)
 
     FileUtils.mkdir_p(path)
     File.chmod(0700, path)
@@ -50,6 +51,8 @@ class Tkellem::Daemon
       start
     when 'admin'
       admin
+    when nil
+      puts opts
     else
       raise("Unknown command: #{command.inspect}")
     end

data/lib/tkellem/tkellem_bot.rb

@@ -258,7 +258,7 @@ class TkellemBot
 
       if opts['username']
         if Command.admin_user?(user)
-          user = User.first(:conditions => { :username => args['username'] })
+          user = User.first(:conditions => { :username => opts['username'] })
         else
           raise Command::ArgumentError, "Only admins can change other passwords"
         end

data/lib/tkellem/tkellem_server.rb

@@ -16,14 +16,6 @@ require 'tkellem/plugins/push_service'
 
 module Tkellem
 
-unless ActiveRecord::Base.connected?
-  ActiveRecord::Base.establish_connection({
-    :adapter => 'sqlite3',
-    :database => File.expand_path("~/.tkellem/tkellem.sqlite3"),
-  })
-  ActiveRecord::Migrator.migrate(File.expand_path("../migrations", __FILE__), nil)
-end
-
 class TkellemServer
   include Tkellem::EasyLogger
 
@@ -34,6 +26,14 @@ class TkellemServer
     @bouncers = {}
     $tkellem_server = self
 
+    unless ActiveRecord::Base.connected?
+      ActiveRecord::Base.establish_connection({
+        :adapter => 'sqlite3',
+        :database => File.expand_path("~/.tkellem/tkellem.sqlite3"),
+      })
+      ActiveRecord::Migrator.migrate(File.expand_path("../migrations", __FILE__), nil)
+    end
+
     ListenAddress.all.each { |a| listen(a) }
     NetworkUser.find_each { |nu| add_bouncer(Bouncer.new(nu)) }
     Observer.forward_to << self

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tkellem
 version: !ruby/object:Gem::Version 
+  hash: 45
   prerelease: 
-  version: 0.8.8
+  segments: 
+  - 0
+  - 8
+  - 9
+  version: 0.8.9
 platform: ruby
 authors: 
 - Brian Palmer
@@ -10,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -06:00
-default_executable: tkellem
+date: 2011-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -21,6 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
   type: :runtime
   version_requirements: *id001
@@ -32,6 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
@@ -43,6 +57,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
   type: :runtime
   version_requirements: *id003
@@ -54,6 +73,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id004
@@ -65,6 +88,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -125,7 +151,6 @@ files:
 - spec/irc_server_spec.rb
 - spec/spec_helper.rb
 - tkellem.gemspec
-has_rdoc: true
 homepage: http://github.com/codekitchen/tkellem
 licenses: []
 
@@ -139,17 +164,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: IRC bouncer with multi-client support