aslakhellesoy-cucumber 0.1.99.10 → 0.1.99.11

data/History.txt

@@ -57,6 +57,7 @@ Scenario Outlines, the rich command line, the nice output format and everything
 pure Ruby users have been enjoying for a while.
 
 == Bugfixes
+* -n option does not suppress the line info for a Scenario Outline (#175 Aslak Hellesøy)
 * Errors with rspec-rails matchers in cucumber 0.1.99 (#173 David Chelimsky)
 * Can't use an empty string as a table value in a scenario outline (#172 Aslak Hellesøy)
 * Really skip skipped steps (#90 Aslak Hellesøy)
@@ -68,6 +69,7 @@ pure Ruby users have been enjoying for a while.
 * Pending steps in > steps called from steps (#65 Aslak Hellesøy)
 
 === New features
+* New --no-multiline option to reduce noise. Useful if lots of features are failing.
 * Added ability to pass URIs to cucumber in addition to files and directories. Useful for troubleshooting! (Aslak Hellesøy)
 * Groups of tabular scenarios (#57 Aslak Hellesøy)
 * Tagging scenarios and features. Pick the ones to run with --tags (#54 Aslak Hellesøy)
@@ -90,7 +92,7 @@ pure Ruby users have been enjoying for a while.
 * "More Examples" is gone. "Scenario" + "More Examples" is no longer supported. Use "Scenario Outline" + "Examples" instead.
 * Pure Ruby features are no longer supported.
 
-== 0.1.16
+== (0.16.4 aslakhellesoy-webrat gem on GitHub)
 
 Bugfix release.
 
@@ -109,6 +111,7 @@ to this:
 * Use Webrat's #contain matcher in generated "I should (not) see" step definitions (Bryan Helmkamp)
 
 == Bugfixes
+* Escaped quotes - \" - inside multiline strings will be unescaped.
 * Flush output in HTML formatter since JRuby doesnt do it automatically (Diego Carrion)
 * Better handling of ARGV (#169 David Chelimsky, Ben Mabey)
 * Compatibility with ruby-debug (do ARGV.dup in bin/cucumber so it can restart ruby with same args) (Aslak Hellesøy)

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Aslak Hellesøy
+Copyright (c) 2008,2009 Aslak Hellesøy
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -175,7 +175,8 @@ lib/cucumber/ast/table.rb
 lib/cucumber/ast/tags.rb
 lib/cucumber/ast/visitor.rb
 lib/cucumber/broadcaster.rb
-lib/cucumber/cli.rb
+lib/cucumber/cli/language_help_formatter.rb
+lib/cucumber/cli/main.rb
 lib/cucumber/core_ext/exception.rb
 lib/cucumber/core_ext/instance_exec.rb
 lib/cucumber/core_ext/proc.rb
@@ -206,7 +207,6 @@ lib/cucumber/rake/task.rb
 lib/cucumber/step_definition.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
-pretty.txt
 rails_generators/cucumber/USAGE
 rails_generators/cucumber/cucumber_generator.rb
 rails_generators/cucumber/templates/cucumber
@@ -226,7 +226,7 @@ spec/cucumber/ast/scenario_spec.rb
 spec/cucumber/ast/step_spec.rb
 spec/cucumber/ast/table_spec.rb
 spec/cucumber/broadcaster_spec.rb
-spec/cucumber/cli_spec.rb
+spec/cucumber/cli/main_spec.rb
 spec/cucumber/core_ext/proc_spec.rb
 spec/cucumber/core_ext/string_spec.rb
 spec/cucumber/formatter/ansicolor_spec.rb

data/bin/cucumber

@@ -2,5 +2,5 @@
 # Add '.rb' to work around a bug in IronRuby's File#dirname
 $:.unshift(File.dirname(__FILE__ + '.rb') + '/../lib') unless $:.include?(File.dirname(__FILE__ + '.rb') + '/../lib')
 
-require 'cucumber/cli'
-Cucumber::CLI.execute(ARGV.dup)
+require 'cucumber/cli/main'
+Cucumber::Cli::Main.execute(ARGV.dup)

data/examples/self_test/features/sample.feature

@@ -14,3 +14,6 @@ Feature: Sample
   @four
   Scenario: Failing
     Given failing
+      """
+      hello
+      """

data/examples/self_test/features/step_definitions/sample_steps.rb

@@ -5,7 +5,7 @@ end
 Given /^passing$/ do |table|
 end
 
-Given /^failing$/ do
+Given /^failing$/ do |string|
   flunker
 end
 

data/features/cucumber_cli.feature

@@ -50,6 +50,9 @@ Feature: Cucumber command line
         @four
         Scenario: Failing
           Given failing
+            \"\"\"
+            hello
+            \"\"\"
             FAIL (RuntimeError)
             ./features/step_definitions/sample_steps.rb:2:in `flunker'
             ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
@@ -199,6 +202,9 @@ Feature: Cucumber command line
         @four
         Scenario: Failing
           Given failing
+            \"\"\"
+            hello
+            \"\"\"
 
       11 scenarios
       11 skipped steps
@@ -293,6 +299,9 @@ Feature: Cucumber command line
         @four
         Scenario: Failing
           Given failing
+            \"\"\"
+            hello
+            \"\"\"
             FAIL (RuntimeError)
             ./features/step_definitions/sample_steps.rb:2:in `flunker'
             ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
@@ -325,6 +334,9 @@ Feature: Cucumber command line
         @four
         Scenario: Failing
           Given failing
+            \"\"\"
+            hello
+            \"\"\"
 
 
       """

data/lib/cucumber/ast/py_string.rb

@@ -19,7 +19,7 @@ module Cucumber
     class PyString
       def initialize(start_line, end_line, string, quotes_indent)
         @start_line, @end_line = start_line, end_line
-        @string, @quotes_indent = string, quotes_indent
+        @string, @quotes_indent = string.gsub(/\\"/, '"'), quotes_indent
       end
 
       def to_s
@@ -46,7 +46,7 @@ module Cucumber
       def to_sexp #:nodoc:
         [:py_string, to_s]
       end
-                
+    
     end
   end
 end

data/lib/cucumber/cli/language_help_formatter.rb

@@ -0,0 +1,58 @@
+require 'cucumber/formatter/pretty'
+
+module Cucumber
+  module Cli2
+    class LanguageHelpFormatter < Formatter::Pretty
+      INCOMPLETE = %{
+This language is incomplete. Please translate the missing words in
+#{Cucumber::LANGUAGE_FILE}
+
+Then contribute back to the Cucumber project. Details here:
+http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
+}
+
+      def self.list_languages(io)
+        raw = Cucumber::LANGUAGES.keys.sort.map do |lang|
+          [lang, Cucumber::LANGUAGES[lang]['name'], Cucumber::LANGUAGES[lang]['native']]
+        end
+        table = Ast::Table.new(raw)
+        new(nil, io, {:check_lang=>true}, '').visit_multiline_arg(table, :passed)
+      end
+
+      def self.list_keywords(io, lang)
+        Cucumber.load_language(lang)
+        raw = Cucumber::KEYWORD_KEYS.map do |key|
+          [key, Cucumber::LANGUAGES[lang][key]]
+        end
+        table = Ast::Table.new(raw)
+        new(nil, io, {:incomplete => Cucumber.language_incomplete?}, '').visit_multiline_arg(table, :passed)
+      end
+
+      def visit_multiline_arg(table, status)
+        if @options[:incomplete]
+          @io.puts(format_string(INCOMPLETE, :failed))
+        end
+        super
+      end
+
+      def visit_table_row(table_row, status)
+        @col = 1
+        super
+      end
+
+      def visit_table_cell_value(value, width, status)
+        if @col == 1
+          if(@options[:check_lang])
+            @incomplete = Cucumber.language_incomplete?(value)
+          end
+          status = :comment 
+        elsif @incomplete
+          status = :failed
+        end
+        
+        @col += 1
+        super(value, width, status)
+      end
+    end
+  end
+end

data/lib/cucumber/{cli.rb → cli/main.rb}

@@ -3,11 +3,13 @@ require 'cucumber'
 require 'ostruct'
 require 'cucumber/parser'
 require 'cucumber/formatter'
+require 'cucumber/cli/language_help_formatter'
 
 module Cucumber
+module Cli
   class YmlLoadError < StandardError; end
 
-  class CLI
+  class Main
     class << self
       def step_mother=(step_mother)
         @step_mother = step_mother
@@ -54,11 +56,11 @@ module Cucumber
       args.extend(OptionParser::Arguable)
 
       args.options do |opts|
-        opts.banner = ["Usage: cucumber [options] [[FILE[:LINE[:LINE]*]] | [FILES|DIRS]]", "",
+        opts.banner = ["Usage: cucumber [options] [ [FILE|DIR|URL][:LINE[:LINE]*] ]+", "",
           "Examples:",
           "cucumber examples/i18n/en/features",
           "cucumber --language it examples/i18n/it/features/somma.feature:6:98:113",
-          "cucumber --no-snippets http://tinyurl.com/cuke-mastermind", "", "",
+          "cucumber -n -i http://rubyurl.com/eeCl", "", "",
         ].join("\n")
         opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR", 
           "Require files before executing the features. If this",
@@ -136,16 +138,16 @@ module Cucumber
           @options[:dry_run] = true
           @quiet = true
         end
-        opts.on("-m", "--[no-]multiline", 
-          "Don't print multiline strings and tables under steps.") do |v|
-          @options[:source] = v
+        opts.on("-m", "--no-multiline", 
+          "Don't print multiline strings and tables under steps.") do
+          @options[:no_multiline] = true
         end
-        opts.on("-n", "--[no-]source", 
-          "Don't show the file and line of the step definition with the steps.") do |v|
-          @options[:source] = v
+        opts.on("-n", "--no-source", 
+          "Don't print the file and line of the step definition with the steps.") do
+          @options[:source] = false
         end
-        opts.on("-i", "--[no-]snippets", "Don't show the snippets for pending steps.") do |v|
-          @options[:snippets] = v
+        opts.on("-i", "--no-snippets", "Don't print snippets for pending steps.") do
+          @options[:snippets] = false
         end
         opts.on("-q", "--quiet", "Alias for --no-snippets --no-source.") do
           @quiet = true
@@ -181,6 +183,10 @@ module Cucumber
 
     def execute!(step_mother)
       Cucumber.load_language(@options[:lang])
+      if Cucumber.language_incomplete?
+        list_keywords(Cucumber.lang)
+      end
+
       require_files
       enable_diffing
       features = load_plain_text_features
@@ -366,50 +372,19 @@ Defined profiles in cucumber.yml:
     end
 
     def list_languages
-      raw = Cucumber::LANGUAGES.keys.sort.map do |lang|
-        [lang, Cucumber::LANGUAGES[lang]['name'], Cucumber::LANGUAGES[lang]['native']]
-      end
-      print_lang_table(raw, {:check_lang=>true})
+      Cli2::LanguageHelpFormatter.list_languages(@out_stream)
+      Kernel.exit
     end
 
     def list_keywords(lang)
       unless Cucumber::LANGUAGES[lang]
-        exit_with_error("No language with key #{v}")
-      end
-      raw = Cucumber::KEYWORD_KEYS.map do |key|
-        [key, Cucumber::LANGUAGES[lang][key]]
-      end
-      print_lang_table(raw, {})
-    end
-    
-    def print_lang_table(raw, options)
-      table = Ast::Table.new(raw)
-      formatter = Formatter::Pretty.new(nil, @out_stream, options, '')
-
-      def formatter.visit_table_row(table_row, status)
-        @col = 1
-        super
+        exit_with_error("No language with key #{lang}")
       end
-
-      def formatter.visit_table_cell_value(value, width, status)
-        if @col == 1
-          if(@options[:check_lang])
-            @incomplete = Cucumber.language_complete?(value)
-          end
-          status = :comment 
-        elsif @incomplete
-          status = :failed
-        end
-        
-        @col += 1
-        super(value, width, status)
-      end
-
-      formatter.indent = 0
-      formatter.visit_multiline_arg(table, :passed)
+      Cli2::LanguageHelpFormatter.list_keywords(@out_stream, lang)
       Kernel.exit
     end
   end
 end
+end
 
-Cucumber::CLI.step_mother = self
+Cucumber::Cli::Main.step_mother = self

data/lib/cucumber/formatter/pretty.rb

@@ -18,6 +18,7 @@ module Cucumber
         @io = io
         @options = options
         @delim = delim
+        @indent = 0
       end
 
       def visit_features(features)
@@ -120,6 +121,7 @@ module Cucumber
       end
 
       def visit_multiline_arg(multiline_arg, status)
+        return if @options[:no_multiline]
         multiline_arg.accept(self, status)
       end
 

data/lib/cucumber/version.rb

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

data/lib/cucumber.rb

@@ -7,7 +7,7 @@ require 'rubygems'
 require 'cucumber/parser'
 require 'cucumber/version'
 require 'cucumber/step_mother'
-require 'cucumber/cli'
+require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
 require 'cucumber/core_ext/exception'
 
@@ -24,7 +24,7 @@ module Cucumber
       Parser.load_parser(keyword_hash)
     end
 
-    def language_complete?(lang)
+    def language_incomplete?(lang=@lang)
       KEYWORD_KEYS.detect{|key| keyword_hash(lang)[key].nil?}
     end
 

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -56,7 +56,7 @@ module Cucumber
 
       it "should pretty print" do
         require 'cucumber/formatter/pretty'
-        visitor = Formatter::Pretty.new(@step_mother, STDOUT, {:source => true})
+        visitor = Formatter::Pretty.new(@step_mother, STDOUT, {:comment => true})
         visitor.visit_feature_element(@scenario_outline)
       end
     end

data/spec/cucumber/{cli_spec.rb → cli/main_spec.rb}

@@ -1,8 +1,9 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 require 'yaml'
 
 module Cucumber
-  describe CLI do
+module Cli
+  describe Main do
     
     def mock_executor(stubs = {})
       stub('executor', {:visit_features => nil, :lines_for_features= => nil, :failed => false, :formatters= => nil}.merge(stubs))
@@ -27,7 +28,7 @@ module Cucumber
     end
     
     it "should expand args from YAML file" do
-      cli = CLI.new
+      cli = Main.new
       
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
@@ -37,7 +38,7 @@ module Cucumber
     end
 
     it "should expand args from YAML file's default if there are no args" do
-      cli = CLI.new
+      cli = Main.new
 
       given_cucumber_yml_defined_as({'default' => '--require from/yml'})
 
@@ -46,7 +47,7 @@ module Cucumber
     end
     
     it "should provide a helpful error message when a specified profile does not exists in YAML file" do
-      cli = CLI.new(StringIO.new, error = StringIO.new)
+      cli = Main.new(StringIO.new, error = StringIO.new)
       
       given_cucumber_yml_defined_as({'default' => '--require from/yml', 'html_report' =>  '--format html'})
     
@@ -64,7 +65,7 @@ END_OF_MESSAGE
     end
     
     it "should provide a helpful error message when a specified profile is not a String" do
-      cli = CLI.new(StringIO.new, error = StringIO.new)
+      cli = Main.new(StringIO.new, error = StringIO.new)
 
       given_cucumber_yml_defined_as({'foo' => [1,2,3]})
 
@@ -75,7 +76,7 @@ END_OF_MESSAGE
     
     it "should provide a helpful error message when a specified profile exists but is nil or blank" do
       [nil, '   '].each do |bad_input|
-        cli = CLI.new(StringIO.new, error = StringIO.new)
+        cli = Main.new(StringIO.new, error = StringIO.new)
 
         given_cucumber_yml_defined_as({'foo' => bad_input})
 
@@ -86,7 +87,7 @@ END_OF_MESSAGE
     end
 
     it "should provide a helpful error message when no YAML file exists and a profile is specified" do
-      cli = CLI.new(StringIO.new, error = StringIO.new)
+      cli = Main.new(StringIO.new, error = StringIO.new)
       
       File.should_receive(:exist?).with('cucumber.yml').and_return(false)
     
@@ -99,7 +100,7 @@ END_OF_MESSAGE
         expected_error_message = /cucumber.yml was found, but was blank or malformed. Please refer to cucumber's documentaion on correct profile usage./
           
       ['', 'sfsadfs', "--- \n- an\n- array\n", "---dddfd"].each do |bad_input|
-        cli = CLI.new(StringIO.new, error = StringIO.new)
+        cli = Main.new(StringIO.new, error = StringIO.new)
       
         given_cucumber_yml_defined_as(bad_input)
         cli.parse_options!([])
@@ -110,7 +111,7 @@ END_OF_MESSAGE
     
     it "should procide a helpful error message when the YAML can not be parsed" do
         expected_error_message = /cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentaion on correct profile usage./
-      cli = CLI.new(StringIO.new, error = StringIO.new)
+      cli = Main.new(StringIO.new, error = StringIO.new)
       
       given_cucumber_yml_defined_as("input that causes an exception in YAML loading")
       YAML.should_receive(:load).and_raise Exception
@@ -121,28 +122,28 @@ END_OF_MESSAGE
     end
     
     it "should accept --dry-run option" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       cli.parse_options!(%w{--dry-run})
       cli.options[:dry_run].should be_true
       cli.execute!(stub('step mother'))
     end
 
     it "should accept --no-source option" do
-      cli = CLI.new
+      cli = Main.new
       cli.parse_options!(%w{--no-source})
 
       cli.options[:source].should be_false
     end
 
     it "should accept --no-snippets option" do
-      cli = CLI.new
+      cli = Main.new
       cli.parse_options!(%w{--no-snippets})
       
       cli.options[:snippets].should be_false
     end
 
     it "should set snippets and source to false with --quiet option" do
-      cli = CLI.new
+      cli = Main.new
       cli.parse_options!(%w{--quiet})
       
       cli.options[:snippets].should be_nil
@@ -150,7 +151,7 @@ END_OF_MESSAGE
     end
 
     it "should accept --verbose option" do
-      cli = CLI.new
+      cli = Main.new
       cli.parse_options!(%w{--verbose})
 
       cli.options[:verbose].should be_true
@@ -160,7 +161,7 @@ END_OF_MESSAGE
       File.stub!(:directory?).and_return(true)
       Dir.stub!(:[]).and_return(["/features/step_definitions/foo.rb","/features/support/env.rb"])
       
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       cli.parse_options!(%w{--require /features})
 
       cli.should_receive(:require).with("/features/support/env.rb").ordered
@@ -174,7 +175,7 @@ END_OF_MESSAGE
       
       before(:each) do
         @out = StringIO.new
-        @cli = CLI.new(@out)
+        @cli = Main.new(@out)
         @cli.stub!(:require)
         @empty_feature = Ast::Feature.new(Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
         Dir.stub!(:[])
@@ -199,26 +200,26 @@ END_OF_MESSAGE
     end
 
     it "should accept --out option" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       cli.parse_options!(%w{--out jalla.txt})
       cli.options[:formats]['pretty'].should == 'jalla.txt'
     end
 
     it "should accept multiple --out options" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       cli.parse_options!(%w{--format progress --out file1 --out file2})
       cli.options[:formats].should == {'progress' => 'file2'}
     end
 
     it "should accept multiple --format options" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       cli.parse_options!(%w{--format pretty --format progress})
       cli.options[:formats].should have_key('pretty')
       cli.options[:formats].should have_key('progress')
     end
 
     it "should associate --out to previous --format" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       cli.parse_options!(%w{--format progress --out file1 --format profile --out file2})
       cli.options[:formats].should == {"profile"=>"file2", "progress"=>"file1"}
     end
@@ -228,7 +229,7 @@ END_OF_MESSAGE
      describe "in module" do
 
         it "should resolve each module until it gets Formatter class" do
-          cli = CLI.new(nil)
+          cli = Main.new(nil)
           mock_module = mock('module')
           cli.parse_options!(%w{--format ZooModule::MonkeyFormatterClass})
           Object.stub!(:const_defined?).and_return(true)
@@ -253,7 +254,7 @@ END_OF_MESSAGE
         end
         
         xit "should create the formatter" do
-          cli = CLI.new
+          cli = Main.new
           mock_formatter = mock('magical formatter')
           cli.parse_options!(%w{--format magical})
 
@@ -263,7 +264,7 @@ END_OF_MESSAGE
         end
                 
         xit "should register the formatter with broadcaster" do
-          cli = CLI.new
+          cli = Main.new
           broadcaster = Broadcaster.new
           mock_formatter = mock('magical formatter')
           Broadcaster.stub!(:new).and_return(broadcaster, stub("output broadcaster", :register => nil))
@@ -282,7 +283,7 @@ END_OF_MESSAGE
         before(:each) do
           @out = StringIO.new
           @error = StringIO.new
-          @cli = CLI.new(@out, @error)
+          @cli = Main.new(@out, @error)
           
           mock_formatter_class = stub('formatter class')
           mock_formatter_class.stub!(:new).and_raise("No such method")
@@ -313,7 +314,7 @@ END_OF_MESSAGE
         before(:each) do
           @out = StringIO.new
           @error = StringIO.new
-          @cli = CLI.new(@out, @error)
+          @cli = Main.new(@out, @error)
           
           @cli.parse_options!(%w{--format invalid})
         end
@@ -345,14 +346,14 @@ END_OF_MESSAGE
     end
 
     it "should accept multiple --scenario options" do
-      cli = CLI.new
+      cli = Main.new
       cli.parse_options!(['--scenario', "User logs in", '--scenario', "User signs up"])
       cli.options[:scenario_names].should include("User logs in")
       cli.options[:scenario_names].should include("User signs up")
     end
 
     xit "should register --scenario options with the executor" do
-      cli = CLI.new
+      cli = Main.new
       cli.parse_options!(['--scenario', "User logs in", '--scenario', "User signs up"])
       executor = mock_executor
       executor.should_receive(:scenario_names=).with(["User logs in", "User signs up"])
@@ -360,13 +361,13 @@ END_OF_MESSAGE
     end
 
     it "should accept --color option" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       Term::ANSIColor.should_receive(:coloring=).with(true)
       cli.parse_options!(['--color'])
     end
 
     it "should accept --no-color option" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
       Term::ANSIColor.should_receive(:coloring=).with(false)
       cli.parse_options!(['--no-color'])
     end
@@ -377,7 +378,7 @@ END_OF_MESSAGE
       end
       
       it "should show full backtrace when --backtrace is present" do
-        cli = CLI.new
+        cli = Main.new
         cli.parse_options!(['--backtrace'])
         begin
           "x".should == "y"
@@ -387,7 +388,7 @@ END_OF_MESSAGE
       end
 
       xit "should strip gems when --backtrace is absent" do
-        cli = CLI.new
+        cli = Main.new
         cli.parse_options!(['--'])
         begin
           "x".should == "y"
@@ -402,7 +403,7 @@ END_OF_MESSAGE
     end
 
     it "should search for all features in the specified directory" do
-      cli = CLI.new(StringIO.new)
+      cli = Main.new(StringIO.new)
 
       cli.parse_options!(%w{feature_directory/})
       File.stub!(:directory?).and_return(true)
@@ -414,3 +415,4 @@ END_OF_MESSAGE
 
   end
 end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.10
+  version: 0.1.99.11
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-01-27 00:00:00 -08:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - examples/i18n/ja/README.txt
-- pretty.txt
 files: 
 - History.txt
 - License.txt
@@ -240,7 +239,8 @@ files:
 - lib/cucumber/ast/tags.rb
 - lib/cucumber/ast/visitor.rb
 - lib/cucumber/broadcaster.rb
-- lib/cucumber/cli.rb
+- lib/cucumber/cli/language_help_formatter.rb
+- lib/cucumber/cli/main.rb
 - lib/cucumber/core_ext/exception.rb
 - lib/cucumber/core_ext/instance_exec.rb
 - lib/cucumber/core_ext/proc.rb
@@ -271,7 +271,6 @@ files:
 - lib/cucumber/step_definition.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/version.rb
-- pretty.txt
 - rails_generators/cucumber/USAGE
 - rails_generators/cucumber/cucumber_generator.rb
 - rails_generators/cucumber/templates/cucumber
@@ -291,7 +290,7 @@ files:
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
 - spec/cucumber/broadcaster_spec.rb
-- spec/cucumber/cli_spec.rb
+- spec/cucumber/cli/main_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/core_ext/string_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb

data/pretty.txt

@@ -1,486 +0,0 @@
-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 # features/cucumber_cli.feature:5
-    When I run cucumber -q features/sample.feature:5         # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                                 # features/step_definitions/cucumber_steps.rb:15
-      """
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-      1 scenario
-      1 undefined step
-
-      """
-
-  Scenario: Fail with --strict                                # features/cucumber_cli.feature:21
-    When I run cucumber -q features/sample.feature:5 --strict # features/step_definitions/cucumber_steps.rb:5
-    Then it should fail with                                  # features/step_definitions/cucumber_steps.rb:15
-      """
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-      1 scenario
-      1 undefined step
-
-      """
-
-  Scenario: Specify 2 line numbers where one is a tag   # features/cucumber_cli.feature:37
-    When I run cucumber -q features/sample.feature:5:14 # features/step_definitions/cucumber_steps.rb:5
-    Then it should fail with                            # features/step_definitions/cucumber_steps.rb:15
-      """
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-        @four
-        Scenario: Failing
-          Given failing
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
-            features/sample.feature:16:in `Given failing'
-
-      2 scenarios
-      1 failed step
-      1 undefined step
-
-      """
-
-  Scenario: Require missing step definition from elsewhere                                             # features/cucumber_cli.feature:62
-    When I run cucumber -q -r ../../features/step_definitions/extra_steps.rb features/sample.feature:5 # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                                                                           # features/step_definitions/cucumber_steps.rb:15
-      """
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-      1 scenario
-      1 passed step
-
-      """
-
-  Scenario: Specify the line number of a row          # features/cucumber_cli.feature:78
-    When I run cucumber -q features/sample.feature:12 # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                          # features/step_definitions/cucumber_steps.rb:15
-      """
-      @one
-      Feature: Sample
-
-        @three
-        Scenario: Passing
-          Given passing
-            | a | b |
-            | c | d |
-
-      1 scenario
-      1 passed step
-
-      """
-
-  Scenario: Run all with progress formatter                          # features/cucumber_cli.feature:96
-    When I run cucumber -q --format progress features/sample.feature # features/step_definitions/cucumber_steps.rb:5
-    Then it should fail with                                         # features/step_definitions/cucumber_steps.rb:15
-      """
-      U.F
-
-      (::) failed steps (::)
-
-      FAIL (RuntimeError)
-      ./features/step_definitions/sample_steps.rb:2:in `flunker'
-      ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
-      features/sample.feature:16:in `Given failing'
-
-      3 scenarios
-      1 failed step
-      1 undefined step
-      1 passed step
-
-      """
-
-  Scenario: Run Norwegian                         # features/cucumber_cli.feature:116
-    Given I am in i18n/no                         # features/step_definitions/cucumber_steps.rb:1
-    When I run cucumber -q --language no features # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                      # features/step_definitions/cucumber_steps.rb:15
-      """
-      Egenskap: Summering
-        For å slippe å gjøre dumme feil
-        Som en regnskapsfører
-        Vil jeg kunne legge sammen
-
-        Scenario: to tall
-          Gitt at jeg har tastet inn 5
-          Og at jeg har tastet inn 7
-          Når jeg summerer
-          Så skal resultatet være 12
-
-        @iterasjon3
-        Scenario: tre tall
-          Gitt at jeg har tastet inn 5
-          Og at jeg har tastet inn 7
-          Og at jeg har tastet inn 1
-          Når jeg summerer
-          Så skal resultatet være 13
-
-      2 scenarios
-      9 passed steps
-
-      """
-
-  Scenario: --dry-run                                    # features/cucumber_cli.feature:145
-    When I run cucumber --dry-run --no-snippets features # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                             # features/step_definitions/cucumber_steps.rb:15
-      """
-      Feature: Calling undefined step
-
-        Scenario: Call directly
-          Given a step definition that calls an undefined step
-
-        Scenario: Call via another
-          Given call step "a step definition that calls an undefined step"
-
-      Feature: Lots of undefined
-
-        Scenario: Implement me
-          Given it snows in Sahara
-          Given it's 40 degrees in Norway
-          And it's 40 degrees in Norway
-          When I stop procrastinating
-          And there is world peace
-
-      Feature: Outline Sample
-
-        Scenario: I have no steps
-
-        Scenario Outline: Test state
-          Given <state> without a table
-          Given <other_state> without a table
-
-        Examples: 
-          | state   | other_state |
-          | missing | passing     |
-          | passing | passing     |
-          | failing | passing     |
-
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-        @three
-        Scenario: Passing
-          Given passing
-            | a | b |
-            | c | d |
-
-        @four
-        Scenario: Failing
-          Given failing
-
-      10 scenarios
-      9 skipped steps
-      7 undefined steps
-
-      """
-
-  Scenario: Multiple formatters and outputs                                                                     # features/cucumber_cli.feature:203
-    When I run cucumber --format progress --out tmp/progress.txt --format html --out tmp/features.html features # features/step_definitions/cucumber_steps.rb:5
-    And examples/self_test/tmp/progress.txt should contain                                                      # features/step_definitions/cucumber_steps.rb:25
-      """
-      P.FP.F
-
-      Pending Scenarios:
-
-      1)  Outline Sample (Test state)
-      2)  Sample (Missing)
-
-
-      Failed:
-
-      1)
-      FAIL
-      ./features/step_definitions/sample_steps.rb:12:in ` /^failing without a table$/'
-      features/outline_sample.feature:9:in `/^failing without a table$/'
-
-      2)
-      FAIL
-      ./features/step_definitions/sample_steps.rb:5:in `Given /^failing$/'
-      features/sample.feature:12:in `Given failing'
-
-      """
-      No such file or directory - examples/self_test/tmp/progress.txt (Errno::ENOENT)
-      ./features/step_definitions/cucumber_steps.rb:26:in `read'
-      ./features/step_definitions/cucumber_steps.rb:26:in `/^(.*) should contain$/'
-      features/cucumber_cli.feature:205:in `And examples/self_test/tmp/progress.txt should contain'
-    And examples/self_test/tmp/features.html should match                                                       # features/step_definitions/cucumber_steps.rb:29
-      """
-      Given passing
-      """
-
-  Scenario: Run scenario specified by name using --scenario           # features/cucumber_cli.feature:233
-    When I run cucumber --scenario Passing -q features/sample.feature # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                                          # features/step_definitions/cucumber_steps.rb:15
-      """
-      Feature: Sample
-        Scenario: Passing
-          Given passing
-
-
-      1 scenario
-      1 passed step
-
-      """
-      expected: "Feature: Sample\n  Scenario: Passing\n    Given passing\n\n\n1 scenario\n1 passed step\n",
-           got: "@one\nFeature: Sample\n\n  @two @three\n  Scenario: Missing\n    Given missing\n\n  @three\n  Scenario: Passing\n    Given passing\n      | a | b |\n      | c | d |\n\n  @four\n  Scenario: Failing\n    Given failing\n      FAIL (RuntimeError)\n      ./features/step_definitions/sample_steps.rb:2:in `flunker'\n      ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'\n      features/sample.feature:16:in `Given failing'\n\n3 scenarios\n1 failed step\n1 undefined step\n1 passed step\n" (using ==)
-      Diff:
-      
-      
-      
-      
-      @@ -1,8 +1,26 @@
-      +@one
-       Feature: Sample
-      +
-      +  @two @three
-      +  Scenario: Missing
-      +    Given missing
-      +
-      +  @three
-         Scenario: Passing
-           Given passing
-      +      | a | b |
-      +      | c | d |
-       
-      +  @four
-      +  Scenario: Failing
-      +    Given failing
-      +      FAIL (RuntimeError)
-      +      ./features/step_definitions/sample_steps.rb:2:in `flunker'
-      +      ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
-      +      features/sample.feature:16:in `Given failing'
-       
-      -1 scenario
-      +3 scenarios
-      +1 failed step
-      +1 undefined step
-       1 passed step
-       (Spec::Expectations::ExpectationNotMetError)
-      ./features/step_definitions/cucumber_steps.rb:17:in `/^it should (fail|pass) with$/'
-      features/cucumber_cli.feature:235:in `Then it should pass with'
-
-  Scenario: Run with a tag that exists on 2 scenarios # features/cucumber_cli.feature:247
-    When I run cucumber -q features --tags three      # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                          # features/step_definitions/cucumber_steps.rb:15
-      """
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-        @three
-        Scenario: Passing
-          Given passing
-            | a | b |
-            | c | d |
-
-      2 scenarios
-      1 undefined step
-      1 passed step
-
-      """
-
-  Scenario: Run with a tag that exists on 1 feature # features/cucumber_cli.feature:270
-    When I run cucumber -q features --tags one      # features/step_definitions/cucumber_steps.rb:5
-    Then it should fail with                        # features/step_definitions/cucumber_steps.rb:15
-      """
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-        @three
-        Scenario: Passing
-          Given passing
-            | a | b |
-            | c | d |
-
-        @four
-        Scenario: Failing
-          Given failing
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
-            features/sample.feature:16:in `Given failing'
-
-      3 scenarios
-      1 failed step
-      1 undefined step
-      1 passed step
-
-      """
-
-  Scenario: Reformat files with --autoformat                                     # features/cucumber_cli.feature:302
-    When I run cucumber --autoformat tmp/formatted features                      # features/step_definitions/cucumber_steps.rb:5
-    Then examples/self_test/tmp/formatted/features/sample.feature should contain # features/step_definitions/cucumber_steps.rb:25
-      """
-      @one
-      Feature: Sample
-
-        @two @three
-        Scenario: Missing
-          Given missing
-
-        @three
-        Scenario: Passing
-          Given passing
-            | a | b |
-            | c | d |
-
-        @four
-        Scenario: Failing
-          Given failing
-
-
-      """
-      No such file or directory - examples/self_test/tmp/formatted/features/sample.feature (Errno::ENOENT)
-      ./features/step_definitions/cucumber_steps.rb:26:in `read'
-      ./features/step_definitions/cucumber_steps.rb:26:in `/^(.*) should contain$/'
-      features/cucumber_cli.feature:304:in `Then examples/self_test/tmp/formatted/features/sample.feature should contain'
-
-Feature: Cucumber command line
-  In order to write better software
-  Developers should be able to execute requirements as tests
-
-  Scenario: Run scenario outline steps only                  # features/cucumber_cli_outlines.feature:5
-    When I run cucumber -q features/outline_sample.feature:7 # features/step_definitions/cucumber_steps.rb:5
-    Then it should fail with                                 # features/step_definitions/cucumber_steps.rb:15
-      """
-      Feature: Outline Sample
-
-        Scenario Outline: Test state
-          Given <state> without a table
-          Given <other_state> without a table
-
-        Examples: 
-          | state   | other_state |
-          | missing | passing     |
-          | passing | passing     |
-          | failing | passing     |
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-            features/outline_sample.feature:12:in `Given failing without a table'
-
-      3 scenarios
-      1 failed step
-      2 skipped steps
-      1 undefined step
-      2 passed steps
-
-      """
-
-  Scenario: Run single failing scenario outline table row  # features/cucumber_cli_outlines.feature:33
-    When I run cucumber features/outline_sample.feature:12 # features/step_definitions/cucumber_steps.rb:5
-    Then it should fail with                               # features/step_definitions/cucumber_steps.rb:15
-      """
-      Feature: Outline Sample
-
-        Scenario Outline: Test state          # features/outline_sample.feature:5
-          Given <state> without a table
-          Given <other_state> without a table
-
-        Examples: 
-          | state   | other_state |
-          | failing | passing     |
-            FAIL (RuntimeError)
-            ./features/step_definitions/sample_steps.rb:2:in `flunker'
-            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-            features/outline_sample.feature:12:in `Given failing without a table'
-
-      1 scenario
-      1 failed step
-      1 skipped step
-
-      """
-
-  Scenario: Run all with progress formatter                                  # features/cucumber_cli_outlines.feature:57
-    When I run cucumber -q --format progress features/outline_sample.feature # features/step_definitions/cucumber_steps.rb:5
-    Then it should fail with                                                 # features/step_definitions/cucumber_steps.rb:15
-      """
-      UUS..FS
-
-      (::) undefined scenarios (::)
-
-      features/outline_sample.feature:3:in `Scenario: I have no steps'
-
-      (::) failed steps (::)
-
-      FAIL (RuntimeError)
-      ./features/step_definitions/sample_steps.rb:2:in `flunker'
-      ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-      features/outline_sample.feature:12:in `Given failing without a table'
-
-      4 scenarios
-      1 failed step
-      2 skipped steps
-      1 undefined step
-      2 passed steps
-
-      """
-
-Feature: Cucumber command line
-  In order to find out what step definitions need to be implemented
-  Developers should always see what step definition is missing
-
-  Scenario: Get info at arbitrary levels of nesting                        # features/report_called_undefined_steps.feature:5
-    When I run cucumber features/call_undefined_step_from_step_def.feature # features/step_definitions/cucumber_steps.rb:5
-    Then it should pass with                                               # features/step_definitions/cucumber_steps.rb:15
-      """
-      Feature: Calling undefined step
-
-        Scenario: Call directly                                # features/call_undefined_step_from_step_def.feature:3
-          Given a step definition that calls an undefined step # features/step_definitions/sample_steps.rb:19
-            Undefined step: "this does not exist" (Cucumber::StepMother::Undefined)
-            ./features/step_definitions/sample_steps.rb:20:in `/^a step definition that calls an undefined step$/'
-
-        Scenario: Call via another                                         # features/call_undefined_step_from_step_def.feature:6
-          Given call step "a step definition that calls an undefined step" # features/step_definitions/sample_steps.rb:23
-            Undefined step: "this does not exist" (Cucumber::StepMother::Undefined)
-            ./features/step_definitions/sample_steps.rb:20:in `/^a step definition that calls an undefined step$/'
-
-      2 scenarios
-      2 undefined steps
-
-      You can implement step definitions for missing steps with these snippets:
-
-      Given /^this does not exist$/ do
-      end
-
-
-      """
-
-17 scenarios
-3 failed steps
-1 skipped step
-32 passed steps