aslakhellesoy-cucumber 0.3.3 → 0.3.3.1

data/History.txt

@@ -1,4 +1,11 @@
-== 0.3.3 (In Git)
+== 0.3.4 (In Git)
+
+=== New features
+* Support for Catalan (Francesc Esplugas)
+
+== 0.3.3 2009-05-10
+
+Minor bugfix release, made specially for EuRuKo!
 
 === Bugfixes
 * Summaries are no longer printed in an empty () if there are no scenarios/steps (Aslak Hellesøy)

data/Manifest.txt

@@ -235,6 +235,7 @@ features/cucumber_cli.feature
 features/cucumber_cli_diff_disabled.feature
 features/cucumber_cli_outlines.feature
 features/custom_formatter.feature
+features/exclude_files.feature
 features/multiline_names.feature
 features/rake_task.feature
 features/report_called_undefined_steps.feature

data/Rakefile

@@ -5,4 +5,5 @@ require 'config/hoe' # setup Hoe + all gem configuration
 Dir['gem_tasks/**/*.rake'].each { |rake| load rake }
 
 # Hoe gives us :default => :test, but we don't have Test::Unit tests.
-Rake::Task[:default].clear_prerequisites rescue nil # For some super weird reason this fails for some...
+Rake::Task[:default].clear_prerequisites rescue nil # For some super weird reason this fails for some...
+task :default => [:spec, :features]

data/examples/self_test/features/background/background_tagged_before_on_outline.feature

@@ -0,0 +1,12 @@
+@background_tagged_before_on_outline
+Feature: Background tagged Before on Outline
+
+  Background: 
+    Given passing without a table
+
+  Scenario Outline: passing background
+    Then I should have '<count>' cukes
+
+    Examples: 
+      | count |
+      | 888   |

data/features/cucumber_cli.feature

@@ -2,6 +2,8 @@ Feature: Cucumber command line
   In order to write better software
   Developers should be able to execute requirements as tests
 
+
+
   Scenario: Run single scenario with missing step definition
     When I run cucumber -q features/sample.feature:5
     Then it should pass with      

data/features/exclude_files.feature

@@ -0,0 +1,20 @@
+Feature: Exclude ruby and feature files from runs
+  Developers should be able to easily exclude files from cucumber runs
+  This is a nice feature to have in conjunction with profiles, so you can exclude
+  certain environment files from certain runs.
+
+  Scenario: exclude ruby files
+    Given a standard Cucumber project directory structure
+    And a file named "features/support/dont_require_me.rb"
+    And a file named "features/step_definitions/fooz.rb"
+    And a file named "features/step_definitions/foof.rb"
+    And a file named "features/step_definitions/foot.rb"
+    And a file named "features/support/require_me.rb"
+
+    When I run cucumber features -q --verbose --exclude features/support/dont --exclude foo[zf]
+
+    Then "features/support/require_me.rb" should be required
+    And "features/step_definitions/foot.rb" should be required
+    And "features/support/dont_require_me.rb" should not be required
+    And "features/step_definitions/foof.rb" should not be required
+    And "features/step_definitions/fooz.rb" should not be required

data/features/step_definitions/cucumber_steps.rb

@@ -67,3 +67,12 @@ Then /^"(.*)" should exist$/ do |file|
   File.exists?(file).should be_true
   FileUtils.rm(file)
 end
+
+Then /^"([^\"]*)" should not be required$/ do |file_name|
+  last_stdout.should_not include("* #{file_name}")
+end
+
+Then /^"([^\"]*)" should be required$/ do |file_name|
+  last_stdout.should include("* #{file_name}")
+end
+

data/lib/cucumber/cli/configuration.rb

@@ -5,24 +5,24 @@ module Cucumber
     class Configuration
       FORMATS = %w{pretty profile progress rerun}
       DEFAULT_FORMAT = 'pretty'
-    
+
       attr_reader :paths
       attr_reader :options
-    
+
       def initialize(out_stream = STDOUT, error_stream = STDERR)
         @out_stream   = out_stream
         @error_stream = error_stream
-      
+
         @paths          = []
         @options        = default_options
         @active_format  = DEFAULT_FORMAT
       end
-    
+
       def parse!(args)
         @args = args
         return parse_args_from_profile('default') if @args.empty?
         @args.extend(::OptionParser::Arguable)
-      
+
         @args.options do |opts|
           opts.banner = ["Usage: cucumber [options] [ [FILE|DIR|URL][:LINE[:LINE]*] ]+", "",
             "Examples:",
@@ -30,7 +30,7 @@ module Cucumber
             "cucumber --language it examples/i18n/it/features/somma.feature:6:98:113",
             "cucumber -s -i http://rubyurl.com/eeCl", "", "",
           ].join("\n")
-          opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR", 
+          opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR",
             "Require files before executing the features. If this",
             "option is not specified, all *.rb files that are",
             "siblings or below the features will be loaded auto-",
@@ -42,7 +42,7 @@ module Cucumber
             @options[:require] ||= []
             @options[:require] << v
           end
-          opts.on("-l LANG", "--language LANG", 
+          opts.on("-l LANG", "--language LANG",
             "Specify language for features (Default: #{@options[:lang]})",
             %{Run with "--language help" to see all languages},
             %{Run with "--language LANG help" to list keywords for LANG}) do |v|
@@ -54,24 +54,24 @@ module Cucumber
               @options[:lang] = v
             end
           end
-          opts.on("-f FORMAT", "--format FORMAT", 
+          opts.on("-f FORMAT", "--format FORMAT",
             "How to format features (Default: #{DEFAULT_FORMAT})",
             "Available formats: #{FORMATS.join(", ")}",
             "You can also provide your own formatter classes as long",
             "as they have been previously required using --require or",
             "if they are in the folder structure such that cucumber",
-            "will require them automatically.", 
+            "will require them automatically.",
             "This option can be specified multiple times.") do |v|
             @options[:formats][v] = @out_stream
             @active_format = v
           end
-          opts.on("-o", "--out FILE", 
+          opts.on("-o", "--out FILE",
             "Write output to a file instead of STDOUT. This option",
             "applies to the previously specified --format, or the",
             "default format if no format is specified.") do |v|
             @options[:formats][@active_format] = v
           end
-          opts.on("-t TAGS", "--tags TAGS", 
+          opts.on("-t TAGS", "--tags TAGS",
             "Only execute the features or scenarios with the specified tags.",
             "TAGS must be comma-separated without spaces. Prefix tags with ~ to",
             "exclude features or scenarios having that tag. Tags can be specified",
@@ -84,8 +84,8 @@ module Cucumber
             "given names.") do |v|
             @options[:name_regexps] << /#{v}/
           end
-          opts.on("-e", "--exclude PATTERN", "Don't run feature files matching PATTERN") do |v|
-            @options[:excludes] << v
+          opts.on("-e", "--exclude PATTERN", "Don't run feature files or require ruby files matching PATTERN") do |v|
+            @options[:excludes] << Regexp.new(v)
           end
           opts.on("-p", "--profile PROFILE", "Pull commandline arguments from cucumber.yml.") do |v|
             parse_args_from_profile(v)
@@ -101,7 +101,7 @@ module Cucumber
             @options[:dry_run] = true
             @quiet = true
           end
-          opts.on("-a", "--autoformat DIRECTORY", 
+          opts.on("-a", "--autoformat DIRECTORY",
             "Reformats (pretty prints) feature files and write them to DIRECTORY.",
             "Be careful if you choose to overwrite the originals.",
             "Implies --dry-run --formatter pretty.") do |directory|
@@ -110,11 +110,11 @@ module Cucumber
             @options[:dry_run] = true
             @quiet = true
           end
-          opts.on("-m", "--no-multiline", 
+          opts.on("-m", "--no-multiline",
             "Don't print multiline strings and tables under steps.") do
             @options[:no_multiline] = true
           end
-          opts.on("-s", "--no-source", 
+          opts.on("-s", "--no-source",
             "Don't print the file and line of the step definition with the steps.") do
             @options[:source] = false
           end
@@ -157,19 +157,19 @@ module Cucumber
         # Whatever is left after option parsing is the FILE arguments
         @paths += args
       end
-    
+
       def verbose?
         @options[:verbose]
       end
-    
+
       def strict?
         @options[:strict]
       end
-      
+
       def guess?
         @options[:guess]
       end
-    
+
       def diff_enabled?
         @options[:diff_enabled]
       end
@@ -203,7 +203,7 @@ module Cucumber
               out.close
             end
           end
-        
+
           begin
             formatter_class = formatter_class(format)
             formatter_class.new(step_mother, out, @options)
@@ -211,12 +211,12 @@ module Cucumber
             exit_with_error("Error creating formatter: #{format}", e)
           end
         end
-      
+
         broadcaster = Broadcaster.new(formatters)
         broadcaster.options = @options
         return broadcaster
       end
-    
+
       def formatter_class(format)
         case format
           when 'html'     then Formatter::Html
@@ -229,7 +229,7 @@ module Cucumber
           constantize(format)
         end
       end
-    
+
       def files_to_require
         requires = @options[:require] || feature_dirs
         files = requires.map do |path|
@@ -239,32 +239,32 @@ module Cucumber
         sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
         env_files = sorted_files.select {|f| f =~ %r{/support/env.rb} }
         files = env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
+        remove_excluded_files_from(files)
         files.reject! {|f| f =~ %r{/support/env.rb} } if @options[:dry_run]
         files
       end
-    
+
+
       def feature_files
         potential_feature_files = @paths.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.chomp('/')
           File.directory?(path) ? Dir["#{path}/**/*.feature"] : path
         end.flatten.uniq
-
-        @options[:excludes].each do |exclude|
-          potential_feature_files.reject! do |path|
-            path =~ /#{Regexp.escape(exclude)}/
-          end
-        end
-
+        remove_excluded_files_from(potential_feature_files)
         potential_feature_files
       end
 
     protected
-  
+
+      def remove_excluded_files_from(files)
+        files.reject! {|path| @options[:excludes].detect {|pattern| path =~ pattern } }
+      end
+
       def feature_dirs
         @paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
       end
-    
+
       def constantize(camel_cased_word)
         names = camel_cased_word.split('::')
         names.shift if names.empty? || names.first.empty?
@@ -275,7 +275,7 @@ module Cucumber
         end
         constant
       end
-    
+
       def parse_args_from_profile(profile)
         unless cucumber_yml.has_key?(profile)
           return(exit_with_error <<-END_OF_ERROR)
@@ -299,7 +299,7 @@ Defined profiles in cucumber.yml:
       rescue YmlLoadError => e
         exit_with_error(e.message)
       end
-    
+
       def cucumber_yml
         return @cucumber_yml if @cucumber_yml
         unless File.exist?('cucumber.yml')
@@ -319,7 +319,7 @@ Defined profiles in cucumber.yml:
 
         return @cucumber_yml
       end
-    
+
       def list_keywords_and_exit(lang)
         unless Cucumber::LANGUAGES[lang]
           exit_with_error("No language with key #{lang}")
@@ -327,12 +327,12 @@ Defined profiles in cucumber.yml:
         LanguageHelpFormatter.list_keywords(@out_stream, lang)
         Kernel.exit
       end
-    
+
       def list_languages
         LanguageHelpFormatter.list_languages(@out_stream)
         Kernel.exit
       end
-    
+
       def default_options
         {
           :strict       => false,
@@ -347,7 +347,7 @@ Defined profiles in cucumber.yml:
           :diff_enabled => true
         }
       end
-    
+
       def exit_with_error(error_message, e=nil)
         @error_stream.puts(error_message)
         if e
@@ -357,6 +357,6 @@ Defined profiles in cucumber.yml:
         Kernel.exit 1
       end
     end
-  
+
   end
 end

data/lib/cucumber/languages.yml

@@ -161,6 +161,21 @@
   and: Y
   but: Pero
   space_after_keyword: true
+"cat":
+  name: Catalan
+  native: català
+  encoding: UTF-8
+  background: Rerefons
+  feature: Característica
+  scenario: Escenari
+  scenario_outline: Esquema de l'escenari
+  examples: Exemples
+  given: Donat
+  when: Quan
+  then: aleshores
+  and: i
+  but: Però
+  space_after_keyword: true
 "et":
   name: Estonian
   native: eesti keel

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -40,8 +40,8 @@ end
 #   <%%= f.label :alternative %><br />
 #   <%%= f.datetime_select :alternative %>
 # The following steps would fill out the form:
-# When I select "November 23, 2004 11:20" as the "Preferred" data and time
-# And I select "November 25, 2004 10:30" as the "Alternative" data and time
+# When I select "November 23, 2004 11:20" as the "Preferred" date and time
+# And I select "November 25, 2004 10:30" as the "Alternative" date and time
 When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
   select_datetime(datetime, :from => datetime_label)
 end

data/spec/cucumber/cli/configuration_spec.rb

@@ -4,20 +4,24 @@ require 'yaml'
 module Cucumber
 module Cli
   describe Configuration do
-    
+
     def given_cucumber_yml_defined_as(hash_or_string)
       File.stub!(:exist?).and_return(true)
       cucumber_yml = hash_or_string.is_a?(Hash) ? hash_or_string.to_yaml : hash_or_string
       IO.stub!(:read).with('cucumber.yml').and_return(cucumber_yml)
     end
-    
+
+    def given_the_following_files(*files)
+      File.stub!(:directory?).and_return(true)
+      Dir.stub!(:[]).and_return(files)
+    end
+
     before(:each) do
       Kernel.stub!(:exit).and_return(nil)
     end
 
     it "should require files in support paths first" do
-      File.stub!(:directory?).and_return(true)
-      Dir.stub!(:[]).and_return(["/features/step_definitions/foo.rb","/features/support/bar.rb"])
+      given_the_following_files("/features/step_definitions/foo.rb","/features/support/bar.rb")
 
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
@@ -29,8 +33,7 @@ module Cli
     end
 
     it "should require env.rb files first" do
-      File.stub!(:directory?).and_return(true)
-      Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
+      given_the_following_files("/features/support/a_file.rb","/features/support/env.rb")
 
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
@@ -42,8 +45,7 @@ module Cli
     end
 
     it "should not require env.rb files when --dry-run" do
-      File.stub!(:directory?).and_return(true)
-      Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
+      given_the_following_files("/features/support/a_file.rb","/features/support/env.rb")
 
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features --dry-run})
@@ -53,6 +55,37 @@ module Cli
       ]
     end
 
+    describe "--exclude" do
+
+      it "excludes a ruby file from requiring when the name matches exactly" do
+        given_the_following_files("/features/support/a_file.rb","/features/support/env.rb")
+
+        config = Configuration.new(StringIO.new)
+        config.parse!(%w{--require /features --exclude a_file.rb})
+
+        config.files_to_require.should == [
+          "/features/support/env.rb"
+        ]
+      end
+
+      it "excludes all ruby files that match the provided patterns from requiring" do
+        given_the_following_files("/features/support/foof.rb","/features/support/bar.rb",
+                                  "/features/support/food.rb","/features/blah.rb",
+                                  "/features/support/fooz.rb")
+
+        config = Configuration.new(StringIO.new)
+        config.parse!(%w{--require /features --exclude foo[df] --exclude blah})
+
+        config.files_to_require.should == [
+          "/features/support/bar.rb",
+          "/features/support/fooz.rb"
+        ]
+      end
+
+
+    end
+
+
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
@@ -121,7 +154,7 @@ END_OF_MESSAGE
 
       ['', 'sfsadfs', "--- \n- an\n- array\n", "---dddfd"].each do |bad_input|
         given_cucumber_yml_defined_as(bad_input)
-        
+
         config = Configuration.new(StringIO.new, error = StringIO.new)
         config.parse!([])
 
@@ -194,13 +227,13 @@ END_OF_MESSAGE
       config.options[:formats].should have_key('pretty')
       config.options[:formats].should have_key('progress')
     end
-    
+
     it "should associate --out to previous --format" do
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--format progress --out file1 --format profile --out file2})
       config.options[:formats].should == {"profile"=>"file2", "progress"=>"file1"}
     end
-    
+
     it "should accept --color option" do
       Term::ANSIColor.should_receive(:coloring=).with(true)
       config = Configuration.new(StringIO.new)
@@ -212,19 +245,19 @@ END_OF_MESSAGE
       config = Configuration.new(StringIO.new)
       config.parse!(['--no-color'])
     end
-    
+
     it "should parse tags" do
       config = Configuration.new(nil)
       includes, excludes = config.parse_tags("one,~two,@three,~@four")
       includes.should == ['one', 'three']
       excludes.should == ['two', 'four']
     end
-    
+
     describe "--backtrace" do
       before do
         Exception.cucumber_full_backtrace = false
       end
-      
+
       it "should show full backtrace when --backtrace is present" do
         config = Main.new(['--backtrace'])
         begin
@@ -238,31 +271,31 @@ END_OF_MESSAGE
         Exception.cucumber_full_backtrace = false
       end
     end
-    
+
     describe "diff output" do
 
       it "is enabled by default" do
         config = Configuration.new
         config.diff_enabled?.should be_true
       end
-      
+
       it "is disabled when the --no-diff option is supplied" do
         config = Configuration.new
         config.parse!(%w{--no-diff})
 
         config.diff_enabled?.should be_false
       end
-        
+
     end
 
     it "should accept multiple --name options" do
       config = Configuration.new
       config.parse!(['--name', "User logs in", '--name', "User signs up"])
-      
+
       config.options[:name_regexps].should include(/User logs in/)
       config.options[:name_regexps].should include(/User signs up/)
     end
-    
+
     it "should accept multiple -n options" do
       config = Configuration.new
       config.parse!(['-n', "User logs in", '-n', "User signs up"])
@@ -275,13 +308,13 @@ END_OF_MESSAGE
       File.stub!(:directory?).and_return(true)
       Dir.should_receive(:[]).with("feature_directory/**/*.feature").
         any_number_of_times.and_return(["cucumber.feature"])
-      
+
       config = Configuration.new(StringIO)
       config.parse!(%w{feature_directory/})
-      
+
       config.feature_files.should == ["cucumber.feature"]
     end
-    
+
   end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.3.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-10 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -235,11 +235,13 @@ files:
 - examples/selenium/features/step_definitons/search_steps.rb
 - examples/selenium/features/support/env.rb
 - examples/selenium_webrat/Rakefile
+- examples/selenium_webrat/config.ru
 - examples/selenium_webrat/features/search.feature
 - examples/selenium_webrat/features/step_definitons/search_steps.rb
 - examples/selenium_webrat/features/support/env.rb
 - examples/self_test/README.textile
 - examples/self_test/Rakefile
+- examples/self_test/features/background/background_tagged_before_on_outline.feature
 - examples/self_test/features/background/background_with_name.feature
 - examples/self_test/features/background/failing_background.feature
 - examples/self_test/features/background/failing_background_after_success.feature
@@ -310,6 +312,7 @@ files:
 - features/cucumber_cli_diff_disabled.feature
 - features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
+- features/exclude_files.feature
 - features/multiline_names.feature
 - features/rake_task.feature
 - features/report_called_undefined_steps.feature
@@ -473,7 +476,7 @@ requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Executable Feature scenarios
 test_files: []