aslakhellesoy-cucumber 0.1.99.20 → 0.1.99.21

data/History.txt

@@ -58,6 +58,9 @@ pure Ruby users have been enjoying for a while.
 
 == TODO Before 0.2 release
 * Make sure all features and specs pass on Windows, JRuby and Ruby 1.9
+* Tighten up and simplify the grammar. More edge case features/specs.
+* Reintroduce StepInvocation. Reduce some of the redundant calls to StepDefinition/StepMother. Align with JBehave.
+* Make some class diagrams.
 * Implement at least a basic HTML formatter
 * Run a single cucumber feature from rake "rake features FEATURE=/path/to/feature:line"
 * Wiki page about running subsets

data/Manifest.txt

@@ -203,6 +203,7 @@ lib/cucumber/core_ext/proc.rb
 lib/cucumber/core_ext/string.rb
 lib/cucumber/formatter.rb
 lib/cucumber/formatter/ansicolor.rb
+lib/cucumber/formatter/color_io.rb
 lib/cucumber/formatter/console.rb
 lib/cucumber/formatter/cucumber.css
 lib/cucumber/formatter/cucumber.sass
@@ -249,6 +250,7 @@ spec/cucumber/ast/scenario_outline_spec.rb
 spec/cucumber/ast/scenario_spec.rb
 spec/cucumber/ast/step_spec.rb
 spec/cucumber/ast/table_spec.rb
+spec/cucumber/ast/tags_spec.rb
 spec/cucumber/broadcaster_spec.rb
 spec/cucumber/cli/configuration_spec.rb
 spec/cucumber/cli/main_spec.rb

data/config/hoe.rb

@@ -62,7 +62,8 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
     ['term-ansicolor', '>= 1.0.3'], 
     ['treetop', '>= 1.2.4'], 
     ['polyglot', '>= 0.2.4'], # Remove this when Treetop no longer loads polyglot by default. 
-    ['diff-lcs', '>= 1.1.2'] 
+    ['diff-lcs', '>= 1.1.2'],
+    ['builder', '>= 2.1.2']
   ]
 
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.

data/features/cucumber_cli.feature

@@ -4,7 +4,7 @@ Feature: Cucumber command line
 
   Scenario: Run single scenario with missing step definition
     When I run cucumber -q features/sample.feature:5
-    Then it should pass with
+    Then it should pass with      
       """
       @one
       Feature: Sample

data/lib/cucumber/ast/tags.rb

@@ -12,7 +12,14 @@ module Cucumber
       end
 
       def among?(tag_names)
-        (@tag_names & tag_names).any?
+        no_tags, yes_tags = tag_names.partition{|tag| tag =~ /^\!/}
+        no_tags = no_tags.map{|tag| tag[1..-1]}
+
+        # Strip @
+        yes_tags = yes_tags.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
+        no_tags = no_tags.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
+
+        (@tag_names & yes_tags).any? && (@tag_names & no_tags).empty?
       end
 
       def at_lines?(lines)

data/lib/cucumber/cli/configuration.rb

@@ -73,7 +73,9 @@ module Cucumber
           end
           opts.on("-t TAGS", "--tags TAGS", 
             "Only execute the features or scenarios with the specified tags.",
-            "TAGS must be comma-separated without spaces.") do |v|
+            "TAGS must be comma-separated without spaces. Prefix tags with ! to",
+            "exclude features or scenarios having that tag. tags can be specified",
+            "with or without the @ prefix.") do |v|
             @options[:tags] = v.split(",")
           end
           opts.on("-s SCENARIO", "--scenario SCENARIO", 

data/lib/cucumber/cli/main.rb

@@ -23,7 +23,7 @@ module Cucumber
 
       def initialize(args, out_stream = STDOUT, error_stream = STDERR)
         @args         = args
-        @out_stream   = out_stream
+        @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new : out_stream
         @error_stream = error_stream
       end
       

data/lib/cucumber/formatter.rb

@@ -1 +1 @@
-%w{pretty progress profile rerun html}.each{|n| require "cucumber/formatter/#{n}"}
+%w{color_io pretty progress profile rerun html}.each{|n| require "cucumber/formatter/#{n}"}

data/lib/cucumber/formatter/ansicolor.rb

@@ -1,19 +1,12 @@
-# Hack to work around Win32/Console, which bundles a licence-violating, outdated
-# copy of term/ansicolor that doesn't implement Term::ANSIColor#coloring=.
-# We want the official one!
-begin
-  gem 'term-ansicolor' 
-rescue Exception => ignore
-  # In order to work with Cucumber.java, which doesn't bundle gems.
-end
-$LOAD_PATH.each{|path| $LOAD_PATH.unshift($LOAD_PATH.delete(path)) if path =~ /term-ansicolor/}
+gem 'term-ansicolor'
 require 'term/ansicolor'
 
 if Cucumber::WINDOWS_MRI
   begin
+    gem 'win32console', '>= 1.2.0'
     require 'Win32/Console/ANSI'
   rescue LoadError
-    STDERR.puts "You must gem install win32console to get coloured output on MRI/Windows"
+    STDERR.puts "*** WARNING: You must gem install win32console (1.2.0 or higher) to get coloured output on MRI/Windows"
     Term::ANSIColor.coloring = false
   end
 end

data/lib/cucumber/formatter/color_io.rb

@@ -0,0 +1,17 @@
+require 'forwardable'
+
+module Cucumber
+  module Formatter
+    # Adapter to make #puts/#print/#flush work with colours on Windows
+    class ColorIO
+      extend Forwardable
+      def_delegators :@kernel, :puts, :print # win32console colours only work when sent to Kernel
+      def_delegators :@stdout, :flush, :tty?
+
+      def initialize
+        @kernel = Kernel
+        @stdout = STDOUT
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/html.rb

@@ -1,4 +1,9 @@
-require 'builder'
+begin
+  require 'builder'
+rescue LoadError
+  gem 'builder'
+  require 'builder'
+end
 
 module Cucumber
   module Formatter

data/lib/cucumber/parser/feature.rb

@@ -889,9 +889,9 @@ module Cucumber
       module Step1
         def build
           if multi.respond_to?(:build)
-            Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value, multi.build)
+            Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip, multi.build)
           else
-            Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value)
+            Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip)
           end
         end
       end

data/lib/cucumber/parser/feature.tt

@@ -119,9 +119,9 @@ module Cucumber
         comment space* step_keyword space* name:line_to_eol (eol+ / eof) multi:multiline_arg? white {
           def build
             if multi.respond_to?(:build)
-              Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value, multi.build)
+              Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip, multi.build)
             else
-              Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value)
+              Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip)
             end
           end
         }

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 1
     TINY  = 99
-    PATCH = 20 # Set to nil for official release
+    PATCH = 21 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/spec/cucumber/ast/tags_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Cucumber
+  module Ast
+    describe Tags do
+      before do
+        @tags = Tags.new(-1, %w{one two three})
+      end
+
+      it "should be among other tags" do
+        @tags.should be_among(%w{one})
+      end
+
+      it "should be among other tags even with @ prefix" do
+        @tags.should be_among(%w{@one})
+      end
+
+      it "should not be among other tags" do
+        @tags.should_not be_among(%w{one !two})
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.20
+  version: 0.1.99.21
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 -08:00
+date: 2009-02-06 00:00:00 -08:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
@@ -276,6 +285,7 @@ files:
 - lib/cucumber/core_ext/string.rb
 - lib/cucumber/formatter.rb
 - lib/cucumber/formatter/ansicolor.rb
+- lib/cucumber/formatter/color_io.rb
 - lib/cucumber/formatter/console.rb
 - lib/cucumber/formatter/cucumber.css
 - lib/cucumber/formatter/cucumber.sass
@@ -322,6 +332,7 @@ files:
 - spec/cucumber/ast/scenario_spec.rb
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
+- spec/cucumber/ast/tags_spec.rb
 - spec/cucumber/broadcaster_spec.rb
 - spec/cucumber/cli/configuration_spec.rb
 - spec/cucumber/cli/main_spec.rb