hanami-events-cloud_pubsub 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b74e245658e07e3de644521a132de72abda946f063da3d4753baaafd90d3c4a5
-  data.tar.gz: 828da43db5d56a53f88111da0f10295d15f8f2c5acba0c0bf7b2b110e732b75e
+  metadata.gz: a2113da2784c067da73a9d9c37990f8c2406bd1e0ff6c25ab17576f786863ef9
+  data.tar.gz: b2bb4eb5f8e5b8ca1e8dcac4c150b210d2e108e075dbd6d7abb419afab452516
 SHA512:
-  metadata.gz: 1278b410daba4892e127631c86058cb00397b5903547a9e03b96df7908382a10c8166ebf624edaa2990ff53c2a727996ea9df1347ca901f69eccf0d0aef0573c
-  data.tar.gz: 4bf717414948e69b9f48eac0b9c9e60d2fab73c0ad90d1cf6fd9bbf74a1cdf5881cc72f16d722d032b040c9c8a50697cd81dce67408959c6b5b49a7171eec413
+  metadata.gz: c51521fa3b75dd6bbbc7e79c227d1ea53f3cd5623eb874b28972fc713b656baacd2fda7f34fce2b515ced410a5d4f1e1ae69df47bfae476557dcc0956548c5c5
+  data.tar.gz: 320daaad0c019fcb38e07c993e7bd8c71804d51ce0ee27767627b6a1c1cb97eef78cc4b99724e57ccb222d0cce9c1d7ab93838e03605a06e6d0b917d620d562d

data/.travis.yml

@@ -4,18 +4,10 @@ cache: bundler
 services:
   - docker
 language: ruby
-env:
-  - DOCKER_COMPOSE_VERSION=1.21.2
 rvm:
   - 2.4
 before_install:
   - gem install bundler -v 1.16.1
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname
-    -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
-  - docker-compose up -d
 after_failure:
   - cat log/test.log
 deploy:

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (0.1.0)
+    hanami-events-cloud_pubsub (0.1.5)
       google-cloud-pubsub (~> 0.30.2)
       hanami-cli
       hanami-events
@@ -73,6 +73,7 @@ GEM
     hanami-utils (1.2.0)
       concurrent-ruby (~> 1.0)
       transproc (~> 1.0)
+    jaro_winkler (1.4.0)
     jwt (2.1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
@@ -107,7 +108,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.56.0)
+    rubocop (0.57.0)
+      jaro_winkler (~> 1.4.0)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)

data/hanami-events-cloud_pubsub.gemspec

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
@@ -24,9 +23,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'google-cloud-pubsub', '~> 0.30.2'
-
-  spec.add_runtime_dependency 'hanami-cli'
-  spec.add_runtime_dependency 'hanami-events'
+  spec.add_dependency 'hanami-cli'
+  spec.add_dependency 'hanami-events'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 12.3'

data/lib/hanami/events/cloud_pubsub/cli.rb

@@ -24,21 +24,50 @@ module Hanami
                    desc: 'Config file which is loaded before starting the runner'
 
             def call(opts)
-              CloudPubsub.setup
+              setup_env(opts)
               parse_opts(opts)
-              setup_signal_handlers
               build_runner
+              setup_signal_handlers
               load_config
               start_runner
               sleep_forever
-            rescue Interrupt
-              shutdown
             end
 
             private
 
+            def setup_env(opts)
+              ENV['PUBSUB_EMULATOR_HOST'] ||= 'localhost:8085' if opts[:emulator]
+              try_load_environment
+              resolve_components
+              CloudPubsub.setup
+            end
+
+            def try_load_environment
+              boot_file = Bundler.default_gemfile.parent.join('config', 'environment.rb')
+              load boot_file.to_s
+            rescue LoadError
+              logger.warn <<~MSG
+                Could not load config/environment.rb, assuming we are not in a Hanami project
+              MSG
+            end
+
+            def resolve_components
+              return unless defined?(Hanami::Components)
+              Hanami::Components.resolve('logger')
+            end
+
             def sleep_forever
+              thread = Thread.new do
+                loop do
+                  event = @queue.pop
+                  event.call
+                end
+              end
+
               sleep
+            rescue Interrupt
+              thread.kill
+              shutdown
             end
 
             def load_config
@@ -52,7 +81,7 @@ module Hanami
 
             def parse_opts(opts)
               @emulator = opts[:emulator]
-              logger.info 'Running if emulator mode' if @emulator
+              logger.info 'Running in emulator mode' if @emulator
               @config = opts[:config]
               logger.debug "Using config file: #{@config}"
             end
@@ -60,7 +89,6 @@ module Hanami
             def build_runner
               pubsub_opts = {}
 
-              ENV['PUBSUB_EMULATOR_HOST'] ||= 'localhost:8085' if @emulator
               pubsub_opts[:project_id] = 'emulator' if @emulator
 
               pubsub = Google::Cloud::Pubsub.new pubsub_opts
@@ -72,24 +100,26 @@ module Hanami
             end
 
             def logger
-              if defined?(Hanami.logger)
-                Hanami.logger
-              else
-                Logger.new(STDOUT).tap { |logger| logger.level = Logger::INFO }
-              end
+              @logger ||= if defined?(Hanami.logger)
+                            Hanami.logger
+                          else
+                            Logger.new(STDOUT)
+                          end
             end
 
             def setup_signal_handlers
+              @queue = Queue.new
+
               Signal.trap('TSTP') do
-                Thread.new { @runner.pause }
+                @queue << proc { @runner.pause }
               end
 
               Signal.trap('CONT') do
-                Thread.new { @runner.start }
+                @queue << proc { @runner.start }
               end
 
               Signal.trap('TTIN') do
-                Thread.new { @runner.print_debug_info }
+                @queue << proc { @runner.print_debug_info }
               end
             end
 

data/lib/hanami/events/cloud_pubsub/listener.rb

@@ -39,6 +39,10 @@ module Hanami
           @subscriber.start
         end
 
+        def started?
+          @subscriber&.started?
+        end
+
         def shutdown
           subscriber.stop.wait!
           self
@@ -95,7 +99,7 @@ module Hanami
         end
 
         def ensure_subscriber!
-          raise NoSubscriberError, 'No subsriber has been registererd' unless @subscriber
+          raise NoSubscriberError, 'No subsriber has been registered' unless @subscriber
         end
       end
     end

data/lib/hanami/events/cloud_pubsub/runner.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'hanami/events/cloud_pubsub/thread_inspector'
+
 module Hanami
   module Events
     module CloudPubsub
@@ -81,12 +83,23 @@ module Hanami
         # some reason.
         #
         # See: https://github.com/mperham/sidekiq/blob/e447dae961ebc894f12848d9f33446a07ffc67dc/bin/sidekiqload#L74
+        # rubocop:disable Metrics/AbcSize
         def print_debug_info(stream = STDOUT)
-          stream.puts '=== Subscribers ==='
-          adapter.listeners.each do |listener|
-            stream.puts listener.format
-          end
+          stream.puts <<~MSG
+            ╔══════ BACKTRACES
+            #{Thread.list.flat_map { |thr| ThreadInspector.new(thr).to_s }.join("\n")}
+            ╠══════ LISTENERS
+            #{adapter.listeners.map { |lis| '║ ' + lis.format }.join("\n")}
+            ║
+            ╠══════ GENERAL
+            ║ ready?: #{ready?}
+            ║ healthy?: #{healthy?}
+            ║ threads: #{Thread.list.count}
+            ║ threads running: #{Thread.list.select { |thread| thread.status == 'run' }.count}
+            ╚══════
+          MSG
         end
+        # rubocop:enable Metrics/AbcSize
 
         def sleep_for_a_bit
           sleep @sleep_time

data/lib/hanami/events/cloud_pubsub/thread_inspector.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Hanami
+  module Events
+    module CloudPubsub
+      # Generate prettier backtraces for inspection
+      class ThreadInspector
+        attr_reader :backtrace, :thread
+
+        def initialize(thread)
+          @thread = thread
+          @backtrace = thread.backtrace
+        end
+
+        def to_s
+          "║ #{thread.inspect}\n" + pretty_backtrace
+        end
+
+        def inspect
+          thread.inspect
+        end
+
+        private
+
+        def pretty_backtrace
+          pretty_backtrace = backtrace.map do |call|
+            parts = call.match(/^(?<file>.+):(?<line>\d+):in `(?<code>.*)'$/)
+
+            if parts
+              file = parts[:file].sub(/^#{Regexp.escape(File.join(Dir.getwd, ''))}/, '')
+              pretty_line(file, parts)
+            else
+              colorize(call, 31)
+            end
+          end
+
+          join_backtrace(pretty_backtrace)
+        end
+
+        def colorize(text, color_code)
+          "\e[#{color_code}m#{text}\e[0m"
+        end
+
+        def pretty_line(file, parts)
+          "#{colorize(file, 36)} #{colorize('(', 37)}" \
+            "#{colorize(parts[:line], 32)}#{colorize('): ', 37)} " \
+            "#{colorize(parts[:code], 31)}"
+        end
+
+        def join_backtrace(pretty_backtrace)
+          pretty_backtrace.map! { |line| "║\t" + line }
+          pretty_backtrace << '║'
+          pretty_backtrace.join("\n")
+        end
+      end
+    end
+  end
+end

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '0.1.0'
+      VERSION = '0.1.5'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub
@@ -127,6 +127,7 @@ files:
 - lib/hanami/events/cloud_pubsub/listener.rb
 - lib/hanami/events/cloud_pubsub/mixin.rb
 - lib/hanami/events/cloud_pubsub/runner.rb
+- lib/hanami/events/cloud_pubsub/thread_inspector.rb
 - lib/hanami/events/cloud_pubsub/version.rb
 - log/.keep
 homepage: https://github.com/adHawk/hanami-events-cloud_pubsub