cukeforker 0.2.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 78d586215f5f03a4e562c4b6f2242b5c2344472a
-  data.tar.gz: d069baca9ebfa3407a0c1cae3e228a88187c9f6d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmRjOTMxNjRlOWViNTk4NWViN2RhZmQwNTljZDI3ZmVjMjg3MzNlYg==
+  data.tar.gz: !binary |-
+    MTg0NTZlNjM1NGNkMWExNmI3YTI1MjYwMzMxMjBiOWU2ZmVkMTQ5MQ==
 SHA512:
-  metadata.gz: f8e4e3e6120d1480015688cde65aaae0f4e25fb737f71cb0a9fab615095d88ef45b33d5dcb450727d60f3b57413755a80a29600fd687986c4a58a489416b3710
-  data.tar.gz: 0aa754f8b2c5cd510f4e72520df6bd1a6e8d2557887989159aef49becda1f4eb0cc97ff24ef1000f45e639574c150a4a6048109b8cf2fbaabedb3ea59b70c0d6
+  metadata.gz: !binary |-
+    YTU3YzlkYTZhZjAyZjBjN2EyMzQ0ZTc3NjhlZjJkYmQ4ZDM1NTA2ZjRhZjVk
+    OGNmOTMwMTM1YjMwMTZhNGZhNDM0NmY3ZGI4YWVmYjNiOThiMzc0OWQ3NTkw
+    NzA4Mjg3NjE3ZjA3NmI2N2MzYjVmZjAzZTE1ODNhN2Y3NDQ4ZjA=
+  data.tar.gz: !binary |-
+    NDZkYzVmMjIzYWI5N2IzMzkwMDY0YTY0NjVhNzg4Y2U5NzlkNjcxMDgyYjgx
+    YzMyYzQxZDg3OTRjNzUwMzg0OGUzMTBlNzQ4ZGM2YzQzNWNlNWE1N2Q2Yjhk
+    ODgzN2E4OTk1MGYxNzE0MmE3NzI3ODYzMmFlZjU0Y2IwZDJkNjE=

data/.travis.yml

@@ -2,4 +2,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0 
-  - 2.2.0
+  - 2.2.0
+
+before_install:
+  - gem update bundler

data/cukeforker.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "cukeforker"
 
-  s.add_dependency "cucumber", ">= 1.1.5"
+  s.add_dependency "cucumber", ">= 2.0.0"
   s.add_dependency "vnctools", ">= 0.0.5"
   s.add_development_dependency "rspec", "~> 2.5"
   s.add_development_dependency "coveralls"
   s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "pry"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/cukeforker.rb

@@ -21,6 +21,7 @@ require 'cukeforker/worker'
 require 'cukeforker/worker_queue'
 require 'cukeforker/runner'
 require 'cukeforker/scenarios'
+require 'cukeforker/normalised_encoding_file'
+require 'cukeforker/scenario_list'
 
-require 'cukeforker/formatters/scenario_line_logger'
 require 'cukeforker/formatters/junit_scenario_formatter'

data/lib/cukeforker/formatters/junit_scenario_formatter.rb

@@ -1,5 +1,5 @@
 require 'cucumber/formatter/junit'
-require 'cucumber/formatter/ordered_xml_markup'
+
 module CukeForker
   module Formatters
     class JunitScenarioFormatter < Cucumber::Formatter::Junit
@@ -19,8 +19,8 @@ module CukeForker
         end
       end
 
-      def after_feature_element(feature_element)
-        @testsuite = Cucumber::Formatter::OrderedXmlMarkup.new( :indent => 2 )
+      def end_feature(feature_element)
+        @testsuite = Builder::XmlMarkup.new(:indent => 2)
         @testsuite.instruct!
         @testsuite.testsuite(
           :failures => @failures,

data/lib/cukeforker/normalised_encoding_file.rb

@@ -0,0 +1,38 @@
+module CukeForker
+  class NormalisedEncodingFile
+    COMMENT_OR_EMPTY_LINE_PATTERN = /^\s*#|^\s*$/ #:nodoc:
+    ENCODING_PATTERN = /^\s*#\s*encoding\s*:\s*([^\s]+)/ #:nodoc:
+
+    def self.read(path)
+      new(path).read
+    end
+
+    def initialize(path)
+      begin
+        @file = File.new(path)
+        set_encoding
+      rescue Errno::EACCES => e
+        raise FileNotFoundException.new(e, File.expand_path(path))
+      rescue Errno::ENOENT => e
+        raise FeatureFolderNotFoundException.new(e, path)
+      end
+    end
+
+    def read
+      @file.read.encode("UTF-8")
+    end
+
+    private
+
+    def set_encoding
+      @file.each do |line|
+        if ENCODING_PATTERN =~ line
+          @file.set_encoding $1
+          break
+        end
+        break unless COMMENT_OR_EMPTY_LINE_PATTERN =~ line
+      end
+      @file.rewind
+    end
+  end
+end

data/lib/cukeforker/scenario_list.rb

@@ -0,0 +1,24 @@
+class ScenarioList
+  attr_accessor :scenarios
+
+  def scenarios
+    @scenarios
+  end
+
+  def before_test_step(test_step)
+  end
+
+  def after_test_step(test_step, result)
+  end
+
+  def before_test_case(test_case)
+  end
+
+  def after_test_case(test_case, result)
+    @scenarios ||= []
+    @scenarios << [test_case.feature.file, test_case.location.line].join(':')
+  end
+
+  def done
+  end
+end

data/lib/cukeforker/scenarios.rb

@@ -1,19 +1,10 @@
-require 'cucumber/runtime/features_loader'
+require 'cucumber/core'
+require 'cucumber/core/filter'
 
 module CukeForker
-
-  #
-  # CukeForker::Scenarios.by_args(args)
-  #
-  # where 'args' is a String of cucumber options
-  #
-  # For example:
-  # CukeForker::Scenarios.by_args(%W[-p my_profile -t @edition])
-  # will return an array of scenarios and their line numbers that match
-  # the tags specified in the cucumber profile 'my_profile' AND have the '@edition' tag
-  #
-
   class Scenarios
+    include Cucumber::Core
+
     def self.by_args(args)
       options = Cucumber::Cli::Options.new(STDOUT, STDERR, :default_profile => 'default')
       tagged(options.parse!(args)[:tag_expressions])
@@ -25,15 +16,13 @@ module CukeForker
     end
 
     def self.tagged(tags)
-      tag_expression = Gherkin::TagExpression.new(tags)
-      scenario_line_logger = CukeForker::Formatters::ScenarioLineLogger.new(tag_expression)
-      loader = Cucumber::Runtime::FeaturesLoader.new(feature_files, [], tag_expression)
-
-      loader.features.each do |feature|
-        feature.accept(scenario_line_logger)
+      scenario_list = ScenarioList.new
+      feature_files.each do |feature|
+        source = CukeForker::NormalisedEncodingFile.read(feature)
+        file = Cucumber::Core::Gherkin::Document.new(feature, source)
+        self.new.execute([file], scenario_list, [Cucumber::Core::Test::TagFilter.new(tags)])
       end
-
-      scenario_line_logger.scenarios
+      scenario_list.scenarios
     end
 
     def self.feature_files

data/lib/cukeforker/version.rb

@@ -1,3 +1,3 @@
 module CukeForker
-  VERSION = "0.2.5"
+  VERSION = "1.0.0"
 end

data/spec/cukeforker/logging_listener_spec.rb

@@ -48,8 +48,5 @@ I, [#{timestamp}]  INFO -- : [    run           ] finished, passed
 I, [#{timestamp}]  INFO -- : [    display :15   ] stopping
       OUTPUT
     end
-
-
-
   end # Worker
 end # CukeForker

data/spec/cukeforker/runner_spec.rb

@@ -135,7 +135,7 @@ module CukeForker
         queue.should_receive(:process).with 0.2 # poll interval
         queue.should_receive(:wait_until_finished)
 
-        expect(runner.run).to be_true
+        expect(runner.run).to be_truthy
       end
 
       it 'returns false when there are test failures' do
@@ -143,7 +143,7 @@ module CukeForker
         queue.should_receive(:process).with 0.2 # poll interval
         queue.should_receive(:wait_until_finished)
 
-        expect(runner.run).to be_false
+        expect(runner.run).to be_falsey
       end
     end
   end # Runner

data/spec/cukeforker/scenarios_spec.rb

@@ -3,65 +3,105 @@ require File.expand_path("../../spec_helper", __FILE__)
 module CukeForker
   describe Scenarios do
     it "returns all scenarios and their line numbers" do
-      feature_1 = Cucumber::FeatureFile.new("features/test1.feature")
-      feature_2 = Cucumber::FeatureFile.new("features/test2.feature")
+      Scenarios.stub(:feature_files).and_return(['features/test1.feature', 'features/test2.feature'])
+      allow(CukeForker::NormalisedEncodingFile).to receive(:read).with(/features\/test\d\.feature/).and_return(<<-GHERKIN)
+      Feature: Test Feature
+
+        Scenario: Test Scenario 1
+          Given I do fake precondition
+          When I do fake action
+          Then I get fake assertions
+
+        Scenario: Test Scenario 2
+          Given I do fake precondition
+          When I do fake action
+          Then I get fake assertions
+      GHERKIN
 
-      feature_1.instance_variable_set(:@source,
-        "Feature: test 1
+      all_scenarios = Scenarios.all
+
+      all_scenarios.length.should == 4
+      all_scenarios[0].should == "features/test1.feature:3"
+      all_scenarios[1].should == "features/test1.feature:8"
+      all_scenarios[2].should == "features/test2.feature:3"
+      all_scenarios[3].should == "features/test2.feature:8"
+    end
+
+    it "returns all scenarios and their line numbers by tags" do
+      Scenarios.stub(:feature_files).and_return(['features/test1.feature'])
+      allow(CukeForker::NormalisedEncodingFile).to receive(:read).with('features/test1.feature').and_return(<<-GHERKIN)
+      Feature: test 1
+          @find_me
           Scenario: test scenario 1
             Given nothing happens
 
           Scenario: test scenario 2
-            Given nothing else happens")
-
+            Given nothing else happens
+      GHERKIN
 
-      feature_2.instance_variable_set(:@source,
-        "Feature: test 2
+      all_scenarios = Scenarios.by_args(%W[-t @find_me])
 
-          Scenario: test scenario 3
-            Given nothing happens
+      all_scenarios.length.should == 1
+      all_scenarios[0].should == "features/test1.feature:3"
+    end
 
-          Scenario Outline: test scenario 4
+    it "returns all scenarios and their line numbers by multiple include tags" do
+      Scenarios.stub(:feature_files).and_return(['features/test1.feature'])
+      allow(CukeForker::NormalisedEncodingFile).to receive(:read).with('features/test1.feature').and_return(<<-GHERKIN)
+      Feature: test 1
+          @find_me
+          Scenario: test scenario 1
             Given nothing happens
-            Examples:
-            | nothing |
-            | 1       |
-        ")
-
-      Cucumber::FeatureFile.stub(:new).with("features/test1.feature").and_return(feature_1)
-      Cucumber::FeatureFile.stub(:new).with("features/test2.feature").and_return(feature_2)
 
-      Scenarios.stub(:feature_files).and_return(['features/test1.feature', 'features/test2.feature'])
+          @me_too
+          Scenario: test scenario 2
+            Given nothing else happens
+      GHERKIN
 
-      all_scenarios = Scenarios.all
+      all_scenarios = Scenarios.by_args(%W[-t @find_me,@me_too])
 
-      all_scenarios.length.should == 4
-      all_scenarios[0].should == "features/test1.feature:2"
-      all_scenarios[1].should == "features/test1.feature:5"
-      all_scenarios[2].should == "features/test2.feature:3"
-      all_scenarios[3].should == "features/test2.feature:6"
+      all_scenarios.length.should == 2
+      all_scenarios[0].should == "features/test1.feature:3"
+      all_scenarios[1].should == "features/test1.feature:7"
     end
 
-    it "returns all scenarios and their line numbers" do
-      feature_1 = Cucumber::FeatureFile.new("features/test1.feature")
-
-      feature_1.instance_variable_set(:@source,
-        "Feature: test 1
-          @find_me
+    it "returns all scenarios and their line numbers by multiple and tags" do
+      Scenarios.stub(:feature_files).and_return(['features/test1.feature'])
+      allow(CukeForker::NormalisedEncodingFile).to receive(:read).with('features/test1.feature').and_return(<<-GHERKIN)
+      Feature: test 1
+          @find_me @me_too
           Scenario: test scenario 1
             Given nothing happens
 
+          @me_too
           Scenario: test scenario 2
-            Given nothing else happens")
+            Given nothing else happens
+      GHERKIN
+
+      all_scenarios = Scenarios.by_args(%W[-t @find_me -t @me_too])
 
-      Cucumber::FeatureFile.stub(:new).with("features/test1.feature").and_return(feature_1)
+      all_scenarios.length.should == 1
+      all_scenarios[0].should == "features/test1.feature:3"
+    end
 
+    it "returns all scenarios and their line numbers by exclusion tag" do
       Scenarios.stub(:feature_files).and_return(['features/test1.feature'])
+      allow(CukeForker::NormalisedEncodingFile).to receive(:read).with('features/test1.feature').and_return(<<-GHERKIN)
+      Feature: test 1
+          @find_me
+          Scenario: test scenario 1
+            Given nothing happens
 
-      all_scenarios = Scenarios.by_args(%W[-t @find_me])
+          @me_too
+          Scenario: test scenario 2
+            Given nothing else happens
+      GHERKIN
+
+      all_scenarios = Scenarios.by_args(%W[-t ~@find_me])
 
       all_scenarios.length.should == 1
-      all_scenarios[0].should == "features/test1.feature:3"
+      all_scenarios[0].should == "features/test1.feature:7"
     end
   end
 end
+

data/spec/cukeforker/vnc_listener_spec.rb

@@ -2,10 +2,10 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 module CukeForker
   describe VncListener do
-    let(:server)    { double(VncTools::Server, :display => ":15")    }
-    let(:pool)      { double(VncTools::ServerPool)                   }
-    let(:worker)    { double(Worker, :data => OpenStruct.new) }
-    let(:listener)  { VncListener.new pool                  }
+    let(:server) { double(VncTools::Server, :display => ":15") }
+    let(:pool) { double(VncTools::ServerPool) }
+    let(:worker) { double(Worker, :data => OpenStruct.new) }
+    let(:listener) { VncListener.new pool }
 
     it "fetches a display from the pool and assings it to the worker" do
       pool.should_receive(:get).and_return(server)
@@ -34,6 +34,5 @@ module CukeForker
 
       listener.on_worker_forked worker
     end
-
   end # VncListenerServer
 end # CukeForker

data/spec/cukeforker/worker_queue_spec.rb

@@ -183,11 +183,10 @@ module CukeForker
 
         queue.should_not be_backed_up
         queue.should be_empty
-        queue.instance_variable_get(:@finished).should == [ workers[0], workers[3] ]
+        queue.instance_variable_get(:@finished).should == [workers[0], workers[3]]
 
         queue.should have_failures
       end
     end
-
- end # WorkerQueue
+  end # WorkerQueue
 end # CukeForker

data/spec/cukeforker/worker_spec.rb

@@ -26,15 +26,15 @@ module CukeForker
     end
 
     context "running a scenario with multiple report formats" do
-      formats = [ :json, :junit ]
-      path    = "some/path"
+      formats = [:json, :junit]
+      path = "some/path"
       let(:worker) { Worker.new("some/feature:51", formats, path) }
 
       it "has an output file for each format specified" do
         expected_args = formats.flat_map do |f|
           %W[--format #{f} --out #{path}/some_feature_51.#{f}]
         end
-        worker.args.each_cons(expected_args.size).include?(expected_args).should be_true
+        worker.args.each_cons(expected_args.size).include?(expected_args).should be_truthy
       end
     end
 
@@ -60,7 +60,7 @@ module CukeForker
 
     it "runs a passing cuke and exits with 0" do
       Process.should_receive(:fork).and_yield.and_return(1234)
-      Process.should_receive(:setpgid).with(0,0)
+      Process.should_receive(:setpgid).with(0, 0)
 
       $stdout.should_receive(:reopen).with("some/path/some_feature.stdout")
       $stderr.should_receive(:reopen).with("some/path/some_feature.stderr")
@@ -73,7 +73,7 @@ module CukeForker
 
     it "runs a failing cuke and exits with 1" do
       Process.should_receive(:fork).and_yield.and_return(1234)
-      Process.should_receive(:setpgid).with(0,0)
+      Process.should_receive(:setpgid).with(0, 0)
 
       $stdout.should_receive(:reopen).with("some/path/some_feature.stdout")
       $stderr.should_receive(:reopen).with("some/path/some_feature.stderr")

data/spec/spec_helper.rb

@@ -3,3 +3,5 @@ Coveralls.wear!
 
 $LOAD_PATH.unshift File.expand_path("../lib")
 require 'cukeforker'
+require 'pry'
+

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cukeforker
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: vnctools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: coveralls
   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
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: Library to maintain a forking queue of Cucumber processes, with optional
   VNC displays.
 email:
@@ -101,17 +115,17 @@ files:
 - lib/cukeforker.rb
 - lib/cukeforker/abstract_listener.rb
 - lib/cukeforker/formatters/junit_scenario_formatter.rb
-- lib/cukeforker/formatters/scenario_line_logger.rb
 - lib/cukeforker/logging_listener.rb
+- lib/cukeforker/normalised_encoding_file.rb
 - lib/cukeforker/rake_task.rb
 - lib/cukeforker/recording_vnc_listener.rb
 - lib/cukeforker/runner.rb
+- lib/cukeforker/scenario_list.rb
 - lib/cukeforker/scenarios.rb
 - lib/cukeforker/version.rb
 - lib/cukeforker/vnc_listener.rb
 - lib/cukeforker/worker.rb
 - lib/cukeforker/worker_queue.rb
-- spec/cukeforker/formatters/scenario_line_logger_spec.rb
 - spec/cukeforker/logging_listener_spec.rb
 - spec/cukeforker/rake_task_spec.rb
 - spec/cukeforker/recording_vnc_listener_spec.rb
@@ -130,22 +144,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cukeforker
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library to maintain a forking queue of Cucumber processes
 test_files:
-- spec/cukeforker/formatters/scenario_line_logger_spec.rb
 - spec/cukeforker/logging_listener_spec.rb
 - spec/cukeforker/rake_task_spec.rb
 - spec/cukeforker/recording_vnc_listener_spec.rb

data/lib/cukeforker/formatters/scenario_line_logger.rb

@@ -1,28 +0,0 @@
-require 'gherkin/tag_expression'
-module CukeForker
-  module Formatters
-    class ScenarioLineLogger
-      attr_reader :scenarios
-
-      def initialize(tag_expression = Gherkin::TagExpression.new([]))
-        @scenarios = []
-        @tag_expression = tag_expression
-      end
-
-      def visit_feature_element(feature_element)
-        if @tag_expression.evaluate(feature_element.source_tags)
-          line_number = if feature_element.respond_to?(:line)
-                          feature_element.line
-                        else
-                          feature_element.location.line
-                        end
-
-          @scenarios << [feature_element.feature.file, line_number].join(':')
-        end
-      end
-
-      def method_missing(*args)
-      end
-    end
-  end
-end

data/spec/cukeforker/formatters/scenario_line_logger_spec.rb

@@ -1,44 +0,0 @@
-require File.expand_path("../../../spec_helper", __FILE__)
-require 'cucumber/ast/scenario_outline'
-
-module CukeForker::Formatters
-  describe ScenarioLineLogger do
-    it "returns scenario names and line numbers for a scenario" do
-      logger = ScenarioLineLogger.new
-
-      feature = double("Cucumber::Ast::Feature")
-      feature_element = double("Cucumber::Ast::Scenario")
-
-      feature.should_receive(:file).twice.and_return('features/test1.feature')
-      feature_element.should_receive(:source_tags).twice.and_return('')
-      feature_element.should_receive(:feature).twice.and_return(feature)
-      feature_element.should_receive(:line).and_return(3)
-      feature_element.should_receive(:line).and_return(6)
-
-      logger.visit_feature_element(feature_element)
-      logger.visit_feature_element(feature_element)
-
-      logger.scenarios.length.should == 2
-      logger.scenarios[0].should == "features/test1.feature:3"
-      logger.scenarios[1].should == "features/test1.feature:6"
-    end
-
-    it "returns scenario names and line numbers for a scenario outline" do
-      logger = ScenarioLineLogger.new
-
-      feature = double("Cucumber::Ast::Feature")
-      location = double("Cucumber::Ast::Location", :line => 4)
-      feature_element = Cucumber::Ast::ScenarioOutline.new(*Array.new(11) {|a| double(a, :each => true) })
-      feature_element.stub(:location => location)
-
-      feature.should_receive(:file).and_return('features/test1.feature')
-      feature_element.should_receive(:source_tags).and_return('')
-      feature_element.should_receive(:feature).and_return(feature)
-
-      logger.visit_feature_element(feature_element)
-
-      logger.scenarios.length.should == 1
-      logger.scenarios[0].should == "features/test1.feature:4"
-    end
-  end
-end