simple_speaker 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe50cf1997f06643fc16e295a126956eee13a154
-  data.tar.gz: 0f5eccabfc06fd816ece147aee9b532496f9ced1
+  metadata.gz: 4f5aebea529ae74f706aa3902625a1f88b2f211d
+  data.tar.gz: bdf6b17f18ee9a9e6c3169bc8befbc891d89fc1a
 SHA512:
-  metadata.gz: acacc4a601289306b751512087cae0fee65e6713cf8a78d8f2ba63746e29746455fdda219049e5d13bca77c822a6e731d070de173a5c6dc0a41f9b674dcaf510
-  data.tar.gz: ce1d52b1d1880f62d813935b258c5d6c4f6364649ec00120d35815c3a5f03625700afcbcd17190e7c4746a1ed4110a0bd34c143867c821fa1fa39be93eb65ec5
+  metadata.gz: 1a7b8a4cdcb6d6ec1c2471fab8c7119c9dd0b7f0552d98c0e43d564ca1eb1fc5a6581980d06bbe6a920ee32b24cd1783eb26e5daf7665dbaefef1a83f27bf197
+  data.tar.gz: f7c574ded43bf277808b57cff4a5631c9e9259e22bd55401ed5777e1f0fdbba0d37cddf809216590e62deda1db58341255a9fb4f6522da355bf786cc83ce1d87

data/lib/simple_speaker.rb

@@ -2,25 +2,37 @@ require "simple_speaker/version"
 
 module SimpleSpeaker
   class Speaker
-    def initialize(logger_path = nil, logger_error_path = nil)
+    def initialize(logger_path = nil, logger_error_path = nil, daemon_server = nil, user_input = nil)
       @logger = Logger.new(logger_path) unless logger_path.nil?
       @logger_error = Logger.new(logger_error_path) unless logger_error_path.nil?
+      @daemon = daemon_server
+      @user_input = user_input
     end
 
     def ask_if_needed(question, no_prompt = 0, default = 'y')
       ask_if_needed = default
       if no_prompt.to_i == 0
         self.speak_up(question, 0)
-        ask_if_needed = STDIN.gets.strip
+        if Daemon.is_daemon?
+          wtime = 0
+          while @user_input.nil?
+            sleep 1
+            ask_if_needed = @user_input
+            break if (wtime += 1) > USER_INPUT_TIMEOUT
+          end
+          @user_input = nil
+        else
+          ask_if_needed = STDIN.gets.strip
+        end
       end
       ask_if_needed
     end
 
     def speak_up(str, in_mail = 1)
       puts str
-      $daemon_client.send_data str unless $daemon_client.nil?
+      @daemon.send_data "#{str}\n" unless @daemon.nil?
       @logger.info(str) if @logger
-      $email_msg += str + NEW_LINE if $email_msg && in_mail.to_i > 0
+      Thread.current[:email_msg] += str + NEW_LINE if Thread.current[:email_msg] && in_mail.to_i > 0
       str
     end
 
@@ -30,11 +42,13 @@ module SimpleSpeaker
 
     def tell_error(e, src)
       puts "In #{src}"
+      @daemon.send_data "In #{src}\n" unless @daemon.nil?
       puts e
+      @daemon.send_data "#{e}\n" unless @daemon.nil?
       @logger_error.error("ERROR #{Time.now.utc.to_s} #{src}") if @logger_error
       @logger_error.error(e) if @logger_error
-      $email_msg += "ERROR #{Time.now.utc.to_s} #{src}" + NEW_LINE if $email_msg
-      $email_msg += e.to_s + NEW_LINE if $email_msg
+      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]
     end
   end
 end

data/lib/simple_speaker/version.rb

@@ -1,3 +1,3 @@
 module SimpleSpeaker
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_speaker
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - R
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler