anyt 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f49015d1bfc782a6cefdc033022683db45e0a8e0885a72aae504a56bdd4a5c1
-  data.tar.gz: 212fa4ef1c916ea63cbfc2fccc4e974e5a27876a4e963024855f0a333d50f662
+  metadata.gz: 9db289698192e906312e6ff3708370e1016b15e2b0299ace6b514f6d5e31adbf
+  data.tar.gz: 54cad65181ffa23e5a108c416990610015ffbd1788c5d10a3dfaf1f326f91e09
 SHA512:
-  metadata.gz: feddd2dfaf287ac79d775fe8e163582ce8b25357c0d470a4e243a6b849577184444f44437e0cf94028ff478c99bb0bb36cc9bf15d33078f379856dfdba09abb0
-  data.tar.gz: 195b9d7ed1f1b0e0e9ba876c0e6377f72d56f834154092b1cf586be74b0e9f652da23001bff3ff60d649047de62d3696a1cf7ee72bc33678e8d8a10b21641c2d
+  metadata.gz: fea80bb2f253a3787ccdd27e37f5ba0b8ca93fbcc48d375c3ec3698d9e48138da8b137a0ceb95a0cced5c9f880562cd98cdb5e2d40cebdf3fd22335432cff5f3
+  data.tar.gz: cfa930d46971b56a14d2f28821e642f02425c74a4e0ddc2dfabdb71ae3f29e1da6fd0148cd94c905c92d60fe06ed360cdc938b2ef93c8a30c7d1621d8e322f58

data/lib/anyt/cli.rb

@@ -13,6 +13,13 @@ $stdout.sync = true
 
 module Anyt
   module Cli # :nodoc:
+    DUMMY_ROOT = ::File.expand_path(
+      "config.ru",
+      ::File.join(::File.dirname(__FILE__), "dummy")
+    )
+
+    RAILS_COMMAND = "bundle exec puma #{DUMMY_ROOT} -t #{ENV.fetch("RAILS_MAX_THREADS", 5)}"
+
     class << self
       # CLI entrypoint
       def run(args = ARGV)
@@ -39,16 +46,30 @@ module Anyt
           # Start RPC server (unless specified otherwise, e.g. when
           # we want to test Action Cable itself)
           unless @skip_rpc
-            RPC.start
+            http_rpc = AnyCable.config.http_rpc_mount_path.present?
+
+            @rpc_command =
+              if http_rpc
+                Command.new(RAILS_COMMAND)
+              else
+                RPC.new
+              end
+
+            @rpc_command.start
 
             if @only_rpc
-              RPC.server.wait_till_terminated
+              if http_rpc
+                wait_till_terminated
+              else
+                @rpc_command.server.wait_till_terminated
+              end
               return
             end
           end
 
           # Start webosocket server under test
-          Command.run
+          @command = Command.default
+          @command.run
 
           unless @skip_tests
             # Run tests
@@ -59,8 +80,8 @@ module Anyt
         rescue Interrupt => e
           $stdout.puts "#{e.message}. Good-bye!"
         ensure
-          RPC.stop unless @skip_rpc
-          Command.stop
+          @rpc_command&.stop unless @skip_rpc
+          @command&.stop
         end
 
         result
@@ -97,7 +118,6 @@ 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
@@ -162,11 +182,7 @@ module Anyt
       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.command = RAILS_COMMAND
         Anyt.config.use_action_cable = true
       end
 

data/lib/anyt/command.rb

@@ -4,60 +4,80 @@ require "childprocess"
 
 module Anyt
   # Runs system command (websocket server)
-  module Command
+  class Command
     class << self
-      def run
-        return if running?
+      attr_reader :instance
 
-        return unless Anyt.config.command
+      def default
+        @instance ||= new
+      end
 
-        AnyCable.logger.debug "Running command: #{Anyt.config.command}"
+      def restart
+        instance&.restart
+      end
+    end
 
-        @process = ChildProcess.build(*Anyt.config.command.split(/\s+/))
+    attr_reader :cmd
 
-        process.io.inherit! if AnyCable.config.debug
+    def initialize(cmd = Anyt.config.command)
+      @cmd = cmd
+    end
 
-        process.detach = true
+    def run
+      return if running?
 
-        process.environment["ANYCABLE_DEBUG"] = "1" if AnyCable.config.debug?
-        process.environment["ANYT_REMOTE_CONTROL_PORT"] = Anyt.config.remote_control_port
+      return unless cmd
 
-        process.start
+      AnyCable.logger.debug "Running command: #{cmd}"
 
-        AnyCable.logger.debug "Command PID: #{process.pid}"
+      @process = ChildProcess.build(*cmd.split(/\s+/))
 
-        sleep Anyt.config.wait_command
-        raise "Command failed to start" unless running?
-      end
-      # rubocop: enable Metrics/MethodLength
-      # rubocop: enable Metrics/AbcSize
+      process.io.inherit! if AnyCable.config.debug
 
-      def restart
-        return unless running?
+      process.detach = true
 
-        AnyCable.logger.debug "Restarting command PID: #{process.pid}"
+      process.environment["ANYCABLE_DEBUG"] = "1" if AnyCable.config.debug?
+      process.environment["ANYT_REMOTE_CONTROL_PORT"] = Anyt.config.remote_control_port
+      process.environment["ACTION_CABLE_ADAPTER"] = "any_cable" unless Anyt.config.use_action_cable
 
-        stop
-        process.wait
+      process.start
 
-        run
-      end
+      AnyCable.logger.debug "Command PID: #{process.pid}"
 
-      def stop
-        return unless running?
+      sleep Anyt.config.wait_command
+      raise "Command failed to start" unless running?
+    end
 
-        AnyCable.logger.debug "Terminate PID: #{process.pid}"
+    alias_method :start, :run
 
-        process.stop
-      end
+    # rubocop: enable Metrics/MethodLength
+    # rubocop: enable Metrics/AbcSize
 
-      def running?
-        process&.alive?
-      end
+    def restart
+      return unless running?
+
+      AnyCable.logger.debug "Restarting command PID: #{process.pid}"
+
+      stop
+      process.wait
+
+      run
+    end
 
-      private
+    def stop
+      return unless running?
 
-      attr_reader :process
+      AnyCable.logger.debug "Terminate PID: #{process.pid}"
+
+      process.stop
+    end
+
+    def running?
+      process&.alive?
     end
+
+    private
+
+    attr_reader :process
   end
 end

data/lib/anyt/config.rb

@@ -29,8 +29,8 @@ module Anyt
     end
 
     def tests_filter
-      only_rxp = /(#{only_tests.join('|')})/ if only_tests
-      except_rxp = /(#{except_tests.join('|')})/ if except_tests
+      only_rxp = /(#{only_tests.join("|")})/ if only_tests
+      except_rxp = /(#{except_tests.join("|")})/ if except_tests
 
       @tests_filter ||= lambda do |path|
         (only_rxp.nil? || only_rxp.match?(path)) &&

data/lib/anyt/dummy/application.rb

@@ -20,6 +20,8 @@ class TestApp < Rails::Application
   config.paths["config/routes.rb"] << File.join(__dir__, "routes.rb")
 end
 
+DISCONNECT_DELAY = ENV["ANYCABLE_DISCONNECT_DELAY"].to_f
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
     delegate :params, to: :request
@@ -32,6 +34,9 @@ module ApplicationCable
     end
 
     def disconnect
+      if DISCONNECT_DELAY > 0
+        sleep DISCONNECT_DELAY
+      end
       logger.debug "Disconnected"
     end
   end
@@ -63,6 +68,11 @@ class BenchmarkChannel < ApplicationCable::Channel
     transmit data
   end
 
+  def counter(data)
+    num = data.fetch("num", 100).to_i
+    num.times { ActionCable.server.broadcast "all", {text: "Count: #{_1}"} }
+  end
+
   private
 
   def stream_id
@@ -70,7 +80,7 @@ class BenchmarkChannel < ApplicationCable::Channel
   end
 end
 
-ActionCable.server.config.cable = {"adapter" => "redis"}
+ActionCable.server.config.cable = {"adapter" => ENV.fetch("ACTION_CABLE_ADAPTER", "redis")}
 ActionCable.server.config.connection_class = -> { ApplicationCable::Connection }
 ActionCable.server.config.disable_request_forgery_protection = true
 ActionCable.server.config.logger =

data/lib/anyt/dummy/config.ru

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./application"
+require_relative "application"
 
 require_relative "../tests"
 require_relative "../remote_control"

data/lib/anyt/ext/minitest.rb

@@ -2,6 +2,7 @@
 
 ENV["TERM"] = "#{ENV["TERM"]}color" unless ENV["TERM"]&.match?(/color/)
 require "minitest/spec"
+require "minitest/unit"
 require "minitest/reporters"
 
 module Anyt

data/lib/anyt/rpc.rb

@@ -6,38 +6,36 @@ require "redis"
 
 module Anyt # :nodoc:
   # Runs AnyCable RPC server in the background
-  module RPC
+  class RPC
     using AsyncHelpers
 
-    class << self
-      attr_accessor :running
-      attr_reader :server
+    attr_accessor :running
+    attr_reader :server
 
-      def start
-        AnyCable.logger.debug "Starting RPC server ..."
+    def start
+      AnyCable.logger.debug "Starting RPC server ..."
 
-        AnyCable.server_callbacks.each(&:call)
+      AnyCable.server_callbacks.each(&:call)
 
-        @server = AnyCable::GRPC::Server.new(
-          host: AnyCable.config.rpc_host,
-          **AnyCable.config.to_grpc_params
-        )
+      @server = AnyCable::GRPC::Server.new(
+        host: AnyCable.config.rpc_host,
+        **AnyCable.config.to_grpc_params
+      )
 
-        if defined?(::AnyCable::Middlewares::EnvSid)
-          AnyCable.middleware.use(::AnyCable::Middlewares::EnvSid)
-        end
+      if defined?(::AnyCable::Middlewares::EnvSid)
+        AnyCable.middleware.use(::AnyCable::Middlewares::EnvSid)
+      end
 
-        AnyCable.middleware.freeze
+      AnyCable.middleware.freeze
 
-        server.start
+      server.start
 
-        AnyCable.logger.debug "RPC server started"
-      end
-      # rubocop: enable Metrics/AbcSize,Metrics/MethodLength
+      AnyCable.logger.debug "RPC server started"
+    end
+    # rubocop: enable Metrics/AbcSize,Metrics/MethodLength
 
-      def stop
-        server&.stop
-      end
+    def stop
+      server&.stop
     end
 
     AnyCable.connection_factory = ActionCable.server.config.connection_class.call

data/lib/anyt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyt
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Anycable conformance testing tool