flatware 0.4.1 → 2.0.0.rc2

data/lib/flatware/sink.rb

@@ -1,104 +1,136 @@
-require 'flatware'
+require 'drb/drb'
+
 module Flatware
   module Sink
-    extend self
+    module_function
+
+    def start_server(**args)
+      Server.new(**args).start
+    end
 
-    def start_server(*args)
-      Server.new(*args).start
+    def client
+      @client
+    end
+
+    def client=(client)
+      @client = client
     end
 
     class Server
-      attr_reader :sink, :dispatch, :poller, :workers, :checkpoints, :jobs, :formatter
+      attr_reader :checkpoints, :completed_jobs, :formatter, :jobs, :queue, :sink, :workers
 
-      def initialize(jobs:, formatter:, dispatch:, sink:, worker_count: 0)
+      def initialize(jobs:, formatter:, sink:, worker_count: 0, **)
+        @checkpoints = []
+        @completed_jobs = []
         @formatter = formatter
-        @jobs = group_jobs(jobs, worker_count)
-        @sink = Flatware.socket(ZMQ::PULL, bind: sink)
-        @dispatch = Flatware.socket(ZMQ::REP, bind: dispatch)
-        @poller = Poller.new(@sink, @dispatch)
+        @jobs = group_jobs(jobs, worker_count).freeze
+        @queue = @jobs.dup
+        @sink = sink
         @workers = Set.new(worker_count.times.to_a)
-        @checkpoints = []
       end
 
       def start
-        trap 'INT' do
-          puts "Interrupted!"
-          formatter.summarize checkpoints
-          summarize_remaining
-          puts "\n\nCleaning up. Please wait...\n"
-          Flatware.close!
-          Process.waitall
-          puts "thanks."
-          exit 1
-        end
+        trap_interrupt
         formatter.jobs jobs
-        listen.tap do
-          Flatware.close
-        end
+        DRb.start_service(sink, self, verbose: Flatware.verbose?)
+        DRb.thread.join
+        !failures?
       end
 
-      def listen
-        que = jobs.dup
-        poller.each do |socket|
-          message, content = socket.recv
-
-          case message
-          when :ready
-            workers << content
-            job = que.shift
-            if job and not done?
-              dispatch.send job
-            else
-              workers.delete content
-              dispatch.send 'seppuku'
-            end
-          when :checkpoint
-            checkpoints << content
-          when :finished
-            completed_jobs << content
-            formatter.finished content
-          else
-            formatter.send message, content
-          end
-          break if workers.empty? and done?
+      def ready(worker)
+        job = queue.shift
+        if job && !(remaining_work.empty? || interruped?)
+          workers << worker
+          job
+        else
+          workers.delete worker
+          check_finished!
+          Job.sentinel
         end
-        formatter.summarize(checkpoints)
-        !failures?
+      end
+
+      def checkpoint(checkpoint)
+        checkpoints << checkpoint
+      end
+
+      def finished(job)
+        completed_jobs << job
+        formatter.finished(job)
+        check_finished!
+      end
+
+      def method_missing(name, *args)
+        super unless formatter.respond_to?(name)
+        Flatware.log(name, *args)
+        formatter.send(name, *args)
+      end
+
+      def respond_to_missing?(name, include_all)
+        formatter.respond_to?(name, include_all)
       end
 
       private
 
-      def failures?
-        checkpoints.any?(&:failures?) || completed_jobs.any?(&:failed?)
+      def trap_interrupt
+        Thread.main[:signals] = Queue.new
+
+        Thread.new(&method(:handle_interrupt))
+
+        trap 'INT' do
+          Thread.main[:signals] << :int
+        end
       end
 
-      def summarize_remaining
-        return if remaining_work.empty?
-        formatter.summarize_remaining remaining_work
+      def handle_interrupt
+        Thread.main[:signals].pop
+        puts 'Interrupted!'
+        summarize_remaining
+        puts "\n\nCleaning up. Please wait...\n"
+        Process.waitall
+        puts 'done.'
+        abort
       end
 
-      def log(*args)
-        Flatware.log *args
+      def interruped?
+        signals = Thread.main[:signals]
+        signals && !signals.empty?
       end
 
-      def completed_jobs
-        @completed_jobs ||= []
+      def check_finished!
+        return unless [workers, remaining_work].all?(&:empty?)
+
+        DRb.stop_service
+        summarize
       end
 
-      def done?
-        remaining_work.empty?
+      def failures?
+        checkpoints.any?(&:failures?) || completed_jobs.any?(&:failed?)
+      end
+
+      def summarize_remaining
+        summarize
+        return if remaining_work.empty?
+
+        formatter.summarize_remaining remaining_work
       end
 
       def remaining_work
         jobs - completed_jobs
       end
 
+      def summarize
+        formatter.summarize(checkpoints)
+      end
+
       def group_jobs(jobs, worker_count)
         return jobs unless worker_count > 1
-        jobs.group_by.with_index do |_,i|
-          i % worker_count
-        end.values.map do |jobs|
-          Job.new(jobs.map(&:id), jobs.first.args)
+
+        jobs
+          .group_by
+          .with_index { |_, i| i % worker_count }
+          .values
+          .map do |job_group|
+          Job.new(job_group.map(&:id).flatten, jobs.first.args)
         end
       end
     end

data/lib/flatware/sink/client.rb

@@ -1,15 +1,17 @@
-require 'flatware/socket'
+require 'drb/drb'
+
 module Flatware
   module Sink
-    extend self
+    module_function
+
     attr_accessor :client
 
     class Client
       def initialize(sink_endpoint)
-        @socket = Flatware.socket ZMQ::PUSH, connect: sink_endpoint
+        @sink = DRbObject.new_with_uri sink_endpoint
       end
 
-      %w[finished started progress checkpoint].each do |message|
+      %w[ready finished started progress checkpoint].each do |message|
         define_method message do |content|
           push [message.to_sym, content]
         end
@@ -18,7 +20,7 @@ module Flatware
       private
 
       def push(message)
-        @socket.send message
+        @sink.public_send message
       end
     end
   end

data/lib/flatware/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Flatware
-  VERSION = '0.4.1'
+  VERSION = '2.0.0.rc2'
 end

data/lib/flatware/worker.rb

@@ -1,57 +1,76 @@
-require 'flatware/sink/client'
+# frozen_string_literal: true
+
+require 'drb/drb'
+
 module Flatware
+  require 'flatware/configuration'
+  # executes tests and sends results to the sink
   class Worker
-    attr_reader :id
+    attr_reader :sink, :runner, :id
 
-    def initialize(id, runner, dispatch_endpoint, sink_endpoint)
+    def initialize(id, runner, sink_endpoint)
       @id       = id
       @runner   = runner
-      @sink     = Sink::Client.new sink_endpoint
-      @task     = Flatware.socket ZMQ::REQ, connect: dispatch_endpoint
+      @sink     = DRbObject.new_with_uri sink_endpoint
+      Flatware::Sink.client = @sink
     end
 
-    def self.spawn(count:, runner:, dispatch:, sink:)
+    def self.spawn(count:, runner:, sink:, **)
+      Flatware.configuration.before_fork.call
       count.times do |i|
         fork do
           $0 = "flatware worker #{i}"
           ENV['TEST_ENV_NUMBER'] = i.to_s
-          new(i, runner, dispatch, sink).listen
+          Flatware.configuration.after_fork.call(i)
+          new(i, runner, sink).listen
         end
       end
     end
 
     def listen
-      trap 'INT' do
-        Flatware.close!
-        @want_to_quit = true
-        exit(1)
-      end
-
-      Sink.client = sink
-      report_for_duty
-      loop do
-        job = task.recv
-        break if job == 'seppuku' or @want_to_quit
-        job.worker = id
-        sink.started job
-        begin
-          runner.run job.id, job.args
-        rescue => e
-          Flatware.log e
-          job.failed = true
+      retrying(times: 10, wait: 0.1) do
+        job = sink.ready id
+        until want_to_quit? || job.sentinel?
+          job.worker = id
+          sink.started job
+          run job
+          job = sink.ready id
         end
-        sink.finished job
-        report_for_duty
       end
-      Flatware.close unless @want_to_quit
     end
 
     private
 
-    attr_reader :task, :sink, :runner
+    def run(job)
+      runner.run job.id, job.args
+      sink.finished job
+    rescue Interrupt
+      want_to_quit!
+    rescue StandardError => e
+      Flatware.log e
+      job.failed!
+      sink.finished job
+    end
 
-    def report_for_duty
-      task.send [:ready, id]
+    def want_to_quit!
+      @want_to_quit = true
+    end
+
+    def want_to_quit?
+      @want_to_quit == true
+    end
+
+    def retrying(times:, wait:)
+      tries = 0
+      begin
+        yield unless want_to_quit?
+      rescue DRb::DRbConnError => e
+        raise if (tries += 1) >= times
+
+        sleep wait
+        Flatware.log('retrying', e.message)
+        retry
+      end
     end
   end
 end

metadata

@@ -1,72 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: flatware
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Brian Dunn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi-rzmq
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.1.0
-description: A distributed cucumber and rspec runner
+description: A distributed rspec and cucumber runner
 email: brian@hashrocket.com
 executables:
 - flatware
@@ -78,60 +36,41 @@ files:
 - LICENSE.txt
 - README.md
 - bin/flatware
-- lib/flatware-cucumber.rb
-- lib/flatware-rspec.rb
 - lib/flatware.rb
 - lib/flatware/broadcaster.rb
 - lib/flatware/cli.rb
-- lib/flatware/cucumber.rb
-- lib/flatware/cucumber/cli.rb
-- lib/flatware/cucumber/formatter.rb
-- lib/flatware/cucumber/formatters/console.rb
-- lib/flatware/cucumber/formatters/console/summary.rb
-- lib/flatware/cucumber/result.rb
-- lib/flatware/cucumber/runtime.rb
-- lib/flatware/cucumber/scenario_result.rb
-- lib/flatware/cucumber/step_result.rb
+- lib/flatware/configuration.rb
 - lib/flatware/job.rb
-- lib/flatware/pids.rb
-- lib/flatware/poller.rb
-- lib/flatware/processor_info.rb
-- lib/flatware/rspec.rb
-- lib/flatware/rspec/checkpoint.rb
-- lib/flatware/rspec/cli.rb
-- lib/flatware/rspec/example_notification.rb
-- lib/flatware/rspec/examples_notification.rb
-- lib/flatware/rspec/formatter.rb
-- lib/flatware/rspec/formatters/console.rb
-- lib/flatware/rspec/summary.rb
+- lib/flatware/pid.rb
 - lib/flatware/serialized_exception.rb
 - lib/flatware/sink.rb
 - lib/flatware/sink/client.rb
-- lib/flatware/socket.rb
 - lib/flatware/version.rb
 - lib/flatware/worker.rb
 homepage: http://github.com/briandunn/flatware
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.6'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: A distributed cucumber and rspec runner
+summary: A distributed rspec and cucumber runner
 test_files: []