Commit c880db7
Changed files (4)
lib/del/cli.rb
@@ -42,7 +42,8 @@ module Del
desc 'message <jid> <message>', 'send a message to the Jabber ID'
def message(jid, message)
- SendMessage.new(self).run(jid, message)
+ SendMessage.new(self, socket_file: options[:socket_file])
+ .run(jid, message)
end
desc 'setup', 'setup your $HOME/.delrc'
lib/del/connection.rb
@@ -26,7 +26,7 @@ module Del
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)
+ user = configuration.users.find(message.from.strip)
robot.receive(message.body, source: Source.new(user: user))
end
client.send(Jabber::Presence.new(:chat))
lib/del/send_message.rb
@@ -2,20 +2,20 @@
module Del
class SendMessage
- def initialize(shell)
+ def initialize(shell, socket_file:)
@shell = shell
+ @socket = SocketMessage.new(@shell, socket_file: socket_file)
end
def run(jid, message)
- socket = SocketMessage.new(@shell)
- socket.deliver(
+ @socket.deliver(
command: :send_message,
jid: jid,
message: message
)
- @shell.say(socket.listen, :green)
+ @shell.say(@socket.listen, :green)
ensure
- socket.close
+ @socket.close
end
end
end
lib/del/socket_message.rb
@@ -2,8 +2,9 @@
module Del
class SocketMessage
- def initialize(shell)
+ def initialize(shell, socket_file:)
@shell = shell
+ @socket_file = socket_file
end
def deliver(payload)
@@ -30,7 +31,7 @@ module Del
end
def socket
- @socket ||= UNIXSocket.new(options[:socket_file])
+ @socket ||= UNIXSocket.new(@socket_file)
end
end
end