repla 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc5ea00c4045bb8df6ebcbeefbe1a54905be15c
-  data.tar.gz: 9a4875dbab09f1b149051eec2454a1d9ee73ec20
+  metadata.gz: 71286d9be60c5f021154d6c3f947a920507cb3e9
+  data.tar.gz: 15d263e2d2d59eb1dc61d1000c0ba639d948d850
 SHA512:
-  metadata.gz: f905eed133394f281173023f31ad3a3819d5193a52b7d989e15e4dfe9133128daacc85c6b184094508326a4fdc72fe31e453ea008150de16358522558ca60200
-  data.tar.gz: 58834673b618dffd99d320dfa280819e164393d2cea849b24cd4778712eee6a8585f0bea372d8e7bbf52b6834e8c14833e8ce8eba35bea7aacfd5a3167f3e08d
+  metadata.gz: ad06997ab931d826250fb37a7919a5b363321abb1eb6b701cb40f6f1b8fc82f6459bed747e76b64c4744e1795439a3b1bf887fffa1cf9d0f33dc9883c3c58493
+  data.tar.gz: fd5dd84d1481fb86843c0944909dae0e413c74291e647da9f057b6bff1b9a3debd9f97441bb4144ebaa8f9759ccac288d0bdd43f2f404af67542ec3a65bf6671

data/lib/repla/logger/test/run_tests.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cd "$(dirname "$0")"
 

data/lib/repla/logger/test/tc_logger.rb

@@ -30,15 +30,18 @@ class TestUnintializedLogger < Minitest::Test
     # Test Message
     message = 'Testing log message'
     @logger.info(message)
-    sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
-
-    # Make sure the log messages before accessing the logger's `view_id` and
-    # `window_id` because those run the logger. This test should test logging a
-    # message and running the logger itself simultaneously. This is why the
-    # `LogHelper` is intialized after logging the message.
+    # Make sure the log messages appear before accessing the logger's `view_id`
+    # and `window_id` because those run the logger. This test should test
+    # logging a message and running the logger itself simultaneously. This is
+    # why the `LogHelper` is intialized after logging the message.
     test_log_helper = Repla::Test::LogHelper.new(@logger.window_id,
                                                  @logger.view_id)
-    test_message = test_log_helper.last_log_message
+    test_message = nil
+    Repla::Test.block_until do
+      test_message = test_log_helper.last_log_message
+      test_message == message
+    end
+
     assert_equal(message, test_message, 'The messages should match')
     test_class = test_log_helper.last_log_class
     assert_equal('message', test_class, 'The classes should match')
@@ -65,8 +68,11 @@ class TestLogger < Minitest::Test
     # Test Error
     message = 'Testing log error'
     @logger.error(message)
-    sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
-    test_message = @test_log_helper.last_log_message
+    test_message = nil
+    Repla::Test.block_until do
+      test_message = @test_log_helper.last_log_message
+      message == test_message
+    end
     assert_equal(message, test_message)
     test_class = @test_log_helper.last_log_class
     assert_equal('error', test_class)
@@ -77,8 +83,11 @@ class TestLogger < Minitest::Test
     # Test Message
     message = 'Testing log message'
     @logger.info(message)
-    sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
-    test_message = @test_log_helper.last_log_message
+    test_message = nil
+    Repla::Test.block_until do
+      test_message = @test_log_helper.last_log_message
+      message == test_message
+    end
     assert_equal(message, test_message)
     test_class = @test_log_helper.last_log_class
     assert_equal('message', test_class)
@@ -90,8 +99,11 @@ class TestLogger < Minitest::Test
     # Note the trailing whitespace is trimmed
     message = Repla::Logger::ERROR_PREFIX.rstrip
     @logger.info(message)
-    sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
-    test_message = @test_log_helper.last_log_message
+    test_message = nil
+    Repla::Test.block_until do
+      test_message = @test_log_helper.last_log_message
+      message == test_message
+    end
     assert_equal(message, test_message)
     test_class = @test_log_helper.last_log_class
     assert_equal('message', test_class)
@@ -103,8 +115,11 @@ class TestLogger < Minitest::Test
     # Note the trailing whitespace is trimmed
     message = Repla::Logger::MESSAGE_PREFIX.rstrip
     @logger.info(message)
-    sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
-    test_message = @test_log_helper.last_log_message
+    test_message = nil
+    Repla::Test.block_until do
+      test_message = @test_log_helper.last_log_message
+      message == test_message
+    end
     assert_equal(message, test_message)
     test_class = @test_log_helper.last_log_class
     assert_equal('message', test_class)
@@ -112,16 +127,11 @@ class TestLogger < Minitest::Test
     test_count += 1
     assert_equal(test_count, result_count)
 
-    # Test Blank Spaces
-    @logger.info("  \t")
-    sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
-    test_message = @test_log_helper.last_log_message
-    assert_equal(message, test_message)
-    test_class = @test_log_helper.last_log_class
-    assert_equal('message', test_class)
-
-    # Test Empty String
+    # Test empty string is ignored
+    # Test blank space is ignored
+    # Note this uses the same `message` from the last test
     @logger.info('')
+    @logger.info("  \t")
     sleep Repla::Test::TEST_PAUSE_TIME # Pause for output to be processed
     test_message = @test_log_helper.last_log_message
     assert_equal(message, test_message)
@@ -154,12 +164,16 @@ Line 1
 Line 2
 Line 3
 '
+    lines = 3
     @logger.info(message)
-    sleep Repla::Test::TEST_PAUSE_TIME * 2 # Pause for output to be processed
-    result_count = @test_log_helper.number_of_log_messages
-    assert_equal(result_count, 3, 'The number of log messages should match')
+    result_count = nil
+    Repla::Test.block_until do
+      result_count = @test_log_helper.number_of_log_messages
+      result_count == lines
+    end
+    assert_equal(result_count, lines)
 
-    (1..3).each do |i|
+    (1..lines).each do |i|
       result = @test_log_helper.log_message_at_index(i - 1)
       test_result = "Line #{i}"
       assert_equal(result,
@@ -168,3 +182,45 @@ Line 3
     end
   end
 end
+
+# Test logger threads
+class TestLoggerThreads < Minitest::Test
+  def setup
+    @logger = Repla::Logger.new
+    @logger.show
+  end
+
+  def teardown
+    window = Repla::Window.new(@logger.window_id)
+    window.close
+  end
+
+  def test_multiple_threads
+    error_text = 'Error line'
+    message_text = 'Info line'
+    message_called = false
+    message_thread = Thread.new do
+      @logger.info(message_text)
+      message_called = true
+    end
+
+    error_called = false
+    error_thread = Thread.new do
+      @logger.error(error_text)
+      error_called = true
+    end
+
+    message_thread.join
+    error_thread.join
+
+    assert(error_called)
+    assert(message_called)
+    @test_log_helper = Repla::Test::LogHelper.new(@logger.window_id,
+                                                  @logger.view_id)
+    Repla::Test.block_until { @test_log_helper.number_of_log_messages >= 2 }
+    result = @test_log_helper.last_log_message
+    result_two = @test_log_helper.log_message_at_index(0)
+    assert(result == message_text || result_two == message_text)
+    assert(result == error_text || result_two == error_text)
+  end
+end

data/lib/repla/logger.rb

@@ -7,6 +7,9 @@ module Repla
     ERROR_PREFIX = 'ERROR '.freeze
     LOG_PLUGIN_NAME = 'Log'.freeze
 
+    def initialize
+      @mutex = Mutex.new
+    end
     # Toggle
 
     SHOW_LOG_SCRIPT = File.join(APPLESCRIPT_DIRECTORY, 'show_log.scpt')
@@ -48,12 +51,16 @@ module Repla
     end
 
     def view_id
-      @view_id ||= Repla.split_id_in_window(window_id, LOG_PLUGIN_NAME)
-      return @view_id unless @view_id.nil?
+      view_id = nil
+      @mutex.synchronize do
+        @view_id ||= Repla.split_id_in_window(window_id, LOG_PLUGIN_NAME)
+        return @view_id unless @view_id.nil?
 
-      @view_id = Repla.split_id_in_window_last(window_id)
-      Repla.run_plugin_in_split(LOG_PLUGIN_NAME, window_id, @view_id)
-      @view_id
+        @view_id = Repla.split_id_in_window_last(window_id)
+        Repla.run_plugin_in_split(LOG_PLUGIN_NAME, window_id, @view_id)
+        view_id = @view_id
+      end
+      view_id
     end
 
     private

data/lib/repla/test/bundles/Cat.replabundle/Contents/Resources/cat.sh

@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 
-cat
+cat

data/lib/repla/test/bundles/FileExtension.replabundle/Contents/Resources/cat.sh

@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 
-cat
+cat

data/lib/repla/test/bundles/PromptInterrupt.replabundle/Contents/Resources/cat.sh

@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 
-cat
+cat

data/lib/repla/test/bundles/TestServer.replabundle/Contents/Resources/server.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 

data/lib/repla/test.rb

@@ -3,6 +3,8 @@ module Repla
   module Test
     # General
     TEST_PAUSE_TIME = 2.00
+    TEST_TIMEOUT_TIME = 4.00
+    POLLING_INTERVAL = 0.5
 
     # Ruby
     REPLA_FILE = File.join(File.dirname(__FILE__), '../repla')
@@ -22,6 +24,19 @@ module Repla
       'http://127.0.0.1:5000/' + filename
     end
 
+    def self.block_until_with_timeout(timeout)
+      cycles = [timeout / POLLING_INTERVAL, 1].max
+      count = 0
+      until yield || count >= cycles
+        sleep(POLLING_INTERVAL)
+        count += 1
+      end
+    end
+
+    def self.block_until(&block)
+      block_until_with_timeout(TEST_TIMEOUT_TIME, &block)
+    end
+
     # HTML
     TEST_HTML_DIRECTORY = File.join(TEST_DIRECTORY, 'html')
     INDEX_HTML_FILENAME = 'index.html'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repla
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Roben Kleene