slacky 0.1 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slacky (0.1)
+    slacky (0.1.1)
       dotenv
       em-cron
       eventmachine
@@ -31,10 +31,10 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    faye-websocket (0.10.3)
+    faye-websocket (0.10.4)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    gli (2.13.4)
+    gli (2.14.0)
     hashie (3.4.4)
     i18n (0.7.0)
     json (1.8.3)
@@ -43,7 +43,7 @@ GEM
     parse-cron (0.1.4)
     pg (0.18.4)
     rake (11.1.2)
-    slack-ruby-client (0.7.2)
+    slack-ruby-client (0.7.3)
       activesupport
       faraday
       faraday_middleware
@@ -56,7 +56,7 @@ GEM
       thread_safe (~> 0.1)
     tzinfo-data (1.2016.4)
       tzinfo (>= 1.0.0)
-    websocket-driver (0.6.3)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
 

data/lib/slacky/bot.rb

@@ -8,8 +8,6 @@ module Slacky
     attr_reader :client, :config, :slack_id
 
     def initialize(config)
-      puts "#{config.name} is starting up..."
-
       @config = config
       @restarts = []
       @command_handlers = []
@@ -42,9 +40,6 @@ module Slacky
 
       Channel.bot = self
       Message.bot = self
-
-      populate_users
-      populate_channels
     end
 
     def web_client
@@ -133,6 +128,12 @@ module Slacky
     end
 
     def run
+      @config.log "#{config.name} is starting up..."
+      puts "#{config.name} is starting up..."
+
+      populate_users
+      populate_channels
+
       @bookkeeper.keep_the_books
 
       @client.on :message do |data|

data/lib/slacky/cli.rb

@@ -2,12 +2,11 @@ module Slacky
   class CLI
     attr_reader :bot
 
-    def initialize(name, opts)
+    def initialize(name, bot_class, opts)
       throw "CLI must be passed a name" unless name
       @options = { :verbose => false }.merge opts
       config = Config.new name
-      @bot = Bot.new config
-      daemon = Daemon.new config, bot
+      daemon = Daemon.new config, bot_class
       @service = Service.new config, daemon
     end
 

data/lib/slacky/config.rb

@@ -12,11 +12,14 @@ module Slacky
       Dotenv.load ".env", "#{config_dir}/.env"
       FileUtils.mkdir config_dir unless File.directory? config_dir
       @pid_file = "#{config_dir}/pid"
-      @db = PG.connect(db_connect_params)
-      User.db = @db
-      User.initialize_table
-
       @timestamps = {}
+      User.config = self
+    end
+
+    def db
+      db = PG.connect db_connect_params
+      db.exec 'set client_min_messages = warning'
+      db
     end
 
     def down_name

data/lib/slacky/daemon.rb

@@ -1,9 +1,9 @@
 module Slacky
   class Daemon
 
-    def initialize(config, bot)
+    def initialize(config, bot_class)
       @config = config
-      @bot = bot
+      @bot_class = bot_class
       @active = true
       @running = false
     end
@@ -20,8 +20,12 @@ module Slacky
       end
 
       begin
-        @slackthread = Thread.new { @bot.run }
-        run @bot
+        @slackthread = Thread.new do
+          bot = Bot.new @config
+          bot.run
+          @bot_class.new bot
+        end
+        run
       rescue => e
         @config.log "Unexpected error", e
       ensure
@@ -35,11 +39,9 @@ module Slacky
 
     private
 
-    def run(slackbot)
+    def run
       @config.log "#{@config.name} is running."
       while active? do
-        # TODO: handle timed tasks
-        #slackbot.ask_all if time.min % 10 == 0  # every 10 minutes
         sleep 0.5
       end
       @config.log "#{@config.name} got killed"

data/lib/slacky/user.rb

@@ -5,18 +5,25 @@ module Slacky
     attr_accessor :username, :slack_id, :slack_im_id, :first_name, :last_name, :email, :timezone, :presence, :data
     attr_reader :tz
 
-    @@decorator = @@db = nil
+    @@decorator = @@config = @@db = nil
 
     def self.decorator=(decorator)
       @@decorator = decorator
     end
 
-    def self.db=(db)
-      @@db = db
+    def self.config=(config)
+      @@config = config
+    end
+
+    def self.db
+      return @@db if @@db
+      @@db = @@config.db
+      initialize_table
+      @@db
     end
 
     def self.initialize_table
-      @@db.exec <<-SQL
+      self.db.exec <<-SQL
 create table if not exists users (
   username     varchar(64) not null,
   slack_id     varchar(20) not null,
@@ -33,9 +40,9 @@ SQL
 
     def self.find(user)
       return user.map { |u| User.find u }.compact if user.is_a? Array
-      result = @@db.exec_params "select * from users where slack_id = $1", [ user ]
+      result = self.db.exec_params "select * from users where slack_id = $1", [ user ]
       if result.ntuples == 0
-        result = @@db.exec_params "select * from users where username = $1", [ user ]
+        result = self.db.exec_params "select * from users where username = $1", [ user ]
       end
       return nil if result.ntuples == 0
 
@@ -77,10 +84,10 @@ SQL
     end
 
     def save
-      @@db.exec_params "delete from users where slack_id = $1", [ @slack_id ]
-      @@db.exec_params "insert into users (username, slack_id, slack_im_id, first_name, last_name, email, timezone, presence, data)
-                        values ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
-                        [ @username, @slack_id, @slack_im_id, @first_name, @last_name, @email, @timezone, @presence, JSON.dump(@data) ]
+      User.db.exec_params "delete from users where slack_id = $1", [ @slack_id ]
+      User.db.exec_params "insert into users (username, slack_id, slack_im_id, first_name, last_name, email, timezone, presence, data)
+                           values ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
+                          [ @username, @slack_id, @slack_im_id, @first_name, @last_name, @email, @timezone, @presence, JSON.dump(@data) ]
       self
     end
 

data/lib/slacky/version.rb

@@ -1,3 +1,3 @@
 module Slacky
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slacky
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -226,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3373873093616992315
+      hash: 1909049652841046300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3373873093616992315
+      hash: 1909049652841046300
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23