simple_speaker 0.2.9.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 782a4e5359bbef20b70bb6a565e5e76b4c453fc2
-  data.tar.gz: ebfcac0e134fe61102ae90c9e58b059b0e23affe
+  metadata.gz: 4b501b9270b8c32c3a62e3c33d7deb1f0ace4768
+  data.tar.gz: 9b3c7daa1a52b14834e1889b278d389ad8c8a877
 SHA512:
-  metadata.gz: b699b6880b9c02614a43fe94244de227a33d7baf7e34c9725d26b56209fe9d83285b6df2d9fbc0e30d7aeac41e5ecd8a6c89ab50fc1a8109659fb1196f05c8b9
-  data.tar.gz: b5a7903e62acea7fd8fd393406ba3825cf19432701027b6300c869666e70dd6a4e60bf01bcd9e1798dc0bd085e41cff1322000013e64ca654bb2c3231b76c15c
+  metadata.gz: d14a21a6a006211fd5cc04220dc0b4911d73139136cb169e7d594db2542d0cef8c8fca8759f8c41502be2e667a3921fff347990393f1ef777e1a23303c7a7001
+  data.tar.gz: dd365ebd0d42a9c5665e217a2920ba5a440920df1e88682643d556090a233c7991c8ac7af18bc192da9817aadd09337a89e2fe706e103dd3e3d8a0b8a4304668

data/lib/simple_speaker/version.rb

@@ -1,3 +1,3 @@
 module SimpleSpeaker
-  VERSION = "0.2.9.2"
+  VERSION = "0.3.0"
 end

data/lib/simple_speaker.rb

@@ -31,7 +31,11 @@ module SimpleSpeaker
     end
 
     def daemon_send(str)
-      Thread.current[:current_daemon].send_data "#{str}\n" if Thread.current[:current_daemon]
+      if Thread.current[:current_daemon]
+        Thread.current[:current_daemon].send_data "#{str}\n"
+      else
+        puts str
+      end
     end
 
     def email_msg_add(str, in_mail, thread)
@@ -43,23 +47,28 @@ module SimpleSpeaker
     end
 
     def speak_up(str, in_mail = 1, thread = Thread.current)
-      puts str
-      daemon_send(str)
-      @logger.info("#{'[' + thread[:object].to_s + ']' if thread[:object].to_s != ''}#{str}") if @logger
-      email_msg_add(str, in_mail, thread)
+      if thread[:parent]
+        thread[:log_msg] = '' if thread[:log_msg].nil?
+        thread[:log_msg] << str + @new_line
+      else
+        str.each_line do |l|
+          daemon_send(l)
+          log("#{'[' + thread[:object].to_s + ']' if thread[:object].to_s != ''}#{l}")
+        end
+      end
+      email_msg_add(str, in_mail, thread) if in_mail.to_i >= 0
       str
     end
 
-    def log(str)
+    def log(str, error = 0)
       @logger.info(str) if @logger
+      @logger_error.error(str) if @logger_error && error.to_i > 0
     end
 
     def tell_error(e, src, in_mail = 1, thread = Thread.current)
-      puts "In #{src}"
-      daemon_send(src)
-      puts e
+      daemon_send("In #{src}")
       daemon_send(e)
-      @logger_error.error("#{'[' + thread[:object].to_s + ']' if thread[:object].to_s != ''}ERROR #{Time.now.utc.to_s} #{src}") if @logger_error
+      log("#{'[' + thread[:object].to_s + ']' if thread[:object].to_s != ''}ERROR #{src}", 1)
       @logger_error.error("#{'[' + thread[:object].to_s + ']' if thread[:object].to_s != ''}#{e}") if @logger_error
       email_msg_add("ERROR #{Time.now.utc.to_s} #{src}" + @new_line, in_mail, thread)
       email_msg_add(e.to_s + @new_line, in_mail, thread)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_speaker
 version: !ruby/object:Gem::Version
-  version: 0.2.9.2
+  version: 0.3.0
 platform: ruby
 authors:
 - R
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler