gurke 2.0.0.dev.1.b25 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODU3MmU4NTFmMzQ3ZWY1NDkwZDQyYTI5MWMyMzJjM2JkNWZmYzIyYg==
-  data.tar.gz: !binary |-
-    ODFhNjU4YzYwNTk5ZDlhYWEwYjdjNmMwOTJhYjM0ZmQ5NTFmMGE1NA==
+SHA1:
+  metadata.gz: 8ebd0a6959baccc23f93332d2d2437b59dfb0742
+  data.tar.gz: 66ec55c6ffd3a9487115eee3c0dae66b326a6701
 SHA512:
-  metadata.gz: !binary |-
-    YzNkODczMzkyM2NhZWExMzI2MWM0ODdjZDUzM2FlODJkZDdhZWU1NGQzNDli
-    ODUwYzUwNTU2MzQxNDU1M2Y4MGQ2NDZjZjQyYzU3M2U3NTgyZjAyMjRmMTM2
-    YTMyMTIzODE5Mzc2Yjk0YmFjODlkNzQ1ZTY3NDJkZTMwMzEzNDg=
-  data.tar.gz: !binary |-
-    NzcwNjdmZTNmMjkxOWY3MmRjODkxNTVjMGE3ZTE0M2MxMzhhNmNiYWQwOTQ4
-    M2JhODhkZDMwMGRkYTMyZjhiYTQ1YjQwZmE2N2IwNzM2OWU1ZDkxNjk0OGU4
-    OGUxNzE4ZjdjOTEzNjI0NGY3MWY1NmYzZThhY2ZjNjBlNTgxYzk=
+  metadata.gz: 90252df07209004f455cb6044ddc252a81a0e9d8f51c5eb54c05db80b9541c205908f6e6b4d7ecb50f270f503ca259df03403b622d019b9059594afdeeb49f26
+  data.tar.gz: a45350648d213fe996202271d31a601562b6f8eb0fb095ae4443610ae87e10ec207c7c3ec95f7051bd8ce0081f6061d9257ca27cc55083226465c784e873eba3

data/features/gurke/run_specific_scenarios.feature

@@ -0,0 +1,93 @@
+Feature: Run specific features or scenarios
+  In order to get faster test results
+  As a user
+  I want run only a specific set of files or lines
+
+  Background:
+    Given I am in a project using gurke
+    Given a file "features/a.feature" with the following content exists
+      """
+      Feature: F
+        Bla blub, a longer description.
+        Dadada.
+
+        Scenario: Scenario A1
+          Given I am "John"
+          When I am "John"
+          Then I am "John"
+
+        Scenario: Scenario A2
+          Given I am "John"
+          When I am "John"
+          Then I am "John"
+      """
+    Given a file "features/b.feature" with the following content exists
+      """
+      # Comment.
+      Feature: F
+        Bla blub, a longer description.
+
+        Dadada.
+
+        Scenario: Scenario B1
+          Given I am "John"
+          When I am "John"
+          Then I am "John"
+
+        Scenario: Scenario B2
+          Given I am "John"
+          When I am "John"
+          Then I am "John"
+
+        Scenario: Scenario B3
+          Given I am "John"
+          When I am "John"
+          Then I am "John"
+      """
+    And a file "features/support/steps/test_steps.rb" with the following content exists
+      """
+      require 'test/unit/assertions'
+
+      module Steps
+        include MiniTest::Assertions
+
+        Given(/^I am "(.+)"$/) do |name|
+          @me = name
+        end
+
+        When(/^I am "(.+)"$/) do |name|
+          @copy = @me
+        end
+
+        Then(/^I am "(.+)"$/) do |name|
+          assert name == @copy, "Expected #{name.inspect} but #{@me.inspect} given."
+        end
+      end
+      Gurke.world.send :include, Steps
+      """
+
+  Scenario: Run specific file (I)
+    When I execute "bundle exec gurke features/a.feature"
+    And the program output should include "2 scenarios: 0 failing, 0 pending"
+
+  Scenario: Run specific file (II)
+    When I execute "bundle exec gurke features/b.feature"
+    And the program output should include "3 scenarios: 0 failing, 0 pending"
+
+  Scenario: Run specific line of a scenario (I)
+    When I execute "bundle exec gurke features/b.feature:7"
+    And the program output should include "Scenario: Scenario B1"
+    And the program output should include "1 scenarios: 0 failing, 0 pending"
+
+  Scenario: Run specific line of a scenario (II)
+    When I execute "bundle exec gurke features/b.feature:7:19"
+    And the program output should include "Scenario: Scenario B1"
+    And the program output should include "Scenario: Scenario B3"
+    And the program output should include "2 scenarios: 0 failing, 0 pending"
+
+  Scenario: Run specific line of a scenario (III)
+    When I execute "bundle exec gurke features/a.feature:11 features/b.feature:7:19"
+    And the program output should include "Scenario: Scenario A2"
+    And the program output should include "Scenario: Scenario B1"
+    And the program output should include "Scenario: Scenario B3"
+    And the program output should include "3 scenarios: 0 failing, 0 pending"

data/features/support/steps/cli_steps.rb

@@ -5,12 +5,9 @@ module CLISteps
   def _execute(exec)
     Dir.chdir(@__root) do
       Bundler.with_clean_env do
-        Open3.popen2e(exec) do |_, stdout_err, wait_thr|
-          exit_status = wait_thr.value
-          stdout_err  = stdout_err.read
+        out, err, status = Open3.capture3('bash', '-lc', exec)
 
-          @last_process = [exit_status.to_i, stdout_err]
-        end
+        @last_process = [Integer(status), out, err]
       end
     end
   end

data/lib/gurke/builder.rb

@@ -2,25 +2,42 @@ require 'gherkin'
 
 module Gurke
   class Builder
-    attr_reader :features, :options
-
-    def initialize(options)
-      @options  = options
-      @features = FeatureList.new
+    attr_reader :features, :keywords
+
+    def initialize
+      # @options  = options
+      # @files    = files.map do |file|
+      #   split = file.split(':')
+      #   [split[0], split[1..-1].map{|l| Integer(l) }]
+      # end
       @language = 'en'
       @parser   = Gherkin::Parser::Parser.new(
         self, true, 'root', false, @language)
+    end
 
-      @keywords = {}
-      Gherkin::I18n::LANGUAGES[@language].each do |k, v|
-        v.split('|').map(&:strip).each do |str|
-          @keywords[str] = k.to_sym if str != '*'
+    def keywords
+      @keywords ||= begin
+        keywords = {}
+        Gherkin::I18n::LANGUAGES[@language].each do |k, v|
+          v.split('|').map(&:strip).each do |str|
+            keywords[str] = k.to_sym if str != '*'
+          end
         end
+
+        keywords
       end
     end
 
-    def parse(feature_file)
-      @parser.parse(File.read(feature_file), feature_file, 0)
+    def load(files)
+      FeatureList.new.tap do |fl|
+        @features = fl
+
+        files.each do |file|
+          @parser.parse File.read(file), file, 0
+        end
+
+        @features = nil
+      end
     end
 
     def uri(raw)
@@ -52,7 +69,7 @@ module Gurke
       @context  = @scenario
       @type     = nil
 
-      @feature.scenarios << @scenario unless filtered?(@scenario)
+      @feature.scenarios << @scenario #unless filtered?(@scenario)
     end
 
     def step(raw)
@@ -73,38 +90,12 @@ module Gurke
     private
 
     def lookup_type(keyword)
-      case (kw = @keywords.fetch(keyword))
+      case (kw = keywords.fetch(keyword))
         when :and, :but
           @type
         else
           kw
       end
     end
-
-    def filter_sets
-      @filter_sets ||= options[:tags].map do |list|
-        list.strip.split(/[,+\s]\s*/).map{|t| Filter.new(t) }
-      end
-    end
-
-    def filtered?(scenario)
-      !filter_sets.reduce(false) do |memo, set|
-        memo || set.all?{|rule| rule.match? scenario }
-      end
-    end
-
-    Filter = Struct.new(:tag) do
-      def name
-        @name ||= negated? ? tag[1..-1] : tag
-      end
-
-      def negated?
-        tag[0] == '~'
-      end
-
-      def match?(taggable)
-        negated? != taggable.tags.any?{|t| t.name == name }
-      end
-    end
   end
 end

data/lib/gurke/cli.rb

@@ -69,8 +69,8 @@ module Gurke
                    'filtering expression. TODO: Description.',
             default: ['~wip'],
             multi: true
-        opt :drb_server, 'Run gurke DRb server.', short: :none
-        opt :drb, 'Run features on already started DRb server.', short: :none
+        opt :drb_server, 'Run gurke DRb server. (experimental)', short: :none
+        opt :drb, 'Run features on already started DRb server. (experimental)', short: :none
       end
     end
   end

data/lib/gurke/feature.rb

@@ -65,6 +65,16 @@ module Gurke
       scenarios.any?(&:pending?)
     end
 
+    def self.new(*args)
+      if args.size == 1 && (f = args.first).is_a?(self)
+        super f.file, f.line, f.tags, f.raw
+      else
+        super
+      end
+    end
+
+    # -----------------------------------------------------
+
     # @api private
     def run(runner, reporter)
       reporter.invoke :before_feature, self

data/lib/gurke/feature_list.rb

@@ -22,6 +22,27 @@ module Gurke
       !any?{|s| s.failed? }
     end
 
+    # @api private
+    def filter(options, files)
+      list   = FeatureList.new
+      filter = Filter.new options, files
+
+      each do |feature|
+        file, lines = files.select{|f, _| f == feature.file }.first
+        next unless file
+
+        f = Feature.new(feature)
+
+        feature.scenarios.each do |scenario|
+          f.scenarios << scenario unless filter.filtered?(scenario)
+        end
+
+        list << f if f.scenarios.any?
+      end
+
+      list
+    end
+
     private
 
     def run_features(runner, reporter)
@@ -33,5 +54,52 @@ module Gurke
     ensure
       reporter.invoke :end_features, self
     end
+
+    class Filter
+      attr_reader :options, :files
+
+      def initialize(options, files)
+        @options = options
+        @files   = files
+      end
+
+      def tag_filters
+        @tag_filters ||= options[:tags].map do |list|
+          list.strip.split(/[,+\s]\s*/).map{|t| TagFilter.new(t) }
+        end
+      end
+
+      def filtered?(scenario)
+        filtered_by_tags?(scenario) || filtered_by_line?(scenario)
+      end
+
+      def filtered_by_tags?(scenario)
+        !tag_filters.reduce(false) do |memo, set|
+          memo || set.all?{|rule| rule.match? scenario }
+        end
+      end
+
+      def filtered_by_line?(scenario)
+        _, lines = files.select{|f, _| f == scenario.file }.first
+
+        return false if lines.empty?
+
+        !lines.any?{|l| scenario.line <= l && scenario.steps.last.line >= l }
+      end
+
+      TagFilter = Struct.new(:tag) do
+        def name
+          @name ||= negated? ? tag[1..-1] : tag
+        end
+
+        def negated?
+          tag[0] == '~'
+        end
+
+        def match?(taggable)
+          negated? != taggable.tags.any?{|t| t.name == name }
+        end
+      end
+    end
   end
 end

data/lib/gurke/runner.rb

@@ -11,17 +11,18 @@ module Gurke
       @reporter ||= Reporters::DefaultReporter.new
     end
 
-    def load_feature_set(files)
-      builder = Builder.new options
-      files.each{|f| builder.parse(f) }
-
-      features = builder.features
-      features.freeze
+    def builder
+      @builder ||= Builder.new
     end
 
     def run(files, reporter = self.reporter)
-      features = load_feature_set files
-      features.run self, reporter
+      files.map! do |file|
+        split = file.split(':')
+        [split[0], split[1..-1].map{|i| Integer(i) }]
+      end
+
+      features = builder.load files.map{|file, _| file }
+      features.filter(options, files).run self, reporter
     end
 
     def hook(scope, world, &block)
@@ -39,11 +40,9 @@ module Gurke
     end
 
     class LocalRunner < Runner
-      def run(files, reporter = self.reporter)
-        features = load_feature_set files
-
+      def run(*)
         hook :system, nil do
-          features.run self, reporter
+          super
         end
       end
     end

data/lib/gurke/version.rb

@@ -3,7 +3,7 @@ module Gurke
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    STAGE = :dev
+    STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 
     def self.to_s

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: gurke
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev.1.b25
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan Graichen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: gherkin
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gherkin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: colorize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
+  type: :development
 description: An alternative gherkin feature runner inspired by rspec and turnip.
 email:
 - jg@altimos.de
@@ -82,6 +82,7 @@ files:
 - features/gurke/backtrace_filtering.feature
 - features/gurke/filter_by_tags.feature
 - features/gurke/pending_steps.feature
+- features/gurke/run_specific_scenarios.feature
 - features/gurke/step_specific_definitions.feature
 - features/support/steps/cli_steps.rb
 - features/support/steps/file_steps.rb
@@ -115,24 +116,24 @@ homepage: https://github.com/jgraichen/gurke
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.2.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: An alternative gherkin feature runner inspired by rspec and turnip.
 test_files:
@@ -141,6 +142,7 @@ test_files:
 - features/gurke/backtrace_filtering.feature
 - features/gurke/filter_by_tags.feature
 - features/gurke/pending_steps.feature
+- features/gurke/run_specific_scenarios.feature
 - features/gurke/step_specific_definitions.feature
 - features/support/steps/cli_steps.rb
 - features/support/steps/file_steps.rb
@@ -148,3 +150,4 @@ test_files:
 - spec/gurke/run_list_spec.rb
 - spec/gurke/scenario_spec.rb
 - spec/spec_helper.rb
+has_rdoc: