anyt 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc9f527d5ead1058291854236f7b011c64df27da0be2559bb27893c1dbb471fc
-  data.tar.gz: 0dce342de8720db9d2208e4fc44c7c1ba3b489c0d82bce7b936152df2c70ccca
+  metadata.gz: 42cd66b2a05dcf5d46c060a2a9540c26368fe003f86febfb94c8104a3ccfacc9
+  data.tar.gz: e1f8c0cbe88a223d9383f8467e44f75f05ad6d1718c309d19f7d90a102b7f9ad
 SHA512:
-  metadata.gz: 6237b496a2cfb034d4b0d83eff127be84c360a124039bf14c32e4886732f9b9cff9def7e1515168dc87027ca85bcc64b78dfdd4d10988a1e84206b9fc4be7b3a
-  data.tar.gz: 9cd9d41ebdaf1321d13a08685b1955fe92875fb86fda8c4a230b1df9d30e7e39e5564a2614fb1693666a203926770cbdf3d9a0fda7265f3893524baa7cb8f89a
+  metadata.gz: 86714f4bfbddf5242491bb371b714becfaffd3353fe275f8badb3839731bcdcfc66b96d2188d9fe4089ca612234edd72243c13c0e0263932337df5758a19eaa9
+  data.tar.gz: b3b2af67d98a2542ba05912694f76b052d5a51b4bb3d84159af45aece063faf03242f46065687e765268395fef52d607a7bfc0989918af62b4d2582e46d37020

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?
 
+        raise "Please, specify command via -c (--command) option" unless Anyt.config.command
+
         AnyCable.logger.debug "Running command: #{Anyt.config.command}"
 
         @process = ChildProcess.build(*Anyt.config.command.split(/\s+/))

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/tests/features/channel_state_test.rb

@@ -17,6 +17,8 @@ feature "Channel state" do
     end
 
     def unsubscribed
+      return unless params["notify_disconnect"]
+
       ActionCable.server.broadcast("state_counts", data: "user left: #{user[:name]}")
     end
   end
@@ -24,7 +26,7 @@ feature "Channel state" do
   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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyt
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack