del 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70c030f756e772de50ea08ce46478b9d55c253c89c01223358932359830881b
-  data.tar.gz: bb901e1d5da1da3fe49ec976e85e2d959b4642d538334ec8b0f94b693f3be644
+  metadata.gz: 7dee4ec5ef43e37de14d0de384d7e687000a441ec855015e6670d3c8b0f7ea80
+  data.tar.gz: 8ed4c9ad2433d08f0ebd768b9f4d69aa8ce0d3fb3c5fc74ac0f1b7602267a6ad
 SHA512:
-  metadata.gz: 955aee1ae6f037df4c606c7cfb52c7afbd951db464195a60c2a9536c20a46bb67819656598966c6b7f1b7e97674aa7b188d4b1cf70d691ec9d2faee5fb117e03
-  data.tar.gz: 395506b0ec6a53fcc8e487e1beff76494eb2e81457732cd419a2404e5e57df4671a91823035a321ed50ee100b6600fc30d1a44e6a663bfe0bb1b1e786bdef63a
+  metadata.gz: 53fe4ef8ee840f91fa551dab83b17e5abc4ee2a286465cd92b707961d386f4bc71923c7b4c6f9848928e140b894be9ee4df0ce04104894d11fa81b98fe8e3f6f
+  data.tar.gz: c23d9d1db2ac27d59b65649a57c19aa55949fc192b7af2e68db25ff96fbfbb57ea8c7fa90e7de23a9f8f1129c6363d4998272637659a1d29dbc80ac3b6fca106

data/README.md

@@ -1,6 +1,6 @@
 # Del
 
-Del is a funky robosapien.
+[Del is a funky robosapien](https://www.delhiero.com/)
 
 ## Installation
 

data/bin/console

@@ -11,4 +11,8 @@ require "del"
 # Pry.start
 
 require "irb"
+Del.start(
+  dotenv_file: Pathname.new(Dir.home).join(".delrc"),
+  start_server: false,
+)
 IRB.start(__FILE__)

data/del.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "dotenv", "~> 2.4"
   spec.add_dependency "xmpp4r", "~> 0.5"
+  spec.add_dependency "thor", "~> 0.20"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/exe/del

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 
-require "del"
-require "pathname"
+require "del/cli"
 
-startup_file = Pathname.new(ARGV[0]) if ARGV[0]
-Del.start(
-  dotenv_file: ENV.fetch("DELRC", Pathname.new(Dir.home).join(".delrc")),
-  startup_file: startup_file,
-)
+Del::CLI.start(ARGV)

data/lib/del.rb

@@ -1,25 +1,30 @@
 require "dotenv"
+require "json"
 require "logger"
+require "socket"
 require "xmpp4r"
 require "xmpp4r/muc/helper/mucbrowser"
 require "xmpp4r/muc/helper/simplemucclient"
 require "xmpp4r/roster/helper/roster"
 
-require "del/connection"
 require "del/configuration"
+require "del/connection"
 require "del/default_router"
 require "del/message"
 require "del/repository"
 require "del/robot"
+require "del/socket_connection"
+require "del/socket_server"
 require "del/source"
 require "del/user"
 require "del/version"
 
 module Del
-  def self.start(dotenv_file:, startup_file:)
+  def self.start(dotenv_file:, startup_file: nil, start_server: true, socket_file: nil)
     puts "Loading... #{dotenv_file}"
     Dotenv.load(dotenv_file.to_s)
     Del.configure do |config|
+      config.socket_file = socket_file if socket_file
       config.router.register(/.*/) do |message|
         logger.debug(message.to_s)
       end
@@ -27,7 +32,7 @@ module Del
     load startup_file if startup_file && File.exist?(startup_file)
 
     del = Robot.new(configuration: configuration)
-    del.get_funky!
+    del.get_funky!(start_server: start_server)
   end
 
   def self.configure

data/lib/del/cli.rb

@@ -0,0 +1,31 @@
+require "del"
+require "pathname"
+require "thor"
+
+module Del
+  class CLI < Thor
+    DEFAULT_RC=Pathname.new(Dir.home).join(".delrc")
+    class_option :dotenv_file, default: ENV.fetch("DELRC", DEFAULT_RC)
+    class_option :socket_file, default: Del::Configuration::SOCKET_FILE
+
+    desc "server <routes.rb>", "start server"
+    def server(startup_file = nil)
+      Del.start(
+        dotenv_file: options[:dotenv_file],
+        socket_file: options[:socket_file],
+        startup_file: startup_file,
+      )
+    end
+
+    desc "message <jid> <message>", "send a message to the Jabber ID"
+    def message(jid, message)
+      socket = UNIXSocket.new(options[:socket_file])
+      socket.puts(JSON.generate(command: :send_message, jid: jid, message: message))
+      say socket.readline, :green
+    rescue EOFError => error
+      say error.message, :red
+    ensure
+      socket&.close
+    end
+  end
+end

data/lib/del/configuration.rb

@@ -1,5 +1,6 @@
 module Del
   class Configuration
+    SOCKET_FILE="/tmp/del.sock"
     attr_accessor :default_rooms
     attr_accessor :host
     attr_accessor :jid
@@ -11,18 +12,20 @@ module Del
     attr_accessor :rooms
     attr_accessor :router
     attr_accessor :users
+    attr_accessor :socket_file
 
     def initialize
       @default_rooms = ENV.fetch("DEL_ROOMS", '').split(',')
       @host = ENV.fetch("DEL_HOST", 'chat.hipchat.com')
       @jid = ENV.fetch("DEL_JID")
       @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
+      @logger.level = ENV.fetch('LOG_LEVEL', Logger::INFO).to_i
       @muc_domain = ENV.fetch("DEL_MUC_DOMAIN", "conf.hipchat.com")
       @name = ENV.fetch("DEL_FULL_NAME")
       @password = ENV.fetch("DEL_PASSWORD")
       @rooms = Repository.new
       @router = DefaultRouter.new
+      @socket_file = SOCKET_FILE
       @users = Repository.new
     end
   end

data/lib/del/examples/routes.rb

@@ -1,13 +1,17 @@
-Del.configure do |config|
+Del.configure do |x|
   puts "Registering custom routes."
 
-  config.router.register(/.*/) do |message|
+  x.router.register(/.*/) do |message|
     Del.logger.info("Backwards!")
     message.reply(message.text.reverse)
   end
 
-  config.router.register(/^cowsay (.*)/) do |message, match_data|
+  x.router.register(/^cowsay (.*)/) do |message, match_data|
     Del.logger.info("COWSAY!")
     message.reply("/code #{`cowsay #{match_data[1]}`}")
   end
+
+  x.router.register(/^[Hh]ello/) do |message|
+    message.reply("Hi!")
+  end
 end

data/lib/del/repository.rb

@@ -13,6 +13,10 @@ module Del
       @lock.synchronize { @storage[id.to_s] }
     end
 
+    def find_by_value
+      @lock.synchronize { @storage.values.find { |x| yield x } }
+    end
+
     def find_all
       @lock.synchronize { @storage.keys }
     end

data/lib/del/robot.rb

@@ -1,6 +1,6 @@
 module Del
   class Robot
-    attr_reader :connection, :router
+    attr_reader :connection, :router, :server
     attr_reader :users, :rooms
     attr_reader :jid, :name
 
@@ -11,12 +11,13 @@ module Del
       @router = configuration.router
       @users = configuration.users
       @rooms = configuration.rooms
+      @server = SocketServer.new(socket_file: configuration.socket_file)
     end
 
-    def get_funky!
-      connection.connect(self)
+    def get_funky!(start_server: true)
       Del.logger.info("It's fire! 🔥")
-      sleep
+      connection.connect(self)
+      server.run(self) if start_server
     rescue Interrupt
       connection.disconnect
     end
@@ -26,12 +27,28 @@ module Del
       router.route(Message.new(message, robot: self, source: source))
     end
 
-    def send_message(jid, message, room: nil)
-      if room.nil?
+    def send_message(jid, message)
+      if user?(jid)
         connection.deliver(jid, message)
       else
-        connection.deliver_to_room(room, message)
+        connection.deliver_to_room(jid, message)
       end
     end
+
+    def execute(request)
+      case request['command']
+      when 'send_message'
+        send_message(request['jid'], request['message'])
+        "Sent!"
+      else
+        "Unknown"
+      end
+    end
+
+    private
+
+    def user?(jid)
+      users[jid]
+    end
   end
 end

data/lib/del/socket_connection.rb

@@ -0,0 +1,17 @@
+module Del
+  class SocketConnection
+    def initialize(path:)
+      File.unlink(path) if File.exists?(path)
+      @server = UNIXServer.new(path)
+    end
+
+    def on_receive
+      socket = @server.accept
+      yield socket
+    rescue => error
+      Del.logger.error(error)
+    ensure
+      socket&.close
+    end
+  end
+end

data/lib/del/socket_server.rb

@@ -0,0 +1,17 @@
+module Del
+  class SocketServer
+    def initialize(socket_file:)
+      @connection = SocketConnection.new(path: socket_file)
+    end
+
+    def run(robot)
+      loop do
+        @connection.on_receive do |socket|
+          line = socket.readline
+          Del.logger.debug(line)
+          socket.write(robot.execute(JSON.parse(line)))
+        end
+      end
+    end
+  end
+end

data/lib/del/source.rb

@@ -12,11 +12,11 @@ module Del
     end
 
     def reply(robot, message)
-      robot.send_message(user.jid, message, room: room)
+      robot.send_message(room || user.jid, message)
     end
 
     def to_s
-      "#{user.mention_name}:#{room}:"
+      "#{user.mention_name}#{room ? ":#{room}" : nil}"
     end
   end
 end

data/lib/del/version.rb

@@ -1,3 +1,3 @@
 module Del
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: del
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - mo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-28 00:00:00.000000000 Z
+date: 2018-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,7 @@ files:
 - del.gemspec
 - exe/del
 - lib/del.rb
+- lib/del/cli.rb
 - lib/del/configuration.rb
 - lib/del/connection.rb
 - lib/del/default_router.rb
@@ -107,6 +122,8 @@ files:
 - lib/del/message.rb
 - lib/del/repository.rb
 - lib/del/robot.rb
+- lib/del/socket_connection.rb
+- lib/del/socket_server.rb
 - lib/del/source.rb
 - lib/del/user.rb
 - lib/del/version.rb