simple_speaker 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36017aba38009246815b8f4612477e21f220b86
-  data.tar.gz: 36af3c996e1a1a430ec51dcb21b0074f062ef41b
+  metadata.gz: a312e6b4c371d820e6d2707184e4c939652dd107
+  data.tar.gz: 6c7997f7dea6d0f4c41cc02afea0d68703775910
 SHA512:
-  metadata.gz: afb0469d51d73f12ca79aebd8e91085f1d73bfe8c6cee88d77858e7ceac43feca3d10f9de13613a57e52456c57d21de5b4abea0d9c6d0e463362f382f196f129
-  data.tar.gz: 1c93984e4b803a838c523f482a5bc3c3898d66445d175146b0dfdc911c41a83995e0e18ab4abea3be35d980d779fcdfe79392a1228b8144d4ec9d410b8c725f8
+  metadata.gz: 5df0066f8eb53d9f5436f884f8e74786e169d65299cee71d636e6ece312b166386cc59ab1436786ffab615e75f4f66bccbae1577f05e2a1e641e63bc4a07131f
+  data.tar.gz: f26e4cdba6ad2065dfcb9b9c9bb038b2a9582d0167d8b1c4eead859750417f23bb27bed3f069397dc3d0e2e97901ecf6a4a47b25d9c3d4eae18c8de0bdd1595e

data/lib/simple_speaker/version.rb

@@ -1,3 +1,3 @@
 module SimpleSpeaker
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/simple_speaker.rb

@@ -9,10 +9,10 @@ module SimpleSpeaker
       @user_input = nil
     end
 
-    def ask_if_needed(question, no_prompt = 0, default = 'y')
+    def ask_if_needed(question, no_prompt = 0, default = 'y', thread = Thread.current)
       ask_if_needed = default
       if no_prompt.to_i == 0
-        self.speak_up(question, 0)
+        self.speak_up(question, 0, thread)
         if Daemon.is_daemon?
           wtime = 0
           while @user_input.nil?
@@ -32,14 +32,18 @@ module SimpleSpeaker
       Thread.current[:current_daemon].send_data "#{str}\n" if Thread.current[:current_daemon]
     end
 
-    def speak_up(str, in_mail = 1)
+    def email_msg_add(str, in_mail, thread)
+      thread[:email_msg] += str + NEW_LINE if thread[:email_msg]
+      if in_mail.to_i > 0
+        thread[:send_email] = in_mail.to_i if thread[:send_email]
+      end
+    end
+
+    def speak_up(str, in_mail = 1, thread = Thread.current)
       puts str
       daemon_send(str)
       @logger.info(str) if @logger
-      Thread.current[:email_msg] += str + NEW_LINE if Thread.current[:email_msg]
-      if in_mail.to_i > 0
-        Thread.current[:send_email] = in_mail.to_i if Thread.current[:send_email]
-      end
+      email_msg_add(str, in_mail, thread)
       str
     end
 
@@ -47,18 +51,15 @@ module SimpleSpeaker
       @logger.info(str) if @logger
     end
 
-    def tell_error(e, src, in_mail = 1)
+    def tell_error(e, src, in_mail = 1, thread = Thread.current)
       puts "In #{src}"
       daemon_send(src)
       puts e
       daemon_send(e)
       @logger_error.error("ERROR #{Time.now.utc.to_s} #{src}") if @logger_error
       @logger_error.error(e) if @logger_error
-      Thread.current[:email_msg] += "ERROR #{Time.now.utc.to_s} #{src}" + NEW_LINE if Thread.current[:email_msg]
-      Thread.current[:email_msg] += e.to_s + NEW_LINE if Thread.current[:email_msg]
-      if in_mail.to_i > 0
-        Thread.current[:send_email] = in_mail.to_i if Thread.current[:send_email]
-      end
+      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)
     end
 
     def user_input(input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_speaker
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - R
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby utilities to push to log files and various output.