repla 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecfb7471869f1ce7c0dcd0cfb3d1902c715daf68
-  data.tar.gz: 1f21628284db84e7fb3fccb80e9fadad4b11a8d8
+  metadata.gz: 57bbe0e7d55bf6e9d44f2c7f069040ac838954bf
+  data.tar.gz: '008ce57baa887b6b42d3087010f4c2e067ec5682'
 SHA512:
-  metadata.gz: bd8adfb40f38eaaa5b347805bd1773e3f5b53443eaa466113fa49857c60abad2b6fbf48c1046d1817cbf06b0f987c6337a649472a5b4c06853b6d32f56d039aa
-  data.tar.gz: 6c2df0aef4ba1fa73ff4c9b4b881384aae9036ad91c75be8f56954a1da93d4cf8e5c1bcb70938a70b19172769055b1f2b47231bdd7ac0c420c2b85adce8e7b11
+  metadata.gz: 917eedbbd7e7595b795a82e87aa21a14777949fbeb5b83af7673830e61719e2bf898af1417473717434629124b7d4b334eee1faa76d04c7e93bf2dc16fe8d5b9
+  data.tar.gz: e81ca1c9530aeec1c0764a647eeeab2135bd14e7498f7659af1aa75bb363a479cb653d425d379eb74eb4651216b1b12ae3cb7bb3bdf33be28f3bb709942ec519

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

@@ -27,7 +27,7 @@ module Repla
       end
 
       def number_of_log_messages
-        @view.do_javascript(TEST_MESSAGE_COUNT_JAVASCRIPT)
+        @view.do_javascript(TEST_MESSAGE_COUNT_JAVASCRIPT).to_i
       end
 
       def last_log_message

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

@@ -1,48 +1,93 @@
 module Repla
   # Test
   module Test
-    MESSAGES = [
+    ERROR_MESSAGES = [
       'Testing log error',
+      'ERROR'
+    ].freeze
+    MESSAGES = [
       'Testing log message',
-      'ERROR',
       'MESSAGE',
       'Done'
     ].freeze
-    CLASSES = %w[
-      error
-      message
-      message
-      message
-      message
-    ].freeze
+    MESSAGE_COUNT = ERROR_MESSAGES.count + MESSAGES.count
     def self.test_log(window)
-      test_message = 'Done'
       test_log_helper = Repla::Test::LogHelper.new(window.window_id)
-      message = nil
+      result = nil
+      expected = MESSAGE_COUNT
       Repla::Test.block_until do
-        message = test_log_helper.last_log_message
-        message == test_message
+        result = test_log_helper.number_of_log_messages
+        result == expected
       end
-      (0..MESSAGES.count).each do |i|
-        result = test_log_helper.log_message_at(i)
-        message = MESSAGES[i]
-        if result != message
-          STDERR.puts "Expected #{message} instead of #{result}"
-          return false
-        end
-        type = CLASSES[i]
-        type_result = test_log_helper.log_class_at(i)
-        if type_result != type
-          STDERR.puts "Expected #{type_result} instead of #{type}"
-          return false
+      error_messages = []
+      messages = []
+      (0...MESSAGE_COUNT).each do |i|
+        message = test_log_helper.log_message_at(i)
+        type = test_log_helper.log_class_at(i)
+        next if message.nil?
+
+        if type == 'error'
+          error_messages.push(message)
+        else
+          messages.push(message)
         end
       end
-      expected = MESSAGES.count
-      result = test_log_helper.number_of_log_messages
       if expected != result
-        STDERR.puts "Expected #{expected} instead of #{result}"
+        STDERR.puts "Expected #{expected} total messages instead of #{result}"
+        STDERR.puts "Messages #{messages}"
+        STDERR.puts "Error messages #{error_messages}"
+        return false
+      end
+      # Buffering issues are causing the output of `TestLog.replaplugin` to be
+      # unreliable, so for now we're running it through `/usr/bin/script`.
+      # Which is reliable, but standard out and standard error get combined.
+      combined_expected = ERROR_MESSAGES + MESSAGES
+      combined_result = error_messages + messages
+      expected = combined_expected.count
+      result = combined_result.count
+      if expected != result
+        STDERR.puts "Expected #{expected} messages instead of #{result}"
+        return false
+      end
+      (0..combined_expected.count).each do |i|
+        expected = combined_expected[i]
+        result = messages[i]
+        next unless expected != result
+
+        STDERR.puts "At index #{i}, expected message #{expected} instead of "\
+          "#{result}"
         return false
       end
+      # expected = MESSAGES.count
+      # result = messages.count
+      # if expected != result
+      #   STDERR.puts "Expected #{expected} messages instead of #{result}"
+      #   return false
+      # end
+      # expected = ERROR_MESSAGES.count
+      # result = error_messages.count
+      # if ERROR_MESSAGES.count != error_messages.count
+      #   STDERR.puts "Expected #{expected} error messages instead of #{result}"
+      #   return false
+      # end
+      # (0..MESSAGES.count).each do |i|
+      #   expected = MESSAGES[i]
+      #   result = messages[i]
+      #   if expected != result
+      #     STDERR.puts "At index #{i}, expected message #{expected} instead "\
+      #       "of #{result}"
+      #     return false
+      #   end
+      # end
+      # (0..ERROR_MESSAGES.count).each do |i|
+      #   expected = ERROR_MESSAGES[i]
+      #   result = error_messages[i]
+      #   if expected != result
+      #     STDERR.puts "At index #{i}, expected error message #{expected} "\
+      #       "instead of #{result}"
+      #     return false
+      #   end
+      # end
       true
     end
   end

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

@@ -65,12 +65,17 @@ class TestLoggerObject < Minitest::Test
 
   def test_logger_object
     # Test Error
+    # This test doesn't call `@logger.error` because `TestLog.replaplugin` had
+    # to be changed being run with `/usr/bin/script` which combines standard
+    # output and standard error.
     message = 'Testing log error'
-    @logger.error(message)
-    message = 'Testing log message'
     @logger.info(message)
+    # @logger.error(message)
     message = Repla::Logger::ERROR_PREFIX.rstrip
     @logger.info(message)
+    # @logger.error(message)
+    message = 'Testing log message'
+    @logger.info(message)
     message = Repla::Logger::MESSAGE_PREFIX.rstrip
     @logger.info(message)
     @logger.info('')

data/lib/repla/test/packages/TestLog.replaplugin/Contents/Info.plist

@@ -5,7 +5,7 @@
 	<key>WCName</key>
 	<string>TestLog</string>
 	<key>WCCommand</key>
-	<string>echo.sh</string>
+	<string>run.sh</string>
 	<key>WCUUID</key>
 	<string>7A95638E-798D-437C-9404-08E7DC68655B</string>
 	<key>WCEditable</key>

data/lib/repla/test/packages/TestLog.replaplugin/Contents/Resources/echo.sh

@@ -4,8 +4,8 @@ set -e
 
 echo 'Testing log error' >&2
 printf "\n" >&2
+echo 'ERROR ' >&2
 echo 'Testing log message'
-echo 'ERROR '
 echo 'MESSAGE '
 echo
 printf "\t"

data/lib/repla/test/packages/TestLog.replaplugin/Contents/Resources/run.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+script_dir="$( cd "$(dirname "$0")" ; pwd -P )"
+echo_path="$script_dir/echo.sh"
+/usr/bin/script -q /dev/null "$echo_path"

data/lib/repla/test.rb

@@ -24,8 +24,9 @@ module Repla
       'http://127.0.0.1:5000/' + filename
     end
 
-    def self.block_until_with_timeout(timeout)
-      cycles = [timeout / POLLING_INTERVAL, 1].max
+    def self.block_until_with_timeout(timeout,
+                                      polling_interval = POLLING_INTERVAL)
+      cycles = [timeout / polling_interval, 1].max
       count = 0
       until yield || count >= cycles
         sleep(POLLING_INTERVAL)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repla
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Roben Kleene
@@ -141,6 +141,7 @@ files:
 - lib/repla/test/packages/TestEnvironment.replaplugin/Contents/Resources/test_environment.rb
 - lib/repla/test/packages/TestLog.replaplugin/Contents/Info.plist
 - lib/repla/test/packages/TestLog.replaplugin/Contents/Resources/echo.sh
+- lib/repla/test/packages/TestLog.replaplugin/Contents/Resources/run.sh
 - lib/repla/test/packages/TestServer.replaplugin/Contents/Info.plist
 - lib/repla/test/packages/TestServer.replaplugin/Contents/Resources/server.sh
 homepage: