hipbot 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef69ec3d9ca84e1a5bf80f9e15d107b9e4bd2ec4
-  data.tar.gz: a875ec05d94328a7fb6a7c7f0dfbd3c207b4f6d9
+  metadata.gz: 8ed63b11aa526d641c3b097eeea4899339798434
+  data.tar.gz: 229a421ee5b0ca9be639bb015a52d43e06d8bab4
 SHA512:
-  metadata.gz: d003c361dee535be8929fc219e16523ee02030383a9c607a119d4dad7fca9530feece39073119f32a0359d55b5ac67a7594dcfda44d8481a42d7d3371b1874eb
-  data.tar.gz: e5bf6173b705a247963f67c77e6b6d67d7c352cc1aee8c4f4d00ce709d7121d7d93b01422701509e6b6eb2fd7d603c7087b3b36f5cd87ed8cf8f753a030da184
+  metadata.gz: 4fead2592a00027404cf18c6547014e8a58969b33958f1f6034fb16a37b6c2078f6f48ec221ce151b3b931148e0ba57bfbe7fba7b6ebd1f2d0b3977c879b2515
+  data.tar.gz: 556422b51b8a2c7d7172cd9b830ec0f98c8ce30f3cd0f6c30112a67d156cd6032334ab4db610b6a3f88525ee68222e2c0fbf88c527c691747d8b03c4562a1c65

data/.gitignore

@@ -2,3 +2,4 @@
 coverage/*
 .bundle
 Gemfile.lock
+.ruby-version

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.6
+  - 2.2.2
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2.1.1
   - jruby-head
 matrix:
   allow_failures:

data/Gemfile

@@ -2,5 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'xmpp4r-hipchat', github: 'bartoszkopinski/xmpp4r-hipchat', branch: 'master'
+gem 'slack-api'
 
-gem 'coveralls', require: false
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+end
+
+platforms :mri do
+  gem 'coveralls', require: false
+end
+
+gem 'pry'

data/README.md

@@ -11,9 +11,9 @@ Hipbot is a XMPP bot for HipChat, written in Ruby with EventMachine.
 ### Compatibility
 Hipbot is tested on:
 
-* Ruby 1.9.2, 1.9.3 and 2.0.0
+* Ruby 1.9.3, 2.0.0 and 2.1.0
 * JRuby 1.9 mode
-* Rubinus 1.9 mode
+* Rubinus
 
 ### Dependencies
 
@@ -109,6 +109,12 @@ class MyBot < Hipbot::Bot
     # Auto join criteria (default: :all)
     # Accepted values: :all, :public, :private, :none, "room name"
     c.join     = :private
+
+    # Makes all reactions case insensitive (default: true)
+    c.case_insensitive = true
+
+    # Auto-join on invite (default: true)
+    c.join_on_invite = true
   end
 end
 ```
@@ -187,7 +193,7 @@ on /^where am I\?$/ do
     "Users online: #{room.users.count}\n" +
     "Privacy: #{room.privacy}\n" +
     "Hipchat ID: #{room.hipchat_id}\n" +
-    "Archived?: #{room.archived ? 'yes' : 'no'}\n" +
+    "Archived?: #{room.archived? ? 'yes' : 'no'}\n" +
     "Guest URL: #{room.guest_url}"
   )
 end
@@ -610,11 +616,11 @@ module Hipbot
 
     has_and_belongs_to_many :users, class_name: 'Hipbot::User', inverse_of: :rooms
 
-    field :archived,   type: Boolean
-    field :guest_url,  type: String
-    field :hipchat_id, type: String
-    field :privacy,    type: String
-    field :topic,      type: String
+    field :is_archived, type: Boolean
+    field :guest_url,   type: String
+    field :hipchat_id,  type: String
+    field :privacy,     type: String
+    field :topic,       type: String
   end
 end
 ```
@@ -653,3 +659,5 @@ end
 * ~~handle reconnecting after disconnect/failure~~
 * ~~add support for multiple regexps for one response~~
 * ~~add support for responses in particular room (`on //, room: ['public'] do ...`)~~
+
+Read [the story behind creating HipBot](https://netguru.co/blog/posts/hipbot).

data/bin/hipbot

@@ -2,6 +2,11 @@
 
 require 'daemons'
 
+Signal.trap('INT') do
+  puts("Quitting...")
+  abort
+end
+
 HIPBOT_FILE = 'bot.rb'
 
 if File.exists?(HIPBOT_FILE)

data/hipbot.gemspec

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/hipbot/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -22,5 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "em-http-request", ["~> 1.1"]
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec-its"
   gem.add_development_dependency "guard-rspec"
 end

data/lib/hipbot.rb

@@ -7,34 +7,31 @@ require 'ostruct'
 require 'json'
 require 'eventmachine'
 require 'em-http-request'
-require 'xmpp4r-hipchat'
 
-require 'hipbot/cache'
+require 'hipbot/utilities/cache'
+require 'hipbot/utilities/logger'
 require 'hipbot/patches/encoding'
-require 'hipbot/logger'
 require 'hipbot/callbacks/base'
 require 'hipbot/callbacks/message'
 require 'hipbot/callbacks/private_message'
 require 'hipbot/callbacks/room_message'
+require 'hipbot/callbacks/room_topic'
 require 'hipbot/callbacks/presence'
 require 'hipbot/callbacks/lobby_presence'
 require 'hipbot/callbacks/room_presence'
-require 'hipbot/callbacks/invite'
-require 'hipbot/adapter'
-require 'hipbot/adapters/hipchat/initializer'
-require 'hipbot/adapters/hipchat'
-require 'hipbot/adapters/telnet'
-require 'hipbot/adapters/shell'
+require 'hipbot/callbacks/room_invite'
 require 'hipbot/reaction_factory'
 require 'hipbot/reactable'
 require 'hipbot/matchable'
 require 'hipbot/configuration'
 require 'hipbot/configurable'
+require 'hipbot/adapter'
 require 'hipbot/bot'
+require 'hipbot/adaptable'
+require 'hipbot/adapters/hipchat'
 require 'hipbot/plugin'
 require 'hipbot/storages/base'
 require 'hipbot/storages/hash'
-require 'hipbot/http'
 require 'hipbot/helpers'
 require 'hipbot/match'
 require 'hipbot/message'

data/lib/hipbot/adaptable.rb

@@ -0,0 +1,60 @@
+module Hipbot
+  module Adaptable
+    extend ActiveSupport::Concern
+
+    included do
+      extend ClassMethods
+
+      Hipbot.adapters.unshift(self)
+    end
+
+    module ClassMethods
+      attr_reader :options
+
+      def inherited child
+        Hipbot.adapters.unshift(child)
+      end
+
+      def add_config_options *keys
+        @options ||= []
+        @options |= keys
+      end
+    end
+
+    def start!
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def invite_to_room(*)
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def join_room(*)
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def kick_from_room(*)
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def leave_room(*)
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def restart!
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def send_to_room(*)
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def set_presence(*)
+      logger.error("NOT IMPLEMENTED")
+    end
+
+    def set_topic(*)
+      logger.error("NOT IMPLEMENTED")
+    end
+  end
+end

data/lib/hipbot/adapter.rb

@@ -17,27 +17,27 @@ module Hipbot
     end
 
     def join_room(room)
-      logger.info("JOINING #{room}")
+      logger.info("JOINING ##{room}")
       connection.join_room(room)
     end
 
     def leave_room(room)
-      logger.info("LEAVING #{room}")
+      logger.info("LEAVING ##{room}")
       connection.leave_room(room)
     end
 
     def invite_to_room(room, users)
-      logger.info("INVITING to #{room}: #{users}")
+      logger.info("INVITING to ##{room}: #{users}")
       connection.invite_to_room(room, users)
     end
 
     def kick_from_room(room, users)
-      logger.info("KICKING from #{room}: #{users}")
+      logger.info("KICKING from ##{room}: #{users}")
       connection.kick_from_room(room, users)
     end
 
     def send_to_room(room, message)
-      logger.info("REPLY in #{room}")
+      logger.info("REPLY in ##{room}")
       connection.send_to_room(room, message)
     end
 
@@ -47,7 +47,7 @@ module Hipbot
     end
 
     def set_topic(room, topic)
-      logger.info("TOPIC seting in #{room} to '#{topic}'")
+      logger.info("TOPIC seting in ##{room} to '#{topic}'")
       connection.set_topic(room, topic)
     end
 

data/lib/hipbot/adapters/hipchat.rb

@@ -1,53 +1,10 @@
+require 'hipbot/adapters/xmpp'
+require 'hipbot/adapters/hipchat/client'
+
 module Hipbot
   module Adapters
-    class Hipchat
-      attr_accessor :client
-
-      def start!
-        self.client = Initializer.new.client
-      end
-
-      def restart!
-        start!
-      end
-
-      def invite_to_room(room, users)
-        client.invite(user_ids(users), room.id)
-      end
-
-      def kick_from_room(room, users)
-        client.kick(user_ids(users), room.id)
-      end
-
-      def send_to_room(room, message)
-        client.send_message(:groupchat, room.id, message)
-      end
-
-      def send_to_user(user, message)
-        client.send_message(:chat, user.id, message)
-      end
-
-      def set_topic(room, topic)
-        client.send_message(:groupchat, room.id, nil, topic)
-      end
-
-      def set_presence(status, type)
-        client.set_presence(type, nil, status)
-      end
-
-      def join_room(room)
-        client.join(room.id)
-      end
-
-      def leave_room(room, reason = '')
-        client.exit(room.id, reason)
-      end
-
-      protected
-
-      def user_ids users
-        Array(users).map(&:id)
-      end
+    class Hipchat < XMPP
+      include Hipbot::Adaptable
     end
   end
 end

data/lib/hipbot/adapters/hipchat/client.rb

@@ -0,0 +1,8 @@
+module Hipbot
+  module Adapters
+    class Hipchat < XMPP
+      class Client < XMPP::Client
+      end
+    end
+  end
+end

data/lib/hipbot/adapters/shell.rb

@@ -1,21 +1,14 @@
 module Hipbot
   module Adapters
     class Shell
+      include Hipbot::Adaptable
+
       attr_accessor :connection
 
       def start!
         EM.open_keyboard(KeyboardHandler, self)
       end
 
-      def invite_to_room(*); end
-      def join_room(*); end
-      def kick_from_room(*); end
-      def leave_room(*); end
-      def restart!; end
-      def send_to_room(*); end
-      def set_presence(*); end
-      def set_topic(*); end
-
       module KeyboardHandler
         include EM::Protocols::LineText2
         include Cache

data/lib/hipbot/adapters/slack.rb

@@ -0,0 +1,10 @@
+require 'hipbot/adapters/xmpp'
+require 'hipbot/adapters/slack/client'
+
+module Hipbot
+  module Adapters
+    class Slack < XMPP
+      add_config_options :slack_api_token
+    end
+  end
+end

data/lib/hipbot/adapters/slack/client.rb

@@ -0,0 +1,47 @@
+require "slack"
+
+module Hipbot
+  module Adapters
+    class Slack < XMPP
+      class Client < XMPP::Client
+        def initialize
+          ::Slack.configure do |config|
+            config.token = Hipbot.configuration.slack_api_token
+          end
+          super
+        end
+
+        protected
+
+        def initialize_rooms
+          room_ids = ::Slack.client.channels_list["channels"].map do |channel|
+            room = Room.find_or_create_by(id: channel["name"])
+            room.update_attributes(name: channel["name"])
+            room.id
+          end
+
+          clean_other_objects(Room, room_ids) if room_ids.any?
+        end
+
+        def initialize_users
+          user_ids = ::Slack.client.users_list["members"].map do |user_data|
+            user = User.find_or_create_by(id: user_data["name"])
+            profile_data = user_data["profile"]
+
+            user.update_attributes(
+                  name: user_data["real_name"],
+               mention: user_data["name"],
+                 email: profile_data["email"],
+                 title: profile_data["title"],
+                 photo: profile_data["image_192"],
+                 admin: profile_data["is_admin"],
+            )
+            user.id
+          end
+
+          clean_other_objects(User, user_ids) if user_ids.any?
+        end
+      end
+    end
+  end
+end

data/lib/hipbot/adapters/telnet.rb

@@ -1,6 +1,8 @@
 module Hipbot
   module Adapters
     class Telnet
+      include Hipbot::Adaptable
+
       attr_accessor :connection
 
       def start!
@@ -11,15 +13,6 @@ module Hipbot
         connection.send_data("#{self}:#{user}:#{message}\n")
       end
 
-      def invite_to_room(*); end
-      def join_room(*); end
-      def kick_from_room(*); end
-      def leave_room(*); end
-      def restart!; end
-      def send_to_room(*); end
-      def set_presence(*); end
-      def set_topic(*); end
-
       class Connection < EM::Connection
         include Cache