flatware 0.2.0 → 0.3.0

data/lib/flatware/socket.rb

@@ -0,0 +1,116 @@
+require 'ffi-rzmq'
+
+module Flatware
+  SINK_PORT     = 'ipc://sink'
+  DISPATCH_PORT = 'ipc://dispatch'
+
+  Error = Class.new StandardError
+
+  Job = Struct.new :id, :args do
+    attr_accessor :worker
+  end
+
+  extend self
+
+  def socket(*args)
+    context.socket(*args)
+  end
+
+  def close
+    context.close
+    @context = nil
+  end
+
+  def log(*message)
+    if verbose?
+      $stderr.print "#$0 "
+      $stderr.puts *message
+      $stderr.flush
+    end
+    message
+  end
+
+  attr_writer :verbose
+  def verbose?
+    !!@verbose
+  end
+
+  def context
+    @context ||= Context.new
+  end
+
+  class Context
+    attr_reader :sockets, :c
+
+    def initialize
+      @c = ZMQ::Context.new
+      @sockets = []
+    end
+
+    def socket(type, options={})
+      Socket.new(c.socket(type)).tap do |socket|
+        sockets.push socket
+        if port = options[:connect]
+          socket.connect port
+          sleep 0.05
+        end
+        if port = options[:bind]
+          socket.bind port
+        end
+      end
+    end
+
+    def close
+      sockets.each &:close
+      raise(Error, ZMQ::Util.error_string, caller) unless c.terminate == 0
+      Flatware.log "terminated context"
+    end
+  end
+
+  class Socket
+    attr_reader :s
+    def initialize(socket)
+      @s = socket
+    end
+
+    def setsockopt(*args)
+      s.setsockopt(*args)
+    end
+
+    def send(message)
+      result = s.send_string(Marshal.dump(message))
+      raise Error, ZMQ::Util.error_string, caller if result == -1
+      Flatware.log "#@type #@port send #{message}"
+      message
+    end
+
+    def connect(port)
+      @type = 'connected'
+      @port = port
+      raise(Error, ZMQ::Util.error_string, caller) unless s.connect(port) == 0
+      Flatware.log "connect #@port"
+    end
+
+    def bind(port)
+      @type = 'bound'
+      @port = port
+      raise(Error, ZMQ::Util.error_string, caller) unless s.bind(port) == 0
+      Flatware.log "bind #@port"
+    end
+
+    def close
+      setsockopt ZMQ::LINGER, 0
+      raise(Error, ZMQ::Util.error_string, caller) unless s.close == 0
+      Flatware.log "close #@type #@port"
+    end
+
+    def recv
+      message = ''
+      result = s.recv_string(message)
+      raise Error, ZMQ::Util.error_string, caller if result == -1
+      message = Marshal.load message
+      Flatware.log "#@type #@port recv #{message}"
+      message
+    end
+  end
+end

data/lib/flatware/step_result.rb

@@ -1,3 +1,4 @@
+require 'flatware/serialized_exception'
 module Flatware
   class StepResult
     attr_reader :status, :exception
@@ -22,23 +23,5 @@ module Flatware
     def serialized(e)
       SerializedException.new(e.class, e.message, e.backtrace) if e
     end
-
-    class SerializedException
-      attr_reader :class, :message, :backtrace
-      def initialize(klass, message, backtrace)
-        @class, @message, @backtrace = serialized(klass), message, backtrace
-      end
-
-      private
-      def serialized(klass)
-        SerializedClass.new(klass.to_s)
-      end
-    end
-
-    class SerializedClass
-      attr_reader :name
-      alias to_s name
-      def initialize(name); @name = name end
-    end
   end
 end

data/lib/flatware/version.rb

@@ -1,3 +1,3 @@
 module Flatware
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/flatware/worker.rb

@@ -1,9 +1,15 @@
-require 'benchmark'
 module Flatware
   class Worker
+    attr_reader :id
 
-    def self.listen!
-      new.listen
+    def self.listen!(id=0)
+      new(id).listen
+    end
+
+    def initialize(id)
+      @id       = id
+      @fireable = Fireable.new
+      @task     = Flatware.socket ZMQ::REQ, connect: Dispatcher::PORT
     end
 
     def self.spawn(worker_count)
@@ -11,39 +17,25 @@ module Flatware
         fork do
           $0 = "flatware worker #{i}"
           ENV['TEST_ENV_NUMBER'] = i.to_s
-          listen!
+          listen!(i)
         end
       end
     end
 
     def listen
-      time = Benchmark.realtime do
-        fireable
+      report_for_duty
+      fireable.until_fired task do |job|
+        job.worker = id
+        Sink.started job
+        Cucumber.run job.id, job.args
+        Sink.finished job
         report_for_duty
-        fireable.until_fired task do |job|
-          log 'working!'
-          Cucumber.run job.id, job.args
-          Sink.finished job
-          report_for_duty
-          log 'waiting'
-        end
       end
-      log time
     end
 
     private
 
-    def log(*args)
-      Flatware.log *args
-    end
-
-    def fireable
-      @fireable ||= Fireable.new
-    end
-
-    def task
-      @task ||= Flatware.socket ZMQ::REQ, connect: Dispatcher::PORT
-    end
+    attr_reader :fireable, :task
 
     def report_for_duty
       task.send 'ready'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: flatware
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,13 +112,20 @@ files:
 - lib/flatware/cucumber/runtime.rb
 - lib/flatware/dispatcher.rb
 - lib/flatware/fireable.rb
+- lib/flatware/formatters.rb
+- lib/flatware/formatters/console.rb
+- lib/flatware/formatters/console/summary.rb
+- lib/flatware/formatters/http.rb
+- lib/flatware/pids.rb
+- lib/flatware/poller.rb
 - lib/flatware/processor_info.rb
 - lib/flatware/result.rb
 - lib/flatware/scenario_decorator.rb
 - lib/flatware/scenario_result.rb
+- lib/flatware/serialized_exception.rb
 - lib/flatware/sink.rb
+- lib/flatware/socket.rb
 - lib/flatware/step_result.rb
-- lib/flatware/summary.rb
 - lib/flatware/version.rb
 - lib/flatware/worker.rb
 - LICENSE.txt
@@ -140,26 +134,25 @@ files:
 homepage: http://github.com/briandunn/flatware
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A distributed cucumber runner
 test_files: []

data/lib/flatware/summary.rb

@@ -1,60 +0,0 @@
-require 'cucumber/formatter/console'
-require 'flatware/checkpoint'
-module Flatware
-  class Summary
-    include ::Cucumber::Formatter::Console
-    attr_reader :io, :steps, :scenarios
-
-    def initialize(steps, scenarios=[], io=StringIO.new)
-      @io = io
-      @steps = steps
-      @scenarios = scenarios
-    end
-
-    def summarize
-      2.times { io.puts }
-      print_steps :failed
-      print_failed_scenarios scenarios
-      print_counts 'scenario', scenarios
-      print_counts 'step', steps
-    end
-
-    private
-
-    def print_failed_scenarios(scenarios)
-      return unless scenarios.any? &with_status(:failed)
-
-      io.puts format_string "Failing Scenarios:", :failed
-      scenarios.select(&with_status(:failed)).sort_by(&:file_colon_line).each do |scenario|
-        io.puts format_string(scenario.file_colon_line, :failed) + format_string(" # Scenario: " + scenario.name, :comment)
-      end
-      io.puts
-    end
-
-    def print_steps(status)
-      print_elements steps.select(&with_status(status)), status, 'steps'
-    end
-
-    def print_counts(label, collection)
-      io.puts pluralize(label, collection.size) + count_summary(collection)
-    end
-
-    def pluralize(word, number)
-      "#{number} #{number == 1 ? word : word + 's'}"
-    end
-
-    def with_status(status)
-      proc {|r| r.status == status}
-    end
-
-    def count_summary(results)
-      return "" unless results.any?
-      status_counts = Cucumber::STATUSES.map do |status|
-        count = results.select(&with_status(status)).size
-        format_string "#{count} #{status}", status if count > 0
-      end.compact.join ", "
-
-      " (#{status_counts})"
-    end
-  end
-end