sendxmpp 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc050e0b5313028144349aee744b9e141529a79
-  data.tar.gz: fdf58b28ed0f48c920d37f0047b38338a35879e2
+  metadata.gz: dace202f420d76b23bd6a0ae781ec756315f3a9a
+  data.tar.gz: 78d823036bd6713d0b700bc8fedff36d3002b791
 SHA512:
-  metadata.gz: 8d873583af32693c81bf2360999174b03345523f222fd0f1c31cb1731366fb3aa89451f1dce98a48292d4659cd2a95d92d87c6e8c07ecc43e09a871b2193e1c1
-  data.tar.gz: 9f28f0b8beaa4c656cc97b27a01b37a705f55da2933a9895f8a6da1ae389c6d703b82b9fe26e35288820b66dd5f8b337d7fbaaeba91eaef47be94f63b603b5f2
+  metadata.gz: 4dd3c0f7310d67652f4ee8174dc4b8252f2f6153a29a57aeb159621236477ffa3e11bd3d4f84e4a8c990dcc33e6ff06e498513f41be9d148bd6491f94f69b65b
+  data.tar.gz: 738b4619e1043f1b256c676f5eb37775e5b52d6e3c2604be52db6048cbb8e31b9f5467fc74dff6019505991d4eaf9dc608ae7133a066ae38001a631605d1fbd2

data/lib/sendxmpp/cli.rb

@@ -26,6 +26,7 @@ module Sendxmpp
     class_option :jid, default: "", type: :string, required: false, aliases: '-j'
     class_option :config, default: "#{ENV['HOME']}/.sendxmpprbrc", type: :string, aliases: "-c", required: false
     class_option :logfile, default: nil, aliases: '-l', required: false
+    class_option :subject, default: nil, type: :string, required: false
 
 
     # Public: Initialize a new Object from CLI
@@ -59,9 +60,13 @@ module Sendxmpp
     # jids - Receipient(s) can be one or more
     #
     # Examples
+    #
+    #   sendxmpp user mosny@jabber.org -m "test"
+    #   echo "test" | sendxmpp user mosny@jabber.org
+    #   sendxmpp user mosny@jabber.org < /var/log/system.log
+    #
     #   user(["mosny@jabber.org"])
     #   user(["mosny@jabber.org", "someone@jabber.org"])
-    #   ...
     #
     # Returns 0 or 1 exit codes
     def user(*jids)
@@ -72,11 +77,7 @@ module Sendxmpp
         raise ArgumentError, "Jids needs to be an Array got #{jids.class}"
       end
 
-      if config.message.empty?
-        Log.logger.error("No message to send. Exiting.")
-        Log.logger.error("See https://github.com/nirnanaaa/sendxmpprb/wiki/Sending-messages for available message formats.")
-        exit 1
-      end
+      check_messagequeue
 
       Message.batch do
         jids.each do |jid|
@@ -92,6 +93,11 @@ module Sendxmpp
     # jids - Array of MUC(Multi user chat) jids.
     #
     # Examples
+    #
+    #   sendxmpp chat edv@conference.jabber.org -m "test"
+    #   echo "test" | sendxmpp chat edv@conference.jabber.org:password
+    #   sendxmpp chat edv@conference.jabber.org < /var/log/system.log
+    #
     #   chat(["edv@conference.jabber.org"])
     #   chat(["edv@conference.jabber.org", "staff@conference.jabber.org"])
     #
@@ -104,11 +110,7 @@ module Sendxmpp
         raise ArgumentError, "Jids needs to be an Array got #{jids.class}"
       end
 
-      if config.message.empty?
-        Log.logger.error("No message to send. Exiting.")
-        Log.logger.error("See https://github.com/nirnanaaa/sendxmpprb/wiki/Sending-messages for available message formats.")
-        exit 1
-      end
+      check_messagequeue
 
       Message.batch do
         jids.each do |jid|
@@ -116,14 +118,83 @@ module Sendxmpp
         end
       end
 
+    end
+
+    desc "fromconf", "Read the receipients from configuration file"
+    # Public: Will read the receipients from configuration file and send the message to the users
+    #
+    # Examples
+    #   sendxmpp fromconf -m "test"
+    #   echo "test" |sendxmpp fromconf
+    #   sendxmpp fromconf < /var/log/system.log
+    #
+    # Returns an exit code 0 or 1
+    def fromconf
+      Log.logger.debug("Received call for fromconf method")
+      if !config.receipients
+        Log.logger.error("No receipient(s) specified.")
+        Log.logger.error("Please read https://github.com/nirnanaaa/sendxmpprb/wiki/Configuration on how to specify receipients.")
+        exit 1
+      end
+      fetch_stdin
+      check_messagequeue
+      users, muc = parse_receipients
+      Message.batch do 
+        users.each do |jid|
+          Message.message_to_user(jid)
+        end
+        muc.each do |jid|
+          Message.message_to_room(jid)
+        end
+      end
+
     end
     no_commands do
+
+      # Public: Check for presence of a message. The message is needed, because otherwise
+      #         there would be nothing to do.
+      #
+      # Exits on failure
+      def check_messagequeue
+        if !config.message
+          Log.logger.error("No message to send. Exiting.")
+          Log.logger.error("See https://github.com/nirnanaaa/sendxmpprb/wiki/Sending-messages for available message formats.")
+          exit 1
+        end
+      end
+
+      # Public: read receipients from configuration
+      #
+      # Returns an array of types
+      def parse_receipients
+        types = [[],[]]
+        config.receipients.split(",").each do |r|
+          type, jid = r.split("->")
+          type == "muc" ? types.last << jid : types.first << jid
+        end
+        types
+      end
+
+      # Public: Fetch stdin input
+      #
+      # Before reading, stdin will be checked for presence.
+      #
+      # THIS METHOD ONLY WORKS ON UNIX BASED SYSTEMS, AS FCNTL
+      # IS NOT AVAILABLE ON WINDOWS
+      #
+      # Returns nothing
       def fetch_stdin
+        require 'fcntl'
         if !config.message
           Log.logger.info("messages empty. using stdin")
-          while $stdin.gets
-            config.message ||= ""
-            config.message << $_
+          if STDIN.fcntl(Fcntl::F_GETFL, 0) == 0
+            Log.logger.info("stdin not empty. Reading from it")
+            while $stdin.gets
+              config.message ||= ""
+              config.message << $_
+            end
+          else
+            return
           end
         end
       end

data/lib/sendxmpp/message.rb

@@ -102,10 +102,10 @@ module Sendxmpp
         receipients << options
       else
         if options[:type] == :user
-          send_message(config.message, options[:user])
+          send_message(options[:user])
         else
           group, password = split_password(options[:user])
-          send_muc_message(config.message, group, password)
+          send_muc_message(group, password)
         end
       end
     end
@@ -134,7 +134,7 @@ module Sendxmpp
     # Returns nothing
     def send_message(user)
       Log.logger.debug("sending message to user %s" % user)
-      m = Jabber::Message.new(user, config.message)
+      m = Jabber::Message.new(user, generate_message)
       client.send(m)
       Log.logger.debug("sent message")
     end
@@ -148,7 +148,7 @@ module Sendxmpp
     def send_muc_message(room, password=nil)
       Log.logger.debug("including file xmpp4r/muc")
       require 'xmpp4r/muc'
-      m = Jabber::Message.new(room, config.message)
+      m = Jabber::Message.new(room, generate_message)
       muc = MUC::MUCClient.new(client)
       if !muc.active?
         Log.logger.info("Joining room %s" % room)
@@ -156,6 +156,9 @@ module Sendxmpp
         Log.logger.info("Joined room %s" % room)
       end
       muc.send m
+    rescue Jabber::ServerError => e
+      Log.logger.error("There was an error sending this message to room %s:" % room)
+      Log.logger.error(e.message)
     end
 
     # Public: Send the batch out
@@ -171,5 +174,26 @@ module Sendxmpp
         receipients.delete(rcpt)
       end
     end
+
+    private
+
+    # Private: Generates a message for sending. Combines subject and message
+    #
+    # Returns the message string
+    def generate_message
+      if config.subject
+        msg = ""
+        msg << "\n"
+        msg << "-----------------------------------------\n"
+        msg << "New Message:\n"
+        msg << "%s\n" % config.subject
+        msg << config.message
+        msg << "\n-----------------------------------------\n"
+        msg
+      else
+        config.message
+      end
+
+    end
   end
 end

data/lib/sendxmpp/version.rb

@@ -1,5 +1,5 @@
   module Sendxmpp
 
     # Public: version number
-    VERSION="0.0.4"
+    VERSION="0.1.0"
   end

data/settings.ini.sample

@@ -20,6 +20,13 @@ jid=bla@jabberdomain.example.com
 # Default: 5222
 # port=5222
 
+# Default receipients. This is used if you do not want to specify them via commandline
+# Default: nil
+# Comma seperated list of receipients
+# receipients=muc->muc@jabber.org:password,\
+# user->bla@jabberdomain.example.com,\
+# muc->muc2@conference.example.com
+
 # Server to send messages over. If no server is provided DNS SRV record from jid will be used
 # Default: ""
 # server=jabber.org

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendxmpp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Florian Kasper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor