probedock-cucumber 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a99b927ad1d4edd9c1c4a90c407b8a4743d262
-  data.tar.gz: 3e264ed7f2ec4beb507fe2b472c0fafa06d4bf0e
+  metadata.gz: 3b8a22ced5c64326d8fe13be2993089380e56a6b
+  data.tar.gz: 60576e7c51c2f57a15161f1862415b8f6a0cb55a
 SHA512:
-  metadata.gz: cdc350bb64b6b7a8630d76c36bd8df034d5c41512ae51480fb8ee3abf7905bd7279a6b0db44fc35aa2f7eebfa72dc3c1ace97b4d8e77da81d5bb5a044c78608d
-  data.tar.gz: 21b1f8676d432f3276a92c26fafb7dbb363cfc1a612cb2e50337625d55a29ef3913c16e88c5e2ad641fb47f31e0d515a8c3914f8dccbc045f89da5b28ae0a1eb
+  metadata.gz: 0adc1369ff54f454bbe6f29b191114d41a73412dfc7ec459476e579a7e2cddab597768899a1b8da739da5225d0e4a83898aed2048900815f8e848382fcf21435
+  data.tar.gz: 797546ca2ed0ae4ff7793e631f4af281d7cdd6b37ac5550d5b6f6e11a9d293f777b68f3a212c154242131384eb9ab6ce7910393c2ef4918a2c40b4a6d87bfaba

data/Gemfile

@@ -3,13 +3,13 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem 'probedock-ruby', '~> 0.1'
+gem 'probedock-ruby', '~> 0.2.1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'jeweler', '~> 2.0'
-  gem 'rake-version', '~> 0.4'
+  gem 'rake-version', '~> 1.0'
   gem 'simplecov', '~> 0.10', require: false
   gem 'fakefs', '~> 0.6', require: 'fakefs/safe'
   gem 'rspec', '~> 3.1'

data/README.md

@@ -8,16 +8,34 @@
 [![Coverage Status](https://coveralls.io/repos/probedock/probedock-cucumber-ruby/badge.svg)](https://coveralls.io/r/probedock/probedock-cucumber-ruby?branch=master)
 [![License](https://img.shields.io/github/license/probedock/probedock-cucumber-ruby.svg)](LICENSE.txt)
 
+
+
 ## Installation
 
 In your Gemfile:
 
 ```rb
-gem 'probedock-cucumber', '~> 0.1.1'
+gem 'probedock-cucumber', '~> 0.1.2'
 ```
 
 Then run `bundle install`.
 
+
+
+## Usage
+
+In your specification configuration file, configure the probe:
+
+```rb
+ProbeDockCucumber.configure do |config|
+  config.project.category = 'Cucumber'
+end
+```
+
+With [cucumber-rails](https://github.com/cucumber/cucumber-rails), the configuration file is `features/support/env.rb` with the default setup.
+
+
+
 ## Contributing
 
 * [Fork](https://help.github.com/articles/fork-a-repo)
@@ -27,6 +45,8 @@ Then run `bundle install`.
 
 Please add a [changelog](CHANGELOG.md) entry with your name for new features and bug fixes.
 
+
+
 ## License
 
 Probe Dock Cucumber is licensed under the [MIT License](http://opensource.org/licenses/MIT).

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/probe_dock_cucumber.rb

@@ -2,7 +2,7 @@
 require 'probedock-ruby'
 
 module ProbeDockCucumber
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   class Error < StandardError; end
 end

data/lib/probe_dock_cucumber/config.rb

@@ -1,6 +1,15 @@
 module ProbeDockCucumber
+  def self.config
+    @config ||= ProbeDockProbe::Config.new
+  end
+
+  def self.config= config
+    @config = config
+  end
+
   def self.configure options = {}, &block
-    ProbeDockProbe.config.load! &block
-    ProbeDockProbe.config
+    config.project.category = 'Cucumber'
+    config.load! &block
+    config
   end
 end

data/lib/probe_dock_cucumber/formatter.rb

@@ -32,14 +32,15 @@ require 'digest/sha1'
 module ProbeDockCucumber
   class Formatter
 
-    def initialize step_mother, io, options
+    def initialize(step_mother, io, options)
 
       # Initialize the Probe Dock client and an empty test run.
-      config = ProbeDockProbe.config
-      @client = ProbeDockProbe::Client.new config.server, config.client_options
-      @test_run = ProbeDockProbe::TestRun.new config.project
+      config = ProbeDockCucumber.config
+      @client = ProbeDockProbe::Client.new(config.server, config.client_options)
+      @test_run = ProbeDockProbe::TestRun.new(config.project)
 
       # Current feature data.
+      @current_feature_started = false
       @current_feature = nil
       @current_feature_tags = []
 
@@ -50,12 +51,12 @@ module ProbeDockCucumber
     end
 
     # Called when the test suite starts.
-    def before_features *args
+    def before_features(*args)
       @suite_start_time = Time.now
     end
 
     # Called before each feature is tested.
-    def before_feature feature, *args
+    def before_feature(feature, *args)
 
       # Store the first line of the feature's description.
       # It will be used in #add_result to build the complete name of the test.
@@ -68,8 +69,13 @@ module ProbeDockCucumber
       @current_scenario_error = nil
     end
 
+    # Called for the feature name and after the before feature has been called
+    def feature_name(*args)
+      @current_feature_started = true
+    end
+
     # Called every time a tag is encountered, either at the feature or the scenario level.
-    def tag_name name, *args
+    def tag_name(name, *args)
       if @current_scenario
         @current_scenario_tags << name.sub(/^@/, '').strip
       else
@@ -78,7 +84,7 @@ module ProbeDockCucumber
     end
 
     # Called before each scenario is tested.
-    def before_feature_element feature_element, *args
+    def before_feature_element(feature_element, *args)
 
       # Store the first line of the scenario's description.
       # It will be used in #add_result to build the complete name of the test.
@@ -90,23 +96,46 @@ module ProbeDockCucumber
       @current_scenario_start_time = Time.now
     end
 
+    # Called for each comment line
+    def comment_line(comment)
+      # Take care of annotation only if matched
+      if comment.match(ProbeDockProbe::Annotation::ANNOTATION_REGEXP)
+        # If the feature already started, the annotations are for scenarios
+        if @current_feature_started
+          @annotation = ProbeDockProbe::Annotation.new(comment)
+        else
+          @feature_annotation = ProbeDockProbe::Annotation.new(comment)
+        end
+      end
+    end
+
+    def scenario_name(keyword, name, file_colon_line, *args)
+      @current_scenario_file_colon_line = file_colon_line
+    end
+
     # Called after each scenario step (Given, When, Then) is executed.
-    def after_step_result keyword, step_match, multiline_arg, status, exception, *args
+    def after_step_result(keyword, step_match, multiline_arg, status, exception, *args)
       # If a step fails, the exception is provided here.
       # It will be used in #add_result to build the error message of the test.
       @current_scenario_error = exception if exception
     end
 
     # Called after each completed scenario.
-    def after_feature_element *args
+    def after_feature_element(*args)
       add_result
     end
 
+    # Called after the feature has been executed
+    def after_feature(*args)
+      @current_feature_started = false
+      @feature_annotation = nil
+    end
+
     # Called when the test suite ends.
-    def after_features *args
+    def after_features(*args)
       end_time = Time.now
       @test_run.duration = ((end_time - @suite_start_time) * 1000).round
-      @client.process @test_run
+      @client.process(@test_run)
     end
 
     private
@@ -122,6 +151,17 @@ module ProbeDockCucumber
         data: {}
       }
 
+      if @annotation && @feature_annotation # Annotation on current feature and current scenario
+        @feature_annotation.merge!(@annotation)
+        result_options[:annotation] = @feature_annotation
+      elsif @annotation # Annotation only for current scenario
+        result_options[:annotation] = @annotation
+      elsif @feature_annotation # Annotation for the current feature
+        result_options[:annotation] = @feature_annotation
+      end
+
+      @annotation = nil
+
       result_options[:duration] = ((Time.now - @current_scenario_start_time) * 1000).round
 
       # Combine the tags of the feature and of the scenario.
@@ -130,13 +170,21 @@ module ProbeDockCucumber
       # The fingerprint identifying the test contains the first line of the
       # feature's and the scenario's descriptions joined with a separator.
       fingerprint_data = [ @current_feature, @current_scenario ]
-      result_options[:fingerprint] = Digest::SHA1.hexdigest fingerprint_data.join('|||')
+      result_options[:fingerprint] = Digest::SHA1.hexdigest(fingerprint_data.join('|||'))
       result_options[:data][:fingerprint] = result_options[:fingerprint]
 
       # Build the message from the error's message and backtrace if an error occurred.
       result_options[:message] = failure_message @current_scenario_error if @current_scenario_error
 
-      @test_run.add_result result_options
+      metadata = result_options[:data]
+
+      # Add the file and line number to the metadata.
+      if @current_scenario_file_colon_line && m = @current_scenario_file_colon_line.match(/^([^:]+):(\d+)$/)
+        metadata['file.path'] = m[1].to_s
+        metadata['file.line'] = m[2].to_i
+      end
+
+      @test_run.add_result(result_options)
     end
 
     # Builds the complete test name.
@@ -147,7 +195,7 @@ module ProbeDockCucumber
     def complete_name
 
       name = @current_feature.dup
-      if name.match /\.$/
+      if name.match(/\.$/)
         name << ' '
       else
         name << ': '
@@ -156,7 +204,7 @@ module ProbeDockCucumber
       name << @current_scenario
     end
 
-    def failure_message error
+    def failure_message(error)
       String.new.tap do |m|
         m << error.message
         m << "\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: probedock-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Simon Oulevay (Alpha Hydrae)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: probedock-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Cucumber client to publish test results to Probe Dock.