cucumber-pro 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130928ede57f9a40d1b22d0e66f3ed254d614aeb
-  data.tar.gz: 00dd538d850dee73f4d8a2caf58858845942274c
+  metadata.gz: f2f9c9dbcd22da3dd2ba2f4425bdedf75ad38e81
+  data.tar.gz: 09b7f4082579620d02cd18ee40a69c478b954c75
 SHA512:
-  metadata.gz: 52da99dc9bfd36bf1369d4f0e4069258bdfc4accde72781f6b63b555d2a239faa4472567eec372c5ece35a8ffd844e9705b513aee222734da7f6a9436c942687
-  data.tar.gz: 76a252ee7416ea06cac3c42743e9ec8b848b2952c788cd85ee0e804739813e887eca56905e2c06b336c19e1809dfff5bd5bd15043ddf9e0d73fcfcea5efb2465
+  metadata.gz: 353dfdd453bed887ec481e1e612e6aaf778fdb5343520dcb7336f292c1c4e64cf1a79fc012c78fe067fba81824f25becbe6fcaa9bbde61ae3602527d4bcf05a7
+  data.tar.gz: 39c8b407a6640993f972b1a04c2537a8b5f3e5488afde5040fee2e2249c88308bb3e4e4f6eedd2d275455a4b82ee0d9a5fb13c84b1a9e0e3d6bd775d7775c266

data/.travis.yml

@@ -0,0 +1,11 @@
+rvm:
+- 2.1.0
+- 2.0.0
+- 1.9.3
+- jruby
+notifications:
+  email:
+  - hello@cucumber.pro
+env:
+  global:
+    secure: GTHou5Qwb0p/hx7pQNg004oZ/PHatnKRQJSjJ0/M6D0REgnd2zVuYD2W6lvFqH5ego5c5+Kcrv8l9f6Iq1XXXotdjN3TiNQhnzbiw/ShEYSNH9HTwRFjJ307nOSRSfyYE2uMUeRnrtowdg2H0W+CG630g9VOnipDAqWm+g7IU0A=

data/README.md

@@ -1,4 +1,5 @@
 # Cucumber Pro Client Gem
+[![Build Status](https://travis-ci.org/cucumber-ltd/cucumber-pro-ruby.svg?branch=master)](https://travis-ci.org/cucumber-ltd/cucumber-pro-ruby.svg?branch=master)
 
 This gem provides a formatter for Cucumber that publishes results to 
 the [Cucumber Pro](https://cucumber.pro) web service.
@@ -14,6 +15,8 @@ gem 'cucumber-pro'
 Now run Cucumber using the `Cucumber::Pro` formatter:
 
 ```
-CUCUMBER_PRO_TOKEN=<your auth token> cucumber -f Cucumber::Pro -f pretty
+CUCUMBER_PRO_TOKEN=<your auth token> cucumber -f Cucumber::Pro -o /dev/null -f pretty
 ```
 
+This will set up a connection to the Cucumber Pro server and stream results as your tests run. If you want to see debug output, replace `/dev/null` with the path to a log file.
+

data/Rakefile

@@ -5,10 +5,16 @@ Bundler::GemHelper.install_tasks
 desc 'Run tests'
 task default: [:rspec, :cucumber]
 
-ENV['cucumber_pro_log_path'] = File.dirname(__FILE__) + '/tmp/test.log'
+# Because https://github.com/eventmachine/eventmachine/issues/34
+if ENV['TRAVIS'] && RUBY_PLATFORM =~ /java/
+  ENV['CUCUMBER_PRO_URL']="ws://results.cucumber.pro/ws"
+end
 
-task :cucumber do
-  sh 'cucumber'
+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 pretty"
 end
 
 task :rspec do

data/TODO.md

@@ -1,5 +1,7 @@
 - Unit tests for Messaging
   - Handle cases where some messages sent are not ack'd
   - Handle cases where some messages sent come back with an error
-- Allow configuration of remote
-
+  - e.g. upgrade your client error
+- Allow configuration of git remote
+- Build against Cucumber 2.0 and 1.3.x
+- SVN support

data/cucumber-pro.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',   '>= 2.14.1'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'aruba'
-  s.add_development_dependency 'thin'
+  s.add_development_dependency 'puma'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'anticipate'
 

data/features/security.feature

@@ -23,5 +23,5 @@ Feature: Security
         Scenario:
           Given passing
       """
-    When I run `cucumber -f Cucumber::Pro -o /dev/null -f pretty`
+    When I run `cucumber -f Cucumber::Pro`
     And the stderr should contain "Missing access token"

data/features/support/aruba.rb

@@ -7,5 +7,6 @@ Before do
 end
 
 Before do
-  @aruba_timeout_seconds = 5
+  @aruba_timeout_seconds = (RUBY_PLATFORM =~ /java/) ? 20 : 10
 end
+

data/features/support/env.rb

@@ -1,2 +1,12 @@
 $logger = Logger.new(ENV['cucumber_pro_log_path'] || STDOUT)
 $logger.debug '--- starting tests ---'
+
+# For some reason JRuby / ChildProcess won't let us delete an environment variable, 
+# but it will let us overwrite it, so we make do with that.
+Before do
+  if RUBY_PLATFORM =~ /java/
+    set_env 'CUCUMBER_PRO_TOKEN', ''
+  else
+    ENV.delete('CUCUMBER_PRO_TOKEN')
+  end
+end

data/features/support/fake_results_service.rb

@@ -1,5 +1,6 @@
 require 'faye/websocket'
 require 'json'
+require 'logger'
 
 module FakeResultsService
   PORT = 5000
@@ -15,59 +16,75 @@ module FakeResultsService
     end
 
     def logger
-      $logger
+      $logger || Logger.new(STDOUT)
     end
   end
 
-  logger = self.logger
+  class SocketApp 
+    def initialize(logger)
+      @logger = logger
+    end
 
-  SocketApp = lambda do |env|
-    logger.debug [:server, :starting]
-    ws = Faye::WebSocket.new(env)
+    def call(env)
+      request = Rack::Request.new(env)
+      params = request.params
+      return [401, [], {}] unless params['token'] == VALID_TOKEN
 
-    ws.on :open do |event|
-      logger.debug [:server, :open]
-    end
+      logger.debug [:server, :starting]
+      ws = Faye::WebSocket.new(env)
 
-    ws.on :message do |event|
-      logger.debug [:server, :message, event.data]
-      FakeResultsService.messages << JSON.parse(event.data)
-      ws.send 'ok'
-    end
+      ws.on :open do |event|
+        logger.debug [:server, :open]
+      end
 
-    ws.on :close do |event|
-      logger.debug [:server, :close]
-    end
+      ws.on :message do |event|
+        logger.debug [:server, :message, event.data]
+        FakeResultsService.messages << JSON.parse(event.data)
+        ws.send 'ok'
+      end
 
-    # Return async Rack response
-    ws.rack_response
-  end
+      ws.on :error do |event|
+        logger.debug [:server, :error, event.code, event.reason]
+      end
 
-  class Security
-    def initialize(app)
-      @app = app
+      ws.on :close do |event|
+        logger.debug [:server, :close]
+      end
+
+      # Return async Rack response
+      ws.rack_response
     end
 
-    def call(env)
-      request = Rack::Request.new(env)
-      params = request.params
-      return [401, [], {}] unless params['token'] == VALID_TOKEN
-      @app.call(env)
+    def log(message)
+      logger.debug(message)
     end
+
+    attr_reader :logger
+    private :logger
   end
 
-  require 'thin'
+  require 'puma'
   require 'rack'
   require 'eventmachine'
-  Faye::WebSocket.load_adapter 'thin'
-  Thin::Logging.logger = logger
   $em = Thread.new do
     begin
       EM.run do
-        thin = Rack::Handler.get('thin')
-        app = Security.new(SocketApp)
-        thin.run app, :Port => PORT
-        trap("INT") { exit }
+        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
       end
     rescue => exception
       logger.fatal(exception)

data/lib/cucumber/pro.rb

@@ -1,14 +1,14 @@
 require 'logger'
 require 'cucumber/pro/formatter'
 require 'cucumber/pro/web_socket/session'
-require 'cucumber/pro/version'
 
 module Cucumber
   module Pro
 
     class << self
       def new(runtime, output, options)
-        session = WebSocket::Session.new(url, logger(output))
+        create_logger(output)
+        session = WebSocket::Session.new(url, logger)
         Formatter.new(session)
       end
 
@@ -18,17 +18,25 @@ module Cucumber
 
       private
 
+      attr_reader :logger
+      private :logger
+
       def config
         @config ||= Config.new
       end
 
       def url
-        token = config.token || raise(Error::MissingToken.new)
         config.url + "?token=#{token}"
       end
 
-      def logger(output)
-        config.logger || Logger.new(output)
+      def create_logger(output)
+        @logger = config.logger || Logger.new(output)
+      end
+
+      def token
+        result = (config.token || '')
+        raise(Error::MissingToken.new) if result.empty?
+        result
       end
     end
 
@@ -38,8 +46,11 @@ module Cucumber
 
     # Default config
     configure do |config|
-      config.url    = 'wss://results.cucumber.pro/ws'
+      config.url    = ENV['CUCUMBER_PRO_URL'] || 'wss://results.cucumber.pro/ws'
       config.token  = ENV['CUCUMBER_PRO_TOKEN']
+      ENV['cucumber_pro_log_path'].tap do |path|
+        config.logger = Logger.new(path) if path
+      end
     end
 
     module Error
@@ -58,5 +69,3 @@ module Cucumber
 
   end
 end
-
-

data/lib/cucumber/pro/formatter.rb

@@ -1,4 +1,5 @@
 require 'cucumber/pro/scm'
+require 'cucumber/pro/info'
 require 'securerandom'
 
 module Cucumber
@@ -57,7 +58,8 @@ module Cucumber
           repo_url: scm.remote,
           branch: scm.branch,
           rev: scm.rev,
-          group: get_run_id
+          group: get_run_id,
+          info: Info.new.to_h
         })
       end
 
@@ -80,7 +82,7 @@ module Cucumber
       end
 
       def get_run_id
-        SecureRandom.hex 
+        SecureRandom.hex
       end
 
     end

data/lib/cucumber/pro/version

@@ -1 +1 @@
-0.0.6
+0.0.7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-pro
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matt Wynne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,6 +143,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -160,7 +161,6 @@ files:
 - lib/cucumber/pro/formatter.rb
 - lib/cucumber/pro/scm.rb
 - lib/cucumber/pro/version
-- lib/cucumber/pro/version.rb
 - lib/cucumber/pro/web_socket/session.rb
 - spec/cucumber/pro/scm/git_repo_spec.rb
 - spec/cucumber/pro/web_socket/worker_spec.rb
@@ -189,7 +189,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: cucumber-pro-0.0.6
+summary: cucumber-pro-0.0.7
 test_files:
 - features/publish_results.feature
 - features/security.feature

data/lib/cucumber/pro/version.rb

@@ -1,9 +0,0 @@
-module Cucumber
-  module Pro
-    class Version
-      def self.to_s
-        "0.0.2"
-      end
-    end
-  end
-end