anyt 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc9f527d5ead1058291854236f7b011c64df27da0be2559bb27893c1dbb471fc
-  data.tar.gz: 0dce342de8720db9d2208e4fc44c7c1ba3b489c0d82bce7b936152df2c70ccca
+  metadata.gz: 657c46d114ddd104cbfb7ea98fc4196b2a465e4645b8f458e77c6a5508afc0db
+  data.tar.gz: f53b2e08a5a5a091b7dd59ebc327310047c66204261c58a4306f889cb8577665
 SHA512:
-  metadata.gz: 6237b496a2cfb034d4b0d83eff127be84c360a124039bf14c32e4886732f9b9cff9def7e1515168dc87027ca85bcc64b78dfdd4d10988a1e84206b9fc4be7b3a
-  data.tar.gz: 9cd9d41ebdaf1321d13a08685b1955fe92875fb86fda8c4a230b1df9d30e7e39e5564a2614fb1693666a203926770cbdf3d9a0fda7265f3893524baa7cb8f89a
+  metadata.gz: 38b058d39af9ff05aca21f2cad0aecb4c00c795fbd45e65576847170d38c88cd2cdbf7629ec726e52ba6c80e7c688e15dc7543d3b96a39298b9373cc1067888b
+  data.tar.gz: 2df7835db36d97a4a333c525f0d81db7c2ba290d38752c4616105d4c58f5deedfaf08f45c22f37107382155beff2ba63f227a65fe7eee175b3add101bb26188c

data/README.md

@@ -1,7 +1,6 @@
 [![Cult Of Martians](http://cultofmartians.com/assets/badges/badge.svg)](https://cultofmartians.com/tasks/anycable-conformance-tool.html#task)
 [![Gem Version](https://badge.fury.io/rb/anyt.svg)](https://rubygems.org/gems/anyt)
 ![Test](https://github.com/anycable/anyt/workflows/Test/badge.svg)
-[![Gitter](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/anycable/anycablebility)
 
 # AnyCable Conformance Testing Tool
 

data/lib/anyt/cli.rb

@@ -32,7 +32,7 @@ module Anyt
           end
 
           # Load all test scenarios
-          Tests.load_tests
+          Tests.load_tests unless @skip_tests
 
           Rails.application.initialize!
 
@@ -50,8 +50,14 @@ module Anyt
           # Start webosocket server under test
           Command.run
 
-          # Run tests
-          result = Tests.run ? 0 : 1
+          unless @skip_tests
+            # Run tests
+            result = Tests.run ? 0 : 1
+          end
+
+          wait_till_terminated if @only_rails
+        rescue Interrupt => e
+          $stdout.puts "#{e.message}. Good-bye!"
         ensure
           RPC.stop unless @skip_rpc
           Command.stop
@@ -91,16 +97,21 @@ module Anyt
 
             cli.on("--only-rpc", TrueClass, "Run only RPC server") do |flag|
               @only_rpc = flag
+              @skip_tests = true
+            end
+
+            cli.on("--only-rails", TrueClass, "Run only Rails server") do
+              @skip_rpc = true
+              @only_rails = true
+              @skip_tests = true
+
+              configure_rails_command!
             end
 
             cli.on("--self-check", "Run tests again Action Cable itself") do
               @skip_rpc = true
-              dummy_path = ::File.expand_path(
-                "config.ru",
-                ::File.join(::File.dirname(__FILE__), "dummy")
-              )
-              Anyt.config.command = "bundle exec puma #{dummy_path}"
-              Anyt.config.use_action_cable = true
+
+              configure_rails_command!
             end
 
             cli.on("--only test1,test2,test3", Array, "Run only specified tests") do |only_tests|
@@ -149,6 +160,36 @@ module Anyt
         puts "Use `anyt --help` to list all available options."
         exit 1
       end
+
+      def configure_rails_command!
+        dummy_path = ::File.expand_path(
+          "config.ru",
+          ::File.join(::File.dirname(__FILE__), "dummy")
+        )
+        Anyt.config.command = "bundle exec puma #{dummy_path}"
+        Anyt.config.use_action_cable = true
+      end
+
+      def wait_till_terminated
+        self_read = setup_signals
+
+        while readable_io = IO.select([self_read]) # rubocop:disable Lint/AssignmentInCondition
+          signal = readable_io.first[0].gets.strip
+          raise Interrupt, "SIG#{signal} received"
+        end
+      end
+
+      def setup_signals
+        self_read, self_write = IO.pipe
+
+        %w[INT TERM].each do |signal|
+          trap signal do
+            self_write.puts signal
+          end
+        end
+
+        self_read
+      end
     end
   end
 end

data/lib/anyt/command.rb

@@ -11,6 +11,8 @@ module Anyt
       def run
         return if running?
 
+        return unless Anyt.config.command
+
         AnyCable.logger.debug "Running command: #{Anyt.config.command}"
 
         @process = ChildProcess.build(*Anyt.config.command.split(/\s+/))

data/lib/anyt/config.rb

@@ -15,6 +15,9 @@ module Anyt
       wait_command: 2,
       timeout_multiplier: 1
 
+    coerce_types only_tests: {type: :string, array: true}
+    coerce_types except_tests: {type: :string, array: true}
+
     def tests_path
       return unless tests_relative_path
 

data/lib/anyt/dummy/application.rb

@@ -42,6 +42,29 @@ module ApplicationCable
   end
 end
 
+# BenchmarkChannel is useful when running Rails app only or RPC only
+class BenchmarkChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "all#{stream_id}"
+  end
+
+  def echo(data)
+    transmit data
+  end
+
+  def broadcast(data)
+    ActionCable.server.broadcast "all#{stream_id}", data
+    data["action"] = "broadcastResult"
+    transmit data
+  end
+
+  private
+
+  def stream_id
+    params[:id] || ""
+  end
+end
+
 ActionCable.server.config.cable = {"adapter" => "redis"}
 ActionCable.server.config.connection_class = -> { ApplicationCable::Connection }
 ActionCable.server.config.disable_request_forgery_protection = true

data/lib/anyt/ext/minitest.rb

@@ -12,9 +12,9 @@ module Anyt
       base.after { @clients&.each { |client| client.close(allow_messages: true) } }
     end
 
-    def build_client(*args)
+    def build_client(**args)
       @clients ||= []
-      Anyt::Client.new(*args).tap do |client|
+      Anyt::Client.new(**args).tap do |client|
         @clients << client
       end
     end

data/lib/anyt/rpc.rb

@@ -19,10 +19,9 @@ module Anyt # :nodoc:
 
         AnyCable.server_callbacks.each(&:call)
 
-        @server = AnyCable::Server.new(
+        @server = AnyCable::GRPC::Server.new(
           host: AnyCable.config.rpc_host,
-          **AnyCable.config.to_grpc_params,
-          interceptors: AnyCable.middleware.to_a
+          **AnyCable.config.to_grpc_params
         )
 
         AnyCable.middleware.freeze

data/lib/anyt/tests/features/channel_state_test.rb

@@ -13,18 +13,20 @@ feature "Channel state" do
 
     def tick
       self.count += 2
-      transmit(count: count, name: user[:name])
+      transmit({count: count, name: user[:name]})
     end
 
     def unsubscribed
-      ActionCable.server.broadcast("state_counts", data: "user left: #{user[:name]}")
+      return unless params["notify_disconnect"]
+
+      ActionCable.server.broadcast("state_counts", {data: "user left: #{user[:name]}"})
     end
   end
 
   let(:identifier) { {channel: channel, name: "chipolino"}.to_json }
 
   let(:client2) { build_client(ignore: %w[ping welcome]) }
-  let(:identifier2) { {channel: channel, name: "chipollone"}.to_json }
+  let(:identifier2) { {channel: channel, name: "chipollone", notify_disconnect: true}.to_json }
 
   before do
     subscribe_request = {command: "subscribe", identifier: identifier}
@@ -67,13 +69,13 @@ feature "Channel state" do
 
     assert_equal ack, client2.receive
 
-    client.close
+    client2.close
 
     msg = {
-      "identifier" => identifier2,
-      "message" => {"data" => "user left: chipolino"}
+      "identifier" => identifier,
+      "message" => {"data" => "user left: chipollone"}
     }
 
-    assert_equal msg, client2.receive
+    assert_equal msg, client.receive
   end
 end

data/lib/anyt/tests/features/remote_disconnect_test.rb

@@ -12,6 +12,9 @@ feature "Remote disconnect" do
     client = build_client(qs: "test=uid&uid=26", ignore: %w[ping])
     assert_equal client.receive, "type" => "welcome"
 
+    # Prevent race conditions when we send disconnect before internal channel subscription has been made
+    # (only for Action Cable)
+    sleep 1
     ActionCable.server.remote_connections.where(uid: "26").disconnect
 
     # Waiting for https://github.com/rails/rails/pull/39544

data/lib/anyt/tests/request/disconnection_test.rb

@@ -7,7 +7,7 @@ feature "Request" do
     end
 
     def unsubscribed
-      ActionCable.server.broadcast("request_a", data: "user left")
+      ActionCable.server.broadcast("request_a", {data: "user left"})
     end
   end
 
@@ -17,7 +17,7 @@ feature "Request" do
     end
 
     def unsubscribed
-      ActionCable.server.broadcast("request_b", data: "user left")
+      ActionCable.server.broadcast("request_b", {data: "user left"})
     end
   end
 
@@ -27,7 +27,7 @@ feature "Request" do
     end
 
     def unsubscribed
-      ActionCable.server.broadcast("request_c", data: "user left#{params[:id].presence}")
+      ActionCable.server.broadcast("request_c", {data: "user left#{params[:id].presence}"})
     end
   end
 

data/lib/anyt/tests/streams/broadcast_test.rb

@@ -24,7 +24,7 @@ feature "Broadcast data to stream" do
   ) do
     ActionCable.server.broadcast(
       "a",
-      data: {user_id: 1, status: "left", meta: {connection_time: "10s"}}
+      {data: {user_id: 1, status: "left", meta: {connection_time: "10s"}}}
     )
 
     msg = {

data/lib/anyt/tests/streams/multiple_clients_test.rb

@@ -26,7 +26,7 @@ feature "Streams with many clients" do
   scenario %(
     Multiple clients receive messages from stream
   ) do
-    ActionCable.server.broadcast("a", data: "X")
+    ActionCable.server.broadcast("a", {data: "X"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
@@ -37,7 +37,7 @@ feature "Streams with many clients" do
   scenario %(
     Client receive messages when another client removes subscription
   ) do
-    ActionCable.server.broadcast("a", data: "X")
+    ActionCable.server.broadcast("a", {data: "X"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
@@ -51,7 +51,7 @@ feature "Streams with many clients" do
     # ActionCable doesn't provide an unsubscription ack :(
     sleep 1
 
-    ActionCable.server.broadcast("a", data: "Y")
+    ActionCable.server.broadcast("a", {data: "Y"})
 
     msg2 = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Y"}}
 

data/lib/anyt/tests/streams/multiple_test.rb

@@ -23,13 +23,13 @@ feature "Multiple streams" do
   scenario %(
     Client receives messages from both streams
   ) do
-    ActionCable.server.broadcast("a", data: "X")
+    ActionCable.server.broadcast("a", {data: "X"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
     assert_equal msg, client.receive
 
-    ActionCable.server.broadcast("b", data: "Y")
+    ActionCable.server.broadcast("b", {data: "Y"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Y"}}
 
@@ -39,7 +39,7 @@ feature "Multiple streams" do
   scenario %(
     Client does not receive messages from any stream after removing subscription
   ) do
-    ActionCable.server.broadcast("a", data: "X")
+    ActionCable.server.broadcast("a", {data: "X"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
@@ -52,8 +52,8 @@ feature "Multiple streams" do
     # ActionCable doesn't provide an unsubscription ack :(
     sleep 1
 
-    ActionCable.server.broadcast("a", data: "Y")
-    ActionCable.server.broadcast("b", data: "Z")
+    ActionCable.server.broadcast("a", {data: "Y"})
+    ActionCable.server.broadcast("b", {data: "Z"})
 
     assert_raises(Anyt::Client::TimeoutError) { client.receive(timeout: 0.5) }
   end

data/lib/anyt/tests/streams/single_test.rb

@@ -22,13 +22,13 @@ feature "Single stream" do
   scenario %(
     Client receives messages from the stream
   ) do
-    ActionCable.server.broadcast("a", data: "X")
+    ActionCable.server.broadcast("a", {data: "X"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
     assert_equal msg, client.receive
 
-    ActionCable.server.broadcast("a", data: "Y")
+    ActionCable.server.broadcast("a", {data: "Y"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Y"}}
 
@@ -38,7 +38,7 @@ feature "Single stream" do
   scenario %(
     Client does not receive messages from the stream after removing subscription
   ) do
-    ActionCable.server.broadcast("a", data: "X")
+    ActionCable.server.broadcast("a", {data: "X"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
@@ -51,7 +51,7 @@ feature "Single stream" do
     # ActionCable doesn't provide an unsubscription ack :(
     sleep 1
 
-    ActionCable.server.broadcast("a", data: "Y")
+    ActionCable.server.broadcast("a", {data: "Y"})
 
     assert_raises(Anyt::Client::TimeoutError) { client.receive(timeout: 0.5) }
   end
@@ -70,7 +70,7 @@ feature "Single stream" do
 
     assert_equal ack, client.receive
 
-    ActionCable.server.broadcast("a", data: "XX")
+    ActionCable.server.broadcast("a", {data: "XX"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "XX"}}
     msg2 = {"identifier" => {channel: channel, some_param: "test"}.to_json, "message" => {"data" => "XX"}}

data/lib/anyt/tests/streams/stop_test.rb

@@ -8,7 +8,7 @@ feature "Stop streams" do
     end
 
     def ping(data)
-      ActionCable.server.broadcast data["name"], reply: "pong"
+      ActionCable.server.broadcast data["name"], {reply: "pong"}
     end
 
     def unfollow(data)
@@ -33,7 +33,7 @@ feature "Stop streams" do
   ) do
     skip if Anyt.config.use_action_cable && (::ActionCable::VERSION::MAJOR < 6 || ::ActionCable::VERSION::MINOR < 1)
 
-    ActionCable.server.broadcast("a", data: "X")
+    ActionCable.server.broadcast("a", {data: "X"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
@@ -47,9 +47,9 @@ feature "Stop streams" do
     client.send(perform_request)
     sleep 0.2 # give some time to commit unsubscribe
 
-    ActionCable.server.broadcast("a", data: "Y")
+    ActionCable.server.broadcast("a", {data: "Y"})
     sleep 0.2 # "a" should be broadcasted first
-    ActionCable.server.broadcast("b", data: "Z")
+    ActionCable.server.broadcast("b", {data: "Z"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Z"}}
     assert_equal msg, client.receive

data/lib/anyt/tests/subscriptions/perform_test.rb

@@ -10,7 +10,7 @@ feature "Subscription perform methods" do
     end
 
     def echo(data)
-      transmit(response: data["text"])
+      transmit({response: data["text"]})
     end
   end
 

data/lib/anyt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyt
-  VERSION = "1.0.2"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyt
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.2
 platform: ruby
 authors:
 - palkan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -58,28 +58,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: anyway_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: anycable-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.99
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.99
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +263,7 @@ homepage: http://github.com/anycable/anyt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,8 +278,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Anycable conformance testing tool
 test_files: []