cucumber-pro 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b480901553d723dcc5d4df5f5cbf69556af33d63
-  data.tar.gz: b4af2756d621c2f543d15dd8b3a97e69718ae5d8
+  metadata.gz: 263eba42f9bdf5752a70ddf321e173fb46124ffc
+  data.tar.gz: 169aebfa7f2d996db5545b0661488f05bec50d47
 SHA512:
-  metadata.gz: db68949da991567d0d4f45e026b17c0960cd2a409f1790b8bbb26781d6ad5e105ca9b4038792410b193348d3bbfa2fdbcb1aa42f302760a02da1674bcc2dc855
-  data.tar.gz: 469d4188973e72533ef6eb14d812f468ac6f3e6908d8e125c34fd47e54e18defa07fa54d5032daa08c0890fec16264dfe8ce84adae304c632e2c3b3b71642c83
+  metadata.gz: de0c85a53cecb8764eb891ca33f370694c1a025c923f2dd2e08c514df1feb0c32f7025f31053742c25f1a5b0fdebe237b7749cddb5637fce40c5ee828c0e7650
+  data.tar.gz: 4383cb91d845ed6105e94c3c7a6136f556c2cb9d47c1d9f823bc828a165dacb8e0658cf61127f200127afcb2a4f44a45e274d74d8d450f0d722b0e6d36e122b5

data/HISTORY.md

@@ -1,3 +1,7 @@
+## [0.0.15](https://github.com/cucumber-ltd/cucumber-pro-ruby/compare/v0.0.14...v0.0.15) (2014-09-03)
+
+* Print server errors to users.
+
 ## [0.0.14](https://github.com/cucumber-ltd/cucumber-pro-ruby/compare/v0.0.13...v0.0.14) (2014-09-02)
 
 * Only publish results if we detect a CI environment.

data/cucumber.yml

@@ -1 +1 @@
-default: --format Cucumber::Pro --out /dev/null
+default: --format pretty --format Cucumber::Pro --out /dev/null

data/features/support/fake_results_service.rb

@@ -1,6 +1,7 @@
 require 'faye/websocket'
 require 'json'
 require 'logger'
+require 'cucumber/pro'
 
 module FakeResultsService
   PORT = 5000
@@ -20,7 +21,7 @@ module FakeResultsService
     end
   end
 
-  class SocketApp 
+  class SocketApp
     def initialize(logger)
       @logger = logger
     end
@@ -40,7 +41,7 @@ module FakeResultsService
       ws.on :message do |event|
         logger.debug [:server, :message, event.data]
         FakeResultsService.messages << JSON.parse(event.data)
-        ws.send 'ok'
+        ws.send '{}'
       end
 
       ws.on :error do |event|
@@ -71,7 +72,7 @@ module FakeResultsService
     server = Puma::Server.new(app, events)
     server.binder = binder
     server.run
-    trap("INT") do 
+    trap("INT") do
       puts "Stopping..."
       server.stop(true)
       EM.stop_event_loop
@@ -90,7 +91,13 @@ module FakeResultsService
   $em = Thread.new do
     begin
       failing_after(3).tries do
-        EM.run &run_em_server
+        begin
+          EM.run &run_em_server
+        rescue Cucumber::Pro::Error::ServerError => exception
+          logger.fatal(exception)
+          $stderr.puts exception, exception.backtrace
+          exit 1
+        end
       end
     rescue => exception
       logger.fatal(exception)

data/lib/cucumber/pro.rb

@@ -12,7 +12,7 @@ module Cucumber
         working_copy = Scm::WorkingCopy.detect
 
         if should_publish
-          working_copy.check_clean
+          working_copy.check_clean if config.should_check_clean
           session = WebSocket::Session.new(url, logger, timeout: config.timeout)
         else
           session = WebSocket::NullSession.new
@@ -52,7 +52,7 @@ module Cucumber
     end
 
     class Config
-      attr_accessor :url, :logger, :token, :should_publish, :timeout, :build_number
+      attr_accessor :url, :logger, :token, :should_publish, :should_check_clean,:timeout, :build_number
     end
 
     # Default config
@@ -61,6 +61,7 @@ module Cucumber
       config.token   = ENV['CUCUMBER_PRO_TOKEN']
       config.build_number = ENV['BUILD_NUMBER'] || ENV['CIRCLE_BUILD_NUM'] || ENV['TRAVIS_JOB_NUMBER'] || ENV['bamboo.buildNumber'] || ENV['CI_BUILD_NUMBER']
       config.should_publish = config.token && (config.build_number || ENV['CI'])
+      config.should_check_clean = ENV['CUCUMBER_PRO_IGNORE_DIRTY'].nil?
       config.timeout = 5
       if file = ENV['CUCUMBER_PRO_LOG_FILE']
         config.logger = Logger.new(file)

data/lib/cucumber/pro/errors.rb

@@ -13,6 +13,8 @@ module Cucumber
           super "Timed out waiting for a reply from the Cucumber Pro server."
         end
       }
+
+      ServerError = Class.new(StandardError)
     end
 
   end

data/lib/cucumber/pro/version

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/cucumber/pro/web_socket/session.rb

@@ -135,6 +135,10 @@ module Cucumber
         def on_message(event)
           logger.debug [:ws, :message, event.data]
           @ack_count -= 1
+          message = JSON.parse(event.data)
+          if(message['error'])
+            raise Error::ServerError.new(message['error'])
+          end
           self
         end
 

data/spec/cucumber/pro/web_socket/worker_spec.rb

@@ -37,7 +37,25 @@ module Cucumber::Pro
         end
       end
 
-      it "throws an error if the server responds with an error"
+      it "throws an error if the server responds with an error" do
+        worker.send(good_data)
+        worker.close
+        eventually do
+          expect(socket.data.last).to eq good_data
+        end
+        eventually do
+          expect( worker ).to_not be_closed
+        end
+        begin
+          socket.send_error
+          fail
+        rescue => expected
+          expect(expected.message).to eq('an error happened on the server')
+          eventually do
+            expect( worker ).to be_closed
+          end
+        end
+      end
 
       def create_fake_socket(worker)
         socket.worker = worker
@@ -72,6 +90,11 @@ module Cucumber::Pro
           worker.method(:on_message).call(event)
         end
 
+        def send_error
+          event = ws_event(1000, { 'error' => 'an error happened on the server' })
+          worker.method(:on_message).call(event)
+        end
+
         def data
           @data ||= []
           while !@q.empty?
@@ -83,7 +106,7 @@ module Cucumber::Pro
         private
 
         def ws_event(code, data = {})
-          double('ws event', code: 1000, data: data)
+          double('ws event', code: 1000, data: data.to_json)
         end
 
       end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-pro
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: anticipate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library for publishing results to the Cucumber Pro service
@@ -142,8 +142,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .rspec
-- .travis.yml
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - HISTORY.md
@@ -176,17 +176,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -194,7 +194,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: cucumber-pro-0.0.14
+summary: cucumber-pro-0.0.15
 test_files:
 - features/publish_results.feature
 - features/security.feature
@@ -206,3 +206,4 @@ test_files:
 - spec/cucumber/pro/info_spec.rb
 - spec/cucumber/pro/scm/git_working_copy_spec.rb
 - spec/cucumber/pro/web_socket/worker_spec.rb
+has_rdoc: