sendxmpp 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5d4bb6fb3d967150680d2da594d1e0c332ac427
-  data.tar.gz: f0598f85d0ce9140685bd9ecaef826d57663f254
+  metadata.gz: 727afe5351444d8aeffcce48ffef45ffde53476b
+  data.tar.gz: 437f238d2cf65f544a26b23ca45cc2b0acf8fdce
 SHA512:
-  metadata.gz: da8d0c528714ad2a46092f11f9b7fc50c58976698d60ca11a04e16e678c5f001d0e6ea2ab0b4b6d1f6797c26f38a32d1e6d38ec31755b629707259a40b2e9cdb
-  data.tar.gz: ec18db07f7134c7fb936e48b6a8ac11d012873e6372db00417ce2d19a90d7a633a4f7a104d065641d5162a27edd485d7643eec30b60db72c359257e2a7ac447d
+  metadata.gz: e2ee32f8db58c583ab877e512dda685b12ebef5f750082b9002dd8948f9db76fd53b3d11cb4f0a37813affbf6c0f45f03c93ee422d071766ad1c95a3a243f40f
+  data.tar.gz: c5567d460b9bda1342632de165c16b488cc91ff6647767516955aacf7b8ba71a9b674ef72c48ac71dd68e1e4b989fe6fef0b8e5c95df23d69b8cdd867461b788

data/lib/sendxmpp/cli.rb

@@ -23,7 +23,7 @@ module Sendxmpp
     class_option :resource, default: "Sendxmpp", type: :string, required: false
     class_option :password, default: "", type: :string, required: false
     class_option :message, default: "", type: :string, aliases: '-m', required: false
-    class_option :jid, default: "", type: :string, required: false
+    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
 
@@ -38,15 +38,16 @@ module Sendxmpp
     # Raises ArgumentError if the main hash key was not found
     def initialize(*args)
       super
+      local_conf = options.dup
+      local_conf.delete_if{|k,v|v.nil?||(v.kind_of?(String) && v.empty?)}
+      update_config(local_conf)
       if File.exists?(options[:config])
         conf = IniFile.load(options[:config])["sendxmpp"]
         if conf.nil? || conf.empty?
           raise ArgumentError, "No [sendxmpp] section in ini file found!"
         end
-        local_conf = options.dup
-        local_conf.delete_if{|k,v|v.nil?||(v.kind_of?(String) && v.empty?)}
-        conf.merge!(local_conf)
-        update_config(conf)
+      conf.merge!(local_conf)
+      update_config(conf)
       end
       Log.logger.debug("finished loading configuration.")
       $stdout.sync = true

data/lib/sendxmpp/log.rb

@@ -14,7 +14,7 @@ module Sendxmpp
       else
         super(STDOUT)
       end
-      self.level = config.loglevel.to_i || 2
+      self.level = (config.loglevel.nil?) ? WARN : config.loglevel.to_i
     end
   end
 end

data/lib/sendxmpp/message.rb

@@ -28,24 +28,26 @@ module Sendxmpp
     def initialize
       @batch=false
       if config.jid.nil? || config.jid.empty?
-        raise ArgumentError, <<-RAISE
-        \rJID is not configured. Please use the configuration file or specify the
-        \r-j option.
-        RAISE
+        Log.logger.error("JID is not defined.")
+        Log.logger.error("Please use the -j option or the directive jid=... in .sendxmpprbrc")
+        exit 1
       end
-
       jid = JID.new(config.jid)
       Log.logger.debug("Initializing a new Jabber client instance.")
       self.client = Client.new(jid)
       Log.logger.debug("Initialized a new Jabber client instance.")
-
       Log.logger.debug("Connecting to Jabber server.")
       client.connect(config.server, config.port)
       Log.logger.debug("Connected to Jabber server.")
-
       Log.logger.debug("Authenticating with Jabber server.")
       client.auth(config.password)
       Log.logger.debug("Authenticating with Jabber server.")
+    rescue Jabber::ClientAuthenticationFailure => e
+      Log.logger.error("Authentication error for jid %s" % config.jid)
+      exit 1
+    rescue SocketError => e
+      Log.logger.error("There was an error connecting to the server: %s" % e.message)
+      exit 1
     end
 
     # Public: Singleton object getter
@@ -116,7 +118,8 @@ module Sendxmpp
     def process_batch(&block)
       Log.logger.info("Batch procession started.")
       unless block_given?
-        raise ArgumentError, "Do not use this function without a block"
+        Log.logger.error("Please specify a block to use this function.")
+        exit 1
       end
       @batch=true
       yield

data/lib/sendxmpp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendxmpp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Florian Kasper