flatware 0.0.4 → 0.1.0

data/README.rdoc

@@ -1,6 +1,9 @@
 = Flatware
 
-Flatware is a a distributed cucumber runner.
+{<img src="https://travis-ci.org/briandunn/flatware.png" />}[https://travis-ci.org/briandunn/flatware]
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/briandunn/flatware]
+
+Flatware is a distributed cucumber runner.
 
 == Requirements
 

data/lib/flatware.rb

@@ -1,29 +1,42 @@
-require 'zmq'
+require 'forwardable'
+require 'ffi-rzmq'
 
 module Flatware
   autoload :CLI, 'flatware/cli'
   autoload :Cucumber, 'flatware/cucumber'
   autoload :Dispatcher, 'flatware/dispatcher'
   autoload :Fireable, 'flatware/fireable'
+  autoload :ProcessorInfo, 'flatware/processor_info'
   autoload :Result, 'flatware/result'
   autoload :ScenarioResult, 'flatware/scenario_result'
   autoload :Sink, 'flatware/sink'
   autoload :StepResult, 'flatware/step_result'
   autoload :Summary, 'flatware/summary'
   autoload :Worker, 'flatware/worker'
+  autoload :ScenarioDecorator, 'flatware/scenario_decorator'
+
+  Error = Class.new StandardError
 
   Job = Struct.new :id, :args
 
   extend self
-  def socket(*args)
-    context.socket(*args).tap do |socket|
+  def socket(type, options={})
+    Socket.new(context.socket(type)).tap do |socket|
       sockets.push socket
+      if port = options[:connect]
+        socket.connect port
+      end
+      if port = options[:bind]
+        socket.bind port
+      end
+      #FIXME: figure out how to do this without waiting
+      sleep 0.05
     end
   end
 
   def close
     sockets.each &:close
-    context.close
+    context.terminate
     @context = nil
   end
 
@@ -47,4 +60,26 @@ module Flatware
   def sockets
     @sockets ||= []
   end
+
+  Socket = Struct.new :s do
+    extend Forwardable
+    def_delegators :s, :bind, :connect, :setsockopt
+    def send(message)
+      result = s.send_string(Marshal.dump(message))
+      raise Error, ZMQ::Util.error_string, caller unless result == 0
+      message
+    end
+
+    def close
+      s.setsockopt(ZMQ::LINGER, 1)
+      s.close
+    end
+
+    def recv
+      message = ''
+      result = s.recv_string(message)
+      raise Error, ZMQ::Util.error_string, caller unless result == 0
+      Marshal.load message
+    end
+  end
 end

data/lib/flatware/checkpoint.rb

@@ -15,8 +15,9 @@ module Flatware
 
     def serialize_scenarios(scenarios)
       scenarios.map do |scenario|
-        ScenarioResult.new scenario.status
+        ScenarioResult.new scenario.status, scenario.file_colon_line, scenario.name
       end
     end
+
   end
 end

data/lib/flatware/cli.rb

@@ -3,7 +3,7 @@ module Flatware
   class CLI < Thor
 
     def self.processors
-      @processors ||= `hostinfo`.match(/^(?<processors>\d+) processors are logically available\.$/)[:processors].to_i
+      @processors ||= ProcessorInfo.count
     end
 
     def self.worker_option

data/lib/flatware/cucumber/formatter.rb

@@ -1,5 +1,6 @@
 require 'cucumber/formatter/console'
 require 'flatware/checkpoint'
+require 'flatware/scenario_decorator'
 module Flatware
   module Cucumber
     class Formatter
@@ -34,7 +35,7 @@ module Flatware
         end
 
         def checkpoint
-          Checkpoint.new(step_mother.steps - @ran_steps, step_mother.scenarios - @ran_scenarios).tap do
+          Checkpoint.new(step_mother.steps - @ran_steps, decorate_scenarios(step_mother.scenarios - @ran_scenarios)).tap do
             snapshot
           end
         end
@@ -45,6 +46,10 @@ module Flatware
           @ran_steps = step_mother.steps.dup
           @ran_scenarios = step_mother.scenarios.dup
         end
+
+        def decorate_scenarios(scenarios)
+          scenarios.map { |scenario| ScenarioDecorator.new(scenario) }
+        end
       end
     end
 

data/lib/flatware/dispatcher.rb

@@ -1,6 +1,6 @@
 module Flatware
   class Dispatcher
-    DISPATCH_PORT = 'ipc://dispatch'
+    PORT = 'ipc://dispatch'
 
     def self.start(jobs=Cucumber.jobs)
       new(jobs).dispatch!
@@ -11,10 +11,10 @@ module Flatware
     end
 
     def dispatch!
-      return Flatware.close if jobs.empty?
+      return if jobs.empty?
       fireable.until_fired dispatch do |request|
         if job = jobs.pop
-          dispatch.send Marshal.dump job
+          dispatch.send job
         else
           dispatch.send 'seppuku'
         end
@@ -30,9 +30,7 @@ module Flatware
     end
 
     def dispatch
-      @dispatch ||= Flatware.socket(ZMQ::REP).tap do |socket|
-        socket.bind DISPATCH_PORT
-      end
+      @dispatch ||= Flatware.socket ZMQ::REP, bind: PORT
     end
   end
 end

data/lib/flatware/fireable.rb

@@ -1,22 +1,50 @@
 module Flatware
   class Fireable
+    PORT = 'ipc://die'
+
+    def self.bind
+      @kill = Flatware.socket(ZMQ::PUB, bind: PORT)
+    end
+
+    def self.kill
+      @kill.send 'seppuku'
+    end
+
     def initialize
-      @die = Flatware.socket(ZMQ::SUB).tap do |die|
-        die.connect 'ipc://die'
+      @die = Flatware.socket(ZMQ::SUB, connect: PORT).tap do |die|
         die.setsockopt ZMQ::SUBSCRIBE, ''
       end
     end
 
     attr_reader :die
 
-    def until_fired(sockets=[], &block)
-      while ready = ZMQ.select(Array(sockets) + [die])
-        messages = ready.flatten.compact.map(&:recv)
-        break if messages.include? 'seppuku'
-        messages.each &block
+    def until_fired(socket, &block)
+      poller = Poller.new socket, die
+      poller.each do |message|
+        break if message == 'seppuku'
+        block.call message
       end
     ensure
       Flatware.close
     end
   end
+
+  class Poller
+    attr_reader :sockets
+    def initialize(*sockets)
+      @sockets = sockets
+    end
+
+    def each(&block)
+      poller = ZMQ::Poller.new
+      for socket in sockets
+        poller.register_readable socket.s
+      end
+      while poller.poll > 0
+        poller.readables.each do |s|
+          block.call Socket.new(s).recv
+        end
+      end
+    end
+  end
 end

data/lib/flatware/processor_info.rb

@@ -0,0 +1,20 @@
+module Flatware
+  class ProcessorInfo
+    def count
+      case operating_system
+      when 'Darwin'
+        `hostinfo`.match(/^(?<processors>\d+) processors are logically available\.$/)[:processors].to_i
+      when 'Linux'
+        `grep --count '^processor' /proc/cpuinfo`.to_i
+      end
+    end
+
+    def operating_system
+      `uname`.chomp
+    end
+
+    def self.count
+      new.count
+    end
+  end
+end

data/lib/flatware/scenario_decorator.rb

@@ -0,0 +1,24 @@
+module Flatware
+  class ScenarioDecorator
+    attr_reader :status
+
+    def initialize(scenario)
+      @scenario, @status = scenario, scenario.status
+      @scenario = scenario.scenario_outline if example_row?
+    end
+
+    def name
+      @scenario.name
+    end
+
+    def file_colon_line
+      @scenario.file_colon_line
+    end
+
+    private
+
+    def example_row?
+      @scenario.respond_to? :scenario_outline
+    end
+  end
+end

data/lib/flatware/scenario_result.rb

@@ -1,8 +1,10 @@
 module Flatware
   class ScenarioResult
-    attr_reader :status
-    def initialize(status)
+    attr_reader :status, :file_colon_line, :name
+    def initialize(status, file_colon_line, name)
       @status = status
+      @file_colon_line = file_colon_line
+      @name = name
     end
 
     def passed?

data/lib/flatware/sink.rb

@@ -2,9 +2,10 @@ require 'flatware'
 require 'flatware/cucumber/formatter'
 module Flatware
   class Sink
+    PORT = 'ipc://sink'
     class << self
       def push(message)
-        client.push Marshal.dump message
+        client.push message
       end
 
       def finished(job)
@@ -29,6 +30,7 @@ module Flatware
         trap 'INT' do
           summarize
           summarize_remaining
+          exit 1
         end
 
         before_firing { listen }
@@ -38,7 +40,7 @@ module Flatware
       def listen
         until done?
           message = socket.recv
-          case (result = Marshal.load message)
+          case (result = message)
           when Result
             print result.progress
           when Checkpoint
@@ -47,11 +49,11 @@ module Flatware
             completed_jobs << result
             log "COMPLETED SCENARIO"
           else
-            log "i don't know that message, bro."
+            log "i don't know that message, bro.", message
           end
         end
         summarize
-      rescue ZMQ::Error => e
+      rescue Error => e
         raise unless e.message == "Interrupted system call"
       end
 
@@ -87,11 +89,9 @@ module Flatware
       end
 
       def before_firing(&block)
-        die = Flatware.socket(ZMQ::PUB).tap do |socket|
-          socket.bind 'ipc://die'
-        end
+        Flatware::Fireable::bind
         block.call
-        die.send 'seppuku'
+        Flatware::Fireable::kill
       end
 
       def checkpoints
@@ -116,9 +116,7 @@ module Flatware
       end
 
       def socket
-        @socket ||= Flatware.socket(ZMQ::PULL).tap do |socket|
-          socket.bind 'ipc://sink'
-        end
+        @socket ||= Flatware.socket(ZMQ::PULL, bind: PORT)
       end
     end
 
@@ -130,9 +128,7 @@ module Flatware
       private
 
       def socket
-        @socket ||= Flatware.socket(ZMQ::PUSH).tap do |socket|
-          socket.connect 'ipc://sink'
-        end
+        @socket ||= Flatware.socket(ZMQ::PUSH, connect: PORT)
       end
     end
   end

data/lib/flatware/summary.rb

@@ -14,12 +14,23 @@ module Flatware
     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

data/lib/flatware/version.rb

@@ -1,3 +1,3 @@
 module Flatware
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/lib/flatware/worker.rb

@@ -20,8 +20,7 @@ module Flatware
       time = Benchmark.realtime do
         fireable
         report_for_duty
-        fireable.until_fired task do |work|
-          job = Marshal.load work
+        fireable.until_fired task do |job|
           log 'working!'
           Cucumber.run job.id, job.args
           Sink.finished job
@@ -43,9 +42,7 @@ module Flatware
     end
 
     def task
-      @task ||= Flatware.socket(ZMQ::REQ).tap do |task|
-        task.connect Dispatcher::DISPATCH_PORT
-      end
+      @task ||= Flatware.socket ZMQ::REQ, connect: Dispatcher::PORT
     end
 
     def report_for_duty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flatware
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zmq
+  name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -64,49 +64,49 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 description: A distributed cucumber runner
 email: brian@hashrocket.com
 executables:
@@ -124,7 +124,9 @@ files:
 - lib/flatware/cucumber/runtime.rb
 - lib/flatware/dispatcher.rb
 - lib/flatware/fireable.rb
+- lib/flatware/processor_info.rb
 - lib/flatware/result.rb
+- lib/flatware/scenario_decorator.rb
 - lib/flatware/scenario_result.rb
 - lib/flatware/sink.rb
 - lib/flatware/step_result.rb
@@ -155,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A distributed cucumber runner