del 0.1.16 → 0.1.17

data/lib/del/user.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Del
+  # An XMPP user.
   class User
     attr_reader :jid, :attributes
 
@@ -14,5 +17,10 @@ module Del
     def to_s
       YAML.dump(attributes)
     end
+
+    def self.map_from(attributes)
+      return nil if attributes.nil?
+      new(attributes['jid'], attributes)
+    end
   end
 end

data/lib/del/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Del
-  VERSION = "0.1.16"
+  VERSION = '0.1.17'
 end

data/lib/del/xmpp_connection.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+module Del
+  # An XMPP Connection
+  class XMPPConnection
+    attr_reader :configuration
+
+    def initialize(configuration:)
+      @configuration = configuration
+      @rooms = {}
+    end
+
+    def connect(robot)
+      record_exceptions
+      connect_to_xmpp_server
+      roster = discover_users
+      listen_for_direct_messages(robot)
+      update_status(:chat)
+      discover_rooms(robot, roster)
+    end
+
+    def deliver(jid, message)
+      message = Jabber::Message.new(jid, encode_string(message))
+      message.type = :chat
+      client.send(message)
+    end
+
+    def deliver_to_room(jid, message)
+      @rooms[jid.strip.to_s]&.say(encode_string(message))
+    end
+
+    def disconnect
+      Del.logger.info('byte me!')
+      client.close
+    rescue IOError, SystemCallError => error
+      Del.logger.error(error)
+    end
+
+    # :chat, :away, :dnd, :xa
+    def update_status(show = :chat, message: nil)
+      client.send(Jabber::Presence.new(show, message))
+    end
+
+    private
+
+    def client
+      @client ||= Jabber::Client.new(jid)
+    end
+
+    def jid
+      @jid ||= jid_for(configuration.jid, 'chat.hipchat.com', 'bot')
+    end
+
+    def encode_string(item)
+      item.to_s.encode('UTF-8', invalid: :replace, undef: :replace)
+    end
+
+    def jid_for(jid, domain, resource)
+      jid = Jabber::JID.new(jid)
+      jid.resource = resource
+      unless jid.node
+        jid.node = jid.domain
+        jid.domain = domain
+      end
+      jid
+    end
+
+    def record_exceptions
+      client.on_exception do |error, _connection, _error_source|
+        Del.logger.error(error)
+        disconnect
+      end
+    end
+
+    def connect_to_xmpp_server
+      client.connect(configuration.host)
+      sleep 0.0001 until client.is_connected?
+      client.auth(configuration.password)
+    end
+
+    def discover_users
+      roster = Jabber::Roster::Helper.new(client, false)
+      roster.add_update_callback do |_old_item, item|
+        configuration.users.upsert(item['jid'], item.attributes) if item
+      end
+      roster.get_roster
+      roster.wait_for_roster
+      roster
+    end
+
+    def listen_for_direct_messages(robot)
+      client.add_message_callback do |message|
+        next if message.type == :error || message.body.nil?
+        user = configuration.users.find(message.from.strip)
+        robot.receive(message.body, source: Source.new(user: user))
+      end
+    end
+
+    def discover_rooms(robot, roster)
+      configuration.default_rooms.each do |room|
+        room_jid = jid_for(room, configuration.muc_domain.dup, robot.name)
+        stripped_jid = room_jid.strip.to_s
+        next if @rooms[stripped_jid]
+
+        muc = @rooms[stripped_jid] = Jabber::MUC::SimpleMUCClient.new(client)
+        listen_for_room_messages(muc, room_jid, robot, roster)
+      end
+    end
+
+    def listen_for_room_messages(multi_user_chat, room_jid, robot, roster)
+      multi_user_chat.on_message do |_, nickname, message|
+        Del.logger.debug([nickname, message].inspect)
+        user = find_user_with(nickname, roster)
+        source = Source.new(user: user, room: room_jid.strip.to_s)
+        robot.receive(message, source: source)
+      end
+      multi_user_chat.join(room_jid)
+    end
+
+    def find_user_with(nickname, roster)
+      other_jid = roster.items.find { |_jid, item| item.iname == nickname }
+      user = configuration.users.find(other_jid)
+      user.nil? ? User.new(other_jid[0], other_jid[1]) : user
+    end
+  end
+end

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: del
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - mo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: xmpp4r
+  name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: net-hippie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: xmpp4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 description: Del is a funky robosapien.
 email:
 - mo@mokhan.ca
@@ -89,30 +145,40 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/cibuild
 - bin/console
+- bin/lint
+- bin/publish
 - bin/setup
+- bin/test
 - del.gemspec
 - exe/del
 - lib/del.rb
 - lib/del/cli.rb
 - lib/del/configuration.rb
-- lib/del/connection.rb
 - lib/del/default_router.rb
 - lib/del/examples/routes.rb
 - lib/del/message.rb
 - lib/del/repository.rb
 - lib/del/robot.rb
+- lib/del/send_message.rb
+- lib/del/shell_command.rb
 - lib/del/socket_connection.rb
+- lib/del/socket_message.rb
 - lib/del/socket_server.rb
 - lib/del/source.rb
+- lib/del/tron.rb
 - lib/del/user.rb
 - lib/del/version.rb
+- lib/del/xmpp_connection.rb
 homepage: https://www.mokhan.ca
 licenses:
 - MIT
@@ -125,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/del/connection.rb

@@ -1,98 +0,0 @@
-module Del
-  class Connection
-    attr_reader :configuration
-
-    def initialize(configuration:)
-      @configuration = configuration
-      @mucs = {}
-    end
-
-    def connect(robot)
-      client.on_exception do |error, connection, error_source|
-        Del.logger.error(error)
-        disconnect
-      end
-      client.connect(configuration.host)
-      sleep 0.0001 until client.is_connected?
-      client.auth(configuration.password)
-      roster = Jabber::Roster::Helper.new(client, false)
-      roster.add_update_callback do |old_item, item|
-        configuration.users.upsert(item['jid'], item.attributes) if item
-      end
-      roster.get_roster
-      roster.wait_for_roster
-      client.add_message_callback do |message|
-        next if message.type == :error || message.body.nil?
-        user = configuration.users.find_by(message.from.strip)
-        robot.receive(message.body, source: Source.new(user: user))
-      end
-      client.send(Jabber::Presence.new(:chat))
-      configuration.default_rooms.each do |room|
-        Del.logger.debug("Joining room '#{room}' as '#{robot.name}'")
-        room_jid = jid_for(room, configuration.muc_domain.dup, robot.name)
-        stripped_jid = room_jid.strip.to_s
-        next if @mucs[stripped_jid]
-
-        muc = Jabber::MUC::SimpleMUCClient.new(client)
-        @mucs[stripped_jid] = muc
-        muc.on_message do |_, nickname, message|
-          Del.logger.debug([nickname, message].inspect)
-          other_jid = roster.items.find { |jid, item| item.iname == nickname }
-          robot.receive(message, source: Source.new(user: User.new(other_jid[0], other_jid[1]), room: stripped_jid))
-        end
-        muc.join(room_jid)
-      end
-      #list_rooms(configuration.muc_domain).each do |room|
-        #rooms.upsert(room)
-      #end
-    end
-
-    def deliver(jid, message)
-      message = Jabber::Message.new(jid, encode_string(message))
-      message.type = :chat
-      client.send(message)
-    end
-
-    def deliver_to_room(jid, message)
-      muc = @mucs[jid.strip.to_s]
-      muc.say(encode_string(message)) if muc
-    end
-
-    def disconnect
-      Del.logger.info("byte me!")
-      client.close
-    rescue IOError, SystemCallError => error
-      Del.logger.error(error)
-    end
-
-    private
-
-    def client
-      @client ||= Jabber::Client.new(jid)
-    end
-
-    def jid
-      @jid ||= jid_for(configuration.jid, "chat.hipchat.com", "bot")
-    end
-
-    #def list_rooms(muc_domain)
-      #Jabber::MUC::MUCBrowser.new(client).muc_rooms(muc_domain).map do |jid, name|
-        #jid.to_s
-      #end
-    #end
-
-    def encode_string(s)
-      s.to_s.encode("UTF-8", invalid: :replace, undef: :replace)
-    end
-
-    def jid_for(jid, domain, resource)
-      jid = Jabber::JID.new(jid)
-      jid.resource = resource
-      unless jid.node
-        jid.node = jid.domain
-        jid.domain = domain
-      end
-      jid
-    end
-  end
-end