flatware 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a71ce8a23e22600391980c40aac3425a1efd27
-  data.tar.gz: '082d74e5882c2cb99bfc4af567618e70817bb08d'
+  metadata.gz: 05e90320723eb9d0bcfb63d679ab20fefcf959d6
+  data.tar.gz: 246b6941233445b4049b195841a09a312ab688a5
 SHA512:
-  metadata.gz: c591c042ab1bae59ba7e25309ceae39ca389f60b1d6f340882db31e3b0806e9acd0a8dfaa512e5529a2f1f636c297c9ba5335e247d3de3b65b90e3929b2adbf3
-  data.tar.gz: 33043b7af9e2d929e7a99c8e53c127ac9bbc4bb366f78e74ae32e53432980d64bb2b61aa7eecf818b2611df25da68d12c0ff975a463125b35748c4227d22ab16
+  metadata.gz: 85b3f22abdd35c210aee7063073ac27b6fe77d8db1ac7488dea8ee62ea11fab16eccbbef10b57d049833ec3b49ba388a9719c003d9241287d0a03b7ebcf2992c
+  data.tar.gz: 62e93337c7304ec941196dfc5d959e0bbc20acdda6dc45ea136b6748bc6cb61809b8e5943f842dfed521dd27b6fd9d6db4a7fc4e40cf2d8881ffb2f6911792a8

data/README.md

@@ -25,11 +25,18 @@ sudo apt-get install -qq libzmq3-dev
 
 #### Mac OSX
 
-Ruby FFI isn't getting along with the latest ZMQ formula. A tweaked verson is available in the Hashrocket tap.
+
+If you're on macOS 10.12, use the custom hashrocket ZMQ homebrew formula.
 
 ```sh
 brew tap hashrocket/formulas
 brew install hashrocket/formulas/zeromq
+```
+
+The stock homebrew version will likely work on older versions of macOS.
+
+
+```sh
 brew install zeromq
 ```
 
@@ -38,8 +45,8 @@ brew install zeromq
 Add the runners you need to your Gemfile:
 
 ```ruby
-gem 'flatware-rspec'    # one
-gem 'flatware-cucumber' # or both
+gem 'flatware-rspec', require: false    # one
+gem 'flatware-cucumber', require: false # or both
 ```
 
 then run

data/lib/flatware.rb

@@ -1,5 +1,6 @@
 module Flatware
   require 'flatware/processor_info'
+  require 'flatware/job'
   require 'flatware/cli'
   require 'flatware/poller'
   require 'flatware/sink'

data/lib/flatware/cucumber.rb

@@ -1,5 +1,4 @@
 require 'cucumber'
-require 'flatware/cucumber/checkpoint'
 require 'flatware/cucumber/formatter'
 require 'flatware/cucumber/result'
 require 'flatware/cucumber/scenario_result'

data/lib/flatware/cucumber/formatters/console/summary.rb

@@ -1,6 +1,5 @@
 require 'cucumber/formatter/console'
 require 'flatware/cucumber/formatters/console'
-require 'flatware/cucumber/checkpoint'
 
 module Flatware::Cucumber::Formatters
   class Console

data/lib/flatware/job.rb

@@ -0,0 +1,10 @@
+module Flatware
+  Job = Struct.new :id, :args do
+    attr_accessor :worker
+    attr_writer :failed
+
+    def failed?
+      !!@failed
+    end
+  end
+end

data/lib/flatware/rspec/summary.rb

@@ -1,8 +1,6 @@
 require 'rspec/core/notifications'
 module Flatware
   module RSpec
-    Summary = Struct.new(:duration, :examples, :failed_examples, :pending_examples, :load_time)
-
     class Example
       attr_reader :location_rerun_argument, :full_description
       def initialize(rspec_example)
@@ -11,21 +9,9 @@ module Flatware
       end
     end
 
-    class Summary
+    class Summary < ::RSpec::Core::Notifications::SummaryNotification
       def +(other)
-        self.class.new duration + other.duration,
-          examples + other.examples,
-          failed_examples + other.failed_examples,
-          pending_examples + other.pending_examples,
-          load_time + other.load_time
-      end
-
-      def fully_formatted
-        ::RSpec::Core::Notifications::SummaryNotification.new(duration, examples, failed_examples, pending_examples, load_time).fully_formatted
-      end
-
-      def failure_count
-        failed_examples.size
+        self.class.new(*zip(other).map {|a,b| a + b})
       end
 
       def self.from_notification(summary)
@@ -33,7 +19,7 @@ module Flatware
           examples.map(&Example.method(:new))
         end
 
-        new summary.duration, *serialized_examples, summary.load_time
+        new summary.duration, *serialized_examples, *summary.to_a[4..-1]
       end
     end
   end

data/lib/flatware/socket.rb

@@ -5,15 +5,6 @@ require 'logger'
 module Flatware
   Error = Class.new StandardError
 
-  Job = Struct.new :id, :args do
-    attr_accessor :worker
-    attr_writer :failed
-
-    def failed?
-      !!@failed
-    end
-  end
-
   extend self
 
   def logger
@@ -38,8 +29,8 @@ module Flatware
     close force: true
   end
 
-  def socket_error
-    raise(Error, ZMQ::Util.error_string, caller) unless @ignore_errors
+  def socket_error(name=nil)
+    raise(Error, [$0,name,ZMQ::Util.error_string].compact.join(' - '), caller) unless @ignore_errors
   end
 
   def log(*message)
@@ -88,7 +79,7 @@ module Flatware
         socket.setsockopt ZMQ::LINGER, 0
       end if force
       sockets.each(&:close)
-      Flatware::socket_error unless c.terminate == 0
+      Flatware::socket_error unless LibZMQ.zmq_term(c.context) == 0
       Flatware.log "terminated context"
     end
   end
@@ -110,7 +101,7 @@ module Flatware
 
     def send(message)
       result = socket.send_string(Marshal.dump(message))
-      Flatware::socket_error if result == -1
+      error if result == -1
       Flatware.log "#@type #@port send #{message}"
       message
     end
@@ -118,7 +109,7 @@ module Flatware
     def connect(port)
       @type = 'connected'
       @port = port
-      Flatware::socket_error unless socket.connect(port) == 0
+      error unless socket.connect(port) == 0
       Flatware.log "connect #@port"
     end
 
@@ -154,20 +145,24 @@ module Flatware
     def bind(port)
       @type = 'bound'
       @port = port
-      Flatware::socket_error unless socket.bind(port) == 0
+      error unless socket.bind(port) == 0
       Flatware.log "bind #@port"
     end
 
     def close
-      Flatware::socket_error unless socket.close == 0
+      error unless socket.close == 0
       Flatware.log "close #@type #@port"
     end
 
+    def error
+      Flatware::socket_error name
+    end
+
     def recv(block: true, marshal: true)
       message = ''
       if block
        result = socket.recv_string(message)
-       Flatware::socket_error if result == -1
+       error if result == -1
       else
         socket.recv_string(message, ZMQ::NOBLOCK)
       end

data/lib/flatware/version.rb

@@ -1,3 +1,3 @@
 module Flatware
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/flatware/worker.rb

@@ -48,7 +48,7 @@ module Flatware
 
     private
 
-    attr_reader :fireable, :task, :sink, :runner
+    attr_reader :task, :sink, :runner
 
     def report_for_duty
       task.send [:ready, id]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatware
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Brian Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
@@ -84,7 +84,6 @@ files:
 - lib/flatware/broadcaster.rb
 - lib/flatware/cli.rb
 - lib/flatware/cucumber.rb
-- lib/flatware/cucumber/checkpoint.rb
 - lib/flatware/cucumber/cli.rb
 - lib/flatware/cucumber/formatter.rb
 - lib/flatware/cucumber/formatters/console.rb
@@ -93,6 +92,7 @@ files:
 - lib/flatware/cucumber/runtime.rb
 - lib/flatware/cucumber/scenario_result.rb
 - lib/flatware/cucumber/step_result.rb
+- lib/flatware/job.rb
 - lib/flatware/pids.rb
 - lib/flatware/poller.rb
 - lib/flatware/processor_info.rb
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A distributed cucumber and rspec runner

data/lib/flatware/cucumber/checkpoint.rb

@@ -1,28 +0,0 @@
-module Flatware
-  module Cucumber
-    class Checkpoint
-      attr_reader :steps, :scenarios
-      def initialize(steps, scenarios)
-        @steps, @scenarios = serialize_steps(steps), serialize_scenarios(scenarios)
-      end
-
-      def failures?
-        scenarios.any? &:failed?
-      end
-
-      private
-
-      def serialize_steps(steps)
-        steps.map do |step|
-          StepResult.new step.status, step.exception
-        end
-      end
-
-      def serialize_scenarios(scenarios)
-        scenarios.map do |scenario|
-          ScenarioResult.new scenario.status, scenario.file_colon_line, scenario.name, scenario.exception
-        end
-      end
-    end
-  end
-end