celluloid_pubsub 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1eba9a9d8cfa302a2d8345fc4d5ba9e97387b33
-  data.tar.gz: 032b659f65e7e148908743b46abbf121705beb88
+SHA256:
+  metadata.gz: 03c8681e99ddf220f8fbdec951b30b6297e6d813e0dc81d179f1a203445eaee9
+  data.tar.gz: 2faac6758815b6a65da97967286e490b918cdcbcdf26098fa8bffc02cd8e29db
 SHA512:
-  metadata.gz: 55bbe3c294f63f699394856175c8a93fde5171514b205911f947ae9ca9646a752f81f50164e31cad13aa1e0cb32754b8eef9054adf10c6c88f2251dcdeb4a8f7
-  data.tar.gz: 80db42f3886b90caf6b4b3899e0dcb3108679790a44736d72dc70ed0102c5ad34957aa3fbeedcdba1aed546ffcf86caf2b1756da6b40416b53481d8eb59671e6
+  metadata.gz: 2a86c3c51afc78faff3dd1cf534152bbfabbb40f4425a2bcdde435ae4f54fb1e8c3ed1cec2399640a8ec911609d4cd1cf3887c9c849b016fa2053bfeff69b157
+  data.tar.gz: e32fb0726143ddcf85f627ad731be01afa57d02ee8eaf473bbc56c3c7aec26d7b0bc6f939fe3adf6246a5815ae433a2dc9bef94315737de481f9b4ebb67eff45

data/.hound.yml

@@ -0,0 +1,10 @@
+rubocop:
+  config_file: .rubocop.yml
+  enabled: false
+
+flog:
+  enabled: false
+
+reek:
+  enabled: false
+

data/.rubocop.yml

@@ -1,6 +1,12 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
+  TargetRubyVersion: 3.0
+  DisplayStyleGuide: true
+  ExtraDetails: true
   Exclude:
     - celluloid_pubsub.gemspec
+    - gemfiles/**/**
     - bin/**/*
     - Guardfile
     - vendor/**/**
@@ -8,70 +14,146 @@ AllCops:
     - spec/**/*
     - Gemfile
     - Rakefile
+    - Appraisals
+
+Style/OptionalBooleanParameter:
+  Enabled: false
 
-  TargetRubyVersion: 2.3
-  
-ClassLength:
-  Max: 500
+Lint/RedundantRequireStatement:
+  Enabled: false
 
-Documentation:
+Style/StringChars: # (new in 1.12)
   Enabled: true
 
-Encoding:
+Metrics/ClassLength:
+  Max: 900
+
+Metrics/ModuleLength:
+  Max: 900
+
+Style/Documentation:
   Enabled: false
 
-LineLength:
+Style/Encoding:
+  Enabled: false
+
+Layout/LineLength:
   Max: 200
 
-AccessModifierIndentation:
-  EnforcedStyle: outdent
+Layout/AccessModifierIndentation:
+  EnforcedStyle: indent
 
-IfUnlessModifier:
+Style/IfUnlessModifier:
   Enabled: false
 
-CaseIndentation:
-  IndentWhenRelativeTo: case
-  IndentOneStep: true
+Layout/CaseIndentation:
+  EnforcedStyle: case
+  IndentOneStep: false
 
-MethodLength:
+Metrics/MethodLength:
   CountComments: false
   Max: 20
 
-SignalException:
+Style/SignalException:
   Enabled: false
 
-ColonMethodCall:
+Style/ColonMethodCall:
   Enabled: false
 
-AsciiComments:
+Style/AsciiComments:
   Enabled: false
 
-RegexpLiteral:
+Style/RegexpLiteral:
   Enabled: false
 
-AssignmentInCondition:
+Lint/AssignmentInCondition:
   Enabled: false
 
-ParameterLists:
+Metrics/ParameterLists:
   CountKeywordArgs: false
 
-SingleLineBlockParams:
+Style/SingleLineBlockParams:
   Methods:
     - reduce:
-      - memo
-      - item
+        - memo
+        - item
 
 Metrics/AbcSize:
   Enabled: false
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
+Style/GlobalStdStream:
+  Enabled: false
+
 Style/CollectionMethods:
   Enabled: true
 
 Style/SymbolArray:
   Enabled: true
 
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   Enabled: true
 
-Style/FileName:
+Naming/FileName:
   Enabled: false
+
+Gemspec/DateAssignment: # (new in 1.10)
+  Enabled: true
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DeprecatedConstants: # (new in 1.8)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/NumberedParameterAssignment: # (new in 1.9)
+  Enabled: true
+Lint/OrAssignmentToConstant: # (new in 1.9)
+  Enabled: true
+Lint/RedundantDirGlobSort: # (new in 1.8)
+  Enabled: true
+Lint/SymbolConversion: # (new in 1.9)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/TripleQuotes: # (new in 1.9)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+Style/EndlessMethod: # (new in 1.8)
+  Enabled: true
+Style/HashConversion: # (new in 1.10)
+  Enabled: true
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # (new in 1.9)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: true
+Style/SwapValues: # (new in 1.1)
+  Enabled: true

data/.rubocop_todo.yml

@@ -0,0 +1,7 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2021-03-26 21:52:12 UTC using RuboCop version 1.12.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-sudo: false
 
 cache: bundler
 
@@ -7,24 +6,62 @@ bundler_args: --no-deployment --binstubs=./bin
 
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
-  - gem install bundler
-  - gem update bundler
+  - if [[ ! "${RUBY_VERSION}" =~ "jruby" ]]; then travis_wait 30 rvm rubygems current; fi
+  - if [[ ! "${RUBY_VERSION}" =~ "jruby" ]]; then yes | gem update --system --force || true; fi
+  - gem --version
+  - gem install bundler -v 1.17.3
+  - export MY_BUNDLER_VERSION='_1.17.3_'
+  - bundle ${MY_BUNDLER_VERSION} --version
 
 install:
-  - bundle install --path vendor/bundle
+  - bundle ${MY_BUNDLER_VERSION} config --local path vendor/bundle
+  - bundle ${MY_BUNDLER_VERSION} config --local jobs 3
+  - bundle ${MY_BUNDLER_VERSION} config --local retry 3
+  - bundle ${MY_BUNDLER_VERSION} config --local binstubs ./bin
+  - bundle ${MY_BUNDLER_VERSION} config --local bin ./bin
+  - bundle ${MY_BUNDLER_VERSION} install
+  - gem env
+  - bundle ${MY_BUNDLER_VERSION} env
 
 script:
-   - echo $BUNDLE_GEMFILE
-   - bundle exec rake
+  - echo $BUNDLE_GEMFILE
+  - bundle ${MY_BUNDLER_VERSION} exec rake
 
+gemfile:
+  - gemfiles/cell_0.16.0.gemfile
+  - gemfiles/cell_0.17.3.gemfile
+  - gemfiles/cell_0.17.4.gemfile
+  - gemfiles/cell_0.18.0.gemfile
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: 2.2.5
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/cell_0.18.0.gemfile
+    - rvm: 2.1.3
+      gemfile: gemfiles/cell_0.18.0.gemfile
+    - rvm: 2.2.0
+      gemfile: gemfiles/cell_0.18.0.gemfile
+    - rvm: 2.2.2
+      gemfile: gemfiles/cell_0.18.0.gemfile
+    - rvm: 2.2.5
+      gemfile: gemfiles/cell_0.18.0.gemfile
 rvm:
-- 2.2.2
-- 2.2.5
-- 2.3.1
-- 2.3.2
-- 2.3.3
-- 2.4.0
+  - 2.1.3
+  - 2.2.2
+  - 2.2.5
+  - 2.3.1
+  - 2.3.2
+  - 2.3.3
+  - 2.4.0
+  - 2.5.3
+  - 2.6.5
+  - 2.7.1
+ # - 3.0.0 - celluloid/io doesn't work
+
 env:
- - RAILS_ENV=test RACK_ENV=test
+  - RAILS_ENV=test RACK_ENV=test APP_ENV=test
+
 notifications:
   email: false

data/Appraisals

@@ -1,11 +1,15 @@
-appraise "celluloid-0.16.0" do
+appraise "cell-0.16.0" do
   gem "celluloid", "0.16.0"
 end
 
-appraise "celluloid-0.17.3" do
+appraise "cell-0.17.3" do
   gem "celluloid", "0.17.3"
 end
 
-appraise "celluloid-0.18.0.pre" do
-  gem "celluloid", "0.18.0.pre"
+appraise "cell-0.17.4" do
+  gem "celluloid", "0.17.4"
 end
+
+appraise "cell-0.18.0" do
+  gem "celluloid", "0.18.0"
+end

data/Gemfile

@@ -1,3 +1,3 @@
 source 'http://rubygems.org'
 
-gemspec
+gemspec

data/Rakefile

@@ -20,8 +20,8 @@ task :all do |_t|
     # require 'json'
     # puts JSON.pretty_generate(ENV.to_hash)
     if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
-      appraisal_name = ENV['BUNDLE_GEMFILE'].scan(/rails\_(.*)\.gemfile/).flatten.first
-      command_prefix = "appraisal rails-#{appraisal_name}"
+      appraisal_name = ENV['BUNDLE_GEMFILE'].scan(/cell\_(.*)\.gemfile/).flatten.first
+      command_prefix = "appraisal cell-#{appraisal_name}"
       exec ("#{command_prefix} bundle install && #{command_prefix} bundle exec rspec && bundle exec rake coveralls:push ")
     else
       exec(' bundle exec appraisal install && bundle exec rake appraisal spec && bundle exec rake coveralls:push')

data/celluloid_pubsub.gemspec

@@ -19,20 +19,21 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'celluloid', '>= 0.16', '>= 0.16.0'
+  s.add_runtime_dependency 'celluloid-fsm'
   s.add_runtime_dependency 'celluloid-io', '>= 0.16', '>= 0.16.2'
-  s.add_runtime_dependency 'reel', '~> 0.6', '>= 0.6.0'
+  #TODO: reel 0.6.1 seems broken - Need to investigate
+  s.add_runtime_dependency 'reel', '0.6.0'
   s.add_runtime_dependency 'celluloid-websocket-client', '~> 0.0', '>= 0.0.1'
-  s.add_runtime_dependency 'celluloid-pmap', '~> 0.2', '>= 0.2.2'
+  s.add_runtime_dependency 'celluloid-pmap', '~> 1.0'
   s.add_runtime_dependency 'activesupport', '>= 4.0', '>= 4.0'
 
   s.add_development_dependency 'appraisal', '~> 2.1', '>= 2.1'
   s.add_development_dependency 'rspec', '~> 3.5', '>= 3.5'
   s.add_development_dependency 'simplecov', '~> 0.12', '>= 0.12'
   s.add_development_dependency 'simplecov-summary', '~> 0.0', '>= 0.0.5'
-  s.add_development_dependency 'mocha', '~> 1.2', '>= 1.2'
   s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8'
   s.add_development_dependency 'rake', '>= 12.0', '>= 12.0'
-  s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7'
+  s.add_development_dependency 'yard', '>= 0.9.20'
   s.add_development_dependency 'redcarpet', '~> 3.4', '>= 3.4'
   s.add_development_dependency 'github-markup', '~> 1.4', '>= 1.4'
   s.add_development_dependency 'inch', '~> 0.7', '>= 0.7'

data/examples/simple_test.rb

@@ -2,9 +2,15 @@ require 'bundler/setup'
 require 'celluloid_pubsub'
 require 'logger'
 
-debug_enabled = ENV['DEBUG'].present? && ENV['DEBUG'].to_s == 'true'
+debug_enabled = (ENV['DEBUG'].present? && ENV['DEBUG'].to_s != 'false') || ENV['DEBUG'].blank?
 log_file_path = File.join(File.expand_path(File.dirname(__FILE__)), 'log', 'celluloid_pubsub.log')
+log_level = debug_enabled ?  ::Logger::Severity::DEBUG : ::Logger::Severity::INFO
 
+Celluloid.task_class = if defined?(Celluloid::TaskThread)
+                         Celluloid::TaskThread
+                       else
+                         Celluloid::Task::Threaded
+                       end
 # actor that subscribes to a channel
 class FirstActor
   include Celluloid
@@ -23,11 +29,10 @@ class FirstActor
   end
 
   def on_close(code, reason)
-    puts "websocket connection closed: #{code.inspect}, #{reason.inspect}"
+    puts "subscriber: websocket connection closed: #{code.inspect}, #{reason.inspect}"
     terminate
   end
 
-
 end
 
 # actor that publishes a message in a channel
@@ -48,7 +53,7 @@ class SecondActor
   end
 
   def on_close(code, reason)
-    puts "websocket connection closed: #{code.inspect}, #{reason.inspect}"
+    puts "publisher: websocket connection closed: #{code.inspect}, #{reason.inspect}"
     terminate
   end
 
@@ -57,9 +62,18 @@ end
 
 # please don't use the BaseActor class to supervise actors. This is subject to change . This class is used only to test backward compatibility.
 # For more information on how to supervise actors please see Celluloid wiki.
-CelluloidPubsub::BaseActor.setup_actor_supervision(CelluloidPubsub::WebServer, actor_name: :web_server, args: {enable_debug: debug_enabled, adapter: nil,log_file_path: log_file_path })
-CelluloidPubsub::BaseActor.setup_actor_supervision(FirstActor, actor_name: :first_actor, args: {enable_debug: debug_enabled })
-CelluloidPubsub::BaseActor.setup_actor_supervision(SecondActor, actor_name: :second_actor, args: {enable_debug: debug_enabled })
+CelluloidPubsub::BaseActor.setup_actor_supervision(CelluloidPubsub::WebServer, actor_name: :web_server, args: {enable_debug: debug_enabled, spy: debug_enabled, adapter: nil,log_file_path: log_file_path, log_level: log_level })
+if ENV['RUN_IN_PARALLEL'].nil? || ENV['RUN_IN_PARALLEL'].to_s.downcase == 'true'
+  [
+    { class: FirstActor, name: :first_actor },
+    { class: SecondActor, name: :second_actor }
+  ].pmap do |hash|
+    CelluloidPubsub::BaseActor.setup_actor_supervision(hash[:class], actor_name: hash[:name], args: { enable_debug: debug_enabled, log_level: log_level })
+  end
+else
+  CelluloidPubsub::BaseActor.setup_actor_supervision(FirstActor, actor_name: :first_actor, args: { enable_debug: debug_enabled, log_level: log_level })
+  CelluloidPubsub::BaseActor.setup_actor_supervision(SecondActor, actor_name: :second_actor, args: { enable_debug: debug_enabled, log_level: log_level})
+end
 
 signal_received = false
 
@@ -68,5 +82,13 @@ Signal.trap('INT') do
   signal_received = true
 end
 
-sleep 0.1 until signal_received
+Kernel.sleep 0.1 until signal_received
 puts 'Exited succesfully! =)'
+
+# use this if you want to see the `on_close` callbacks being fired
+#Celluloid::Actor[:web_server].shutdown
+
+# if you are using this, the `on_close` on the websocket connection won't get triggered
+#  in this case you will need a finalizer on the subscriber and publisher
+#  for when the actors are shutting down
+Celluloid.shutdown

data/gemfiles/{celluloid_0.16.0.gemfile → cell_0.16.0.gemfile}

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "celluloid", "0.16.0"
 
-gemspec :path => "../"
+gemspec path: "../"