cucumber-pro 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1ea22ade2589bfaba0ea2b8b452133995630c9
-  data.tar.gz: 31a0837902dfacd353adf063083d2a5c6d9d1681
+  metadata.gz: 35dcec69d5a9599d4d30a57ba1edc2d3a7a0d636
+  data.tar.gz: b0b5af3ce80e5f81180ecf337a35ababbd919933
 SHA512:
-  metadata.gz: 3ba8796ca612b363c444fb9308687d6dfdcc66e0620eb2d197e9461dacec93bb019cb2a5d13d9621d62753ac70113bc09b66183a02d528d4bc71e22c02b2a401
-  data.tar.gz: 4f3a0bf99cdd27ac75142da244443a1f5378b03e36cf66be3a2fed14db919d82d4fa5110635600b2a85d749bd0c79a74f8db810fd3503cd8b863dfcf7d197149
+  metadata.gz: ed859c503bdd207631bc765d19c3432694c0434bc75637428bf8f8b5baf0f7c957411f59054db35459b89108f90e7c0605b1cc4edb15938c942ab0570b2d6c93
+  data.tar.gz: 4f5b098807e4539ba050640fbf354e28b0d1fa63f326faa1471e213e5e5668c4f9c4207f38e8e3730e7afad22137c191687cb21f94584fe44a6d91c6eb442d40

data/Rakefile

@@ -13,7 +13,7 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = ""
-  t.cucumber_opts = "--format Cucumber::Pro --out cucumber-pro.log" if ENV['CUCUMBER_PRO_TOKEN']
+  t.cucumber_opts = "--format Cucumber::Pro --out cucumber-pro.log"
   t.cucumber_opts << "--format pretty"
 end
 

data/features/security.feature

@@ -14,14 +14,3 @@ Feature: Security
       | CUCUMBER_PRO_TOKEN | invalid-token |
     And I run `cucumber -f Cucumber::Pro -o /dev/null -f pretty`
     And the stderr should contain "Access denied"
-
-  Scenario: No access token
-    Given a git repo
-    And a feature "features/test.feature" with:
-      """
-      Feature:
-        Scenario:
-          Given passing
-      """
-    When I run `cucumber -f Cucumber::Pro`
-    And the stderr should contain "Missing access token"

data/features/step_definitions/steps.rb

@@ -15,7 +15,13 @@ Given(/^a git repo$/) do
   run_simple "git config user.name \"Test user\""
   run_simple "git commit --allow-empty -m 'Initial commit'"
   run_simple "git remote add origin #{repo_url}"
-  run_simple "git config --get remote.origin.url"
+  # TODO: this is an experiment to fix flickering build on CI. May not be required.
+  # wait for the git repo to be created before continuing
+  eventually do
+    run "git config --get remote.origin.url" do |process|
+      expect(process.output.strip).to eq repo_url
+    end
+  end
 end
 
 Given(/^a feature "(.*?)" with:$/) do |path, content|
@@ -24,9 +30,9 @@ end
 
 Then(/^the results service should receive a header$/) do
   eventually do
-    results_service.messages.length.should > 0
+    expect(results_service.messages.length).to be > 0
   end
-  results_service.messages.first['repo_url'].should == repo_url
+  expect(results_service.messages.first['repo_url']).to eq repo_url
 end
 
 Then(/^the results service should receive these ([\w\-]+) results:$/) do |type, results|

data/features/support/fake_results_service.rb

@@ -63,28 +63,34 @@ module FakeResultsService
     private :logger
   end
 
+  run_em_server = -> {
+    app = SocketApp.new(FakeResultsService.logger)
+    events = Puma::Events.new(StringIO.new, StringIO.new)
+    binder = Puma::Binder.new(events)
+    binder.parse(["tcp://0.0.0.0:#{PORT}"], app)
+    server = Puma::Server.new(app, events)
+    server.binder = binder
+    server.run
+    trap("INT") do 
+      puts "Stopping..."
+      server.stop(true)
+      EM.stop_event_loop
+      exit
+    end
+    at_exit do
+      server.stop(true)
+    end
+  }
+
   require 'puma'
   require 'rack'
   require 'eventmachine'
+  require 'anticipate'
+  extend Anticipate
   $em = Thread.new do
     begin
-      EM.run do
-        app = SocketApp.new(FakeResultsService.logger)
-        events = Puma::Events.new(StringIO.new, StringIO.new)
-        binder = Puma::Binder.new(events)
-        binder.parse(["tcp://0.0.0.0:#{PORT}"], app)
-        server = Puma::Server.new(app, events)
-        server.binder = binder
-        server.run
-        trap("INT") do 
-          puts "Stopping..."
-          server.stop(true)
-          EM.stop_event_loop
-          exit
-        end
-        at_exit do
-          server.stop(true)
-        end
+      failing_after(3).tries do
+        EM.run &run_em_server
       end
     rescue => exception
       logger.fatal(exception)

data/lib/cucumber/pro.rb

@@ -5,12 +5,20 @@ require 'cucumber/pro/errors'
 
 module Cucumber
   module Pro
-
     class << self
       def new(runtime, output, options)
         create_logger(output)
-        session = WebSocket::Session.new(url, logger, timeout: config.timeout)
-        Formatter.new(session)
+
+        working_copy = Scm::WorkingCopy.detect
+
+        if token
+          working_copy.check_clean
+          session = WebSocket::Session.new(url, logger, timeout: config.timeout)
+        else
+          session = WebSocket::NullSession.new
+        end
+
+        Formatter.new(session, working_copy)
       end
 
       def configure
@@ -35,9 +43,7 @@ module Cucumber
       end
 
       def token
-        result = (config.token || '')
-        raise(Error::MissingToken.new) if result.empty?
-        result
+        config.token
       end
     end
 

data/lib/cucumber/pro/errors.rb

@@ -8,12 +8,6 @@ module Cucumber
         end
       }
 
-      MissingToken = Class.new(StandardError) {
-        def initialize
-          super "Missing access token. Please visit https://app.cucumber.pro/my/profile for instructions."
-        end
-      }
-
       Timeout = Class.new(StandardError) {
         def initialize
           super "Timed out waiting for a reply from the Cucumber Pro server."

data/lib/cucumber/pro/formatter.rb

@@ -6,8 +6,9 @@ module Cucumber
   module Pro
 
     class Formatter
-      def initialize(session)
+      def initialize(session, working_copy)
         @session = session
+        @working_copy = working_copy
         send_header
       end
 
@@ -53,19 +54,17 @@ module Cucumber
       private
 
       def send_header
-        working_copy = Scm::WorkingCopy.detect
-        working_copy.check_clean
-        @session.send({
-          repo_url: working_copy.repo_url,
-          branch: working_copy.branch,
-          rev: working_copy.rev,
+        @session.send_message({
+          repo_url: @working_copy.repo_url,
+          branch: @working_copy.branch,
+          rev: @working_copy.rev,
           group: get_run_id,
           info: Info.new.to_h
         })
       end
 
       def send_step_result(path, line, status)
-        @session.send({
+        @session.send_message({
           path: path,
           location: line.to_i,
           mime_type: 'application/vnd.cucumber.test-step-result+json',
@@ -74,7 +73,7 @@ module Cucumber
       end
 
       def send_test_case_result(path, line, status)
-        @session.send({
+        @session.send_message({
           path: path,
           location: line.to_i,
           mime_type: 'application/vnd.cucumber-pro.test-case-result+json',

data/lib/cucumber/pro/version

@@ -1 +1 @@
-0.0.12
+0.0.13

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

@@ -6,6 +6,13 @@ require 'cucumber/pro/errors'
 module Cucumber
   module Pro
     module WebSocket
+      class NullSession
+        def send_message(message)
+        end
+
+        def close
+        end
+      end
 
       class Session
 
@@ -23,7 +30,7 @@ module Cucumber
           @socket = Worker.new(create_socket, logger, self, options)
         end
 
-        def send(message)
+        def send_message(message)
           logger.debug [:session, :send, message]
           socket.send(message.to_json)
           self

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

@@ -17,7 +17,7 @@ module Cucumber::Pro
         worker.send(good_data)
         worker.close
         eventually do
-          socket.data.last.should == good_data
+          expect(socket.data.last).to eq good_data
         end
         eventually do
           expect( worker ).to_not be_closed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-pro
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -191,7 +191,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: cucumber-pro-0.0.12
+summary: cucumber-pro-0.0.13
 test_files:
 - features/publish_results.feature
 - features/security.feature