lucid 0.0.6 → 0.0.7

data/lib/lucid/cli/options.rb

@@ -17,7 +17,7 @@ module Lucid
                                                               "#{INDENT}listed first. If --dry-run is used the duration\n" +
                                                               "#{INDENT}is not shown, and test definitions are sorted by\n" +
                                                               "#{INDENT}file name instead."],
-        'stepdefs'    => ['Lucid::Formatter::Stepdefs',    "Prints all test definitions with their locations. Same as\n" +
+        'testdefs'    => ['Lucid::Formatter::Testdefs',    "Prints all test definitions with their locations. Same as\n" +
                                                               "#{INDENT}the usage formatter, except that steps are not printed."],
         'junit'       => ['Lucid::Formatter::Junit',       'Generates a report similar to Ant+JUnit.'],
         'json'        => ['Lucid::Formatter::Json',        'Prints the spec as JSON.'],
@@ -94,6 +94,10 @@ module Lucid
             @options[:spec_type] = type
           end
 
+          opts.on("--driver-file FILE", "The file for Lucid to connect to an execution library.") do |file|
+            @options[:driver_file] = file
+          end
+
           opts.separator ""
 
           opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR",
@@ -436,6 +440,8 @@ module Lucid
         @options[:strict] |= other_options[:strict]
         @options[:dry_run] |= other_options[:dry_run]
 
+        @options[:library_path] += other_options[:library_path]
+
         @profiles += other_options.profiles
         @expanded_args += other_options.expanded_args
 
@@ -463,17 +469,18 @@ module Lucid
 
       def default_options
         {
-          :strict       => false,
-          :require      => [],
-          :dry_run      => false,
-          :formats      => [],
-          :excludes     => [],
+          :strict           => false,
+          :require          => [],
+          :dry_run          => false,
+          :formats          => [],
+          :excludes         => [],
           :tag_expressions  => [],
-          :name_regexps => [],
-          :env_vars     => {},
-          :diff_enabled => true,
-          :spec_type => "",
-          :library_path => ""
+          :name_regexps     => [],
+          :env_vars         => {},
+          :diff_enabled     => true,
+          :spec_type        => "",
+          :library_path     => "",
+          :driver_file      => ""
         }
       end
     end

data/lib/lucid/formatter/gherkin_formatter_adapter.rb

@@ -47,9 +47,9 @@ module Lucid
         @step_time = Time.now
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
-        arguments = step_match.step_arguments.map{|a| Gherkin::Formatter::Argument.new(a.offset, a.val)}
-        location = step_match.file_colon_line
+      def before_step_result(step_result)
+        arguments = step_result.step_arguments.map{|a| Gherkin::Formatter::Argument.new(a.offset, a.val)}
+        location = step_result.step_match.file_colon_line
         match = Gherkin::Formatter::Model::Match.new(arguments, location)
         if @print_empty_match
           # Trick the formatter to believe that's what was printed previously so we get arg highlights on #result
@@ -58,9 +58,10 @@ module Lucid
           @gf.match(match)
         end
 
+        exception = step_result.exception
         error_message = exception ? "#{exception.message} (#{exception.class})\n#{exception.backtrace.join("\n")}" : nil
         unless @outline
-          @gf.result(Gherkin::Formatter::Model::Result.new(status, nil, error_message))
+          @gf.result(Gherkin::Formatter::Model::Result.new(step_result.status, nil, error_message))
         end
       end
 

data/lib/lucid/formatter/html.rb

@@ -214,33 +214,33 @@ module Lucid
         move_progress
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
-        @step_match = step_match
+      def before_step_result(step_result)
+        @step_match = step_result.step_match
         @hide_this_step = false
-        if exception
-          if @exceptions.include?(exception)
+        if step_result.exception
+          if @exceptions.include?(step_result.exception)
             @hide_this_step = true
             return
           end
-          @exceptions << exception
+          @exceptions << step_result.exception
         end
-        if status != :failed && @in_background ^ background
+        if step_result.status != :failed && @in_background ^ step_result.background
           @hide_this_step = true
           return
         end
-        @status = status
+        @status = step_result.status
         return if @hide_this_step
-        set_scenario_color(status)
-        @builder << "<li id='#{@step_id}' class='step #{status}'>"
+        set_scenario_color(step_result.status)
+        @builder << "<li id='#{@step_id}' class='step #{step_result.status}'>"
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+      def after_step_result(step_result)
         return if @hide_this_step
-        if status == :undefined
+        if step_result.status == :undefined
           keyword = @step.actual_keyword if @step.respond_to?(:actual_keyword)
           step_multiline_class = @step.multiline_arg ? @step.multiline_arg.class : nil
           @builder.pre do |pre|
-            pre << @runtime.matcher_text(keyword,step_match.instance_variable_get("@name") || '',step_multiline_class)
+            pre << @runtime.matcher_text(keyword,step_result.step_name || '',step_result.step_multiline_class)
           end
         end
         @builder << '</li>'

data/lib/lucid/formatter/progress.rb

@@ -40,9 +40,9 @@ module Lucid
         @exception_raised = false
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
-        progress(status)
-        @status = status
+      def after_step_result(step_result)
+        progress(step_result.status)
+        @status = step_result.status
       end
 
       def before_outline_table(outline_table)

data/lib/lucid/formatter/standard.rb

@@ -127,20 +127,20 @@ module Lucid
         @indent = 6
       end
 
-      def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
+      def before_step_result(step_result)
         @hide_this_step = false
-        if exception
-          if @exceptions.include?(exception)
+        if step_result.exception
+          if @exceptions.include?(step_result.exception)
             @hide_this_step = true
             return
           end
-          @exceptions << exception
+          @exceptions << step_result.exception
         end
-        if status != :failed && @in_background ^ background
+        if step_result.status != :failed && @in_background ^ step_result.background
           @hide_this_step = true
           return
         end
-        @status = status
+        @status = step_result.status
       end
 
       def step_name(keyword, step_match, status, source_indent, background, file_colon_line)

data/lib/lucid/formatter/{stepdefs.rb → testdefs.rb}

@@ -2,7 +2,7 @@ require 'lucid/formatter/usage'
 
 module Lucid
   module Formatter
-    class Stepdefs < Usage
+    class Testdefs < Usage
       def print_steps(stepdef_key)
       end
 

data/lib/lucid/formatter/usage.rb

@@ -26,19 +26,19 @@ module Lucid
         @start_time = Time.now
       end
 
-      def before_step_result(*args)
+      def before_step_result(step_result)
         @duration = Time.now - @start_time
       end
 
-      def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
-        step_definition = step_match.step_definition
+      def after_step_result(step_result)
+        step_definition = step_result.step_definition
         unless step_definition.nil? # nil if it's from a scenario outline
           stepdef_key = StepDefKey.new(step_definition.regexp_source, step_definition.file_colon_line)
 
           @stepdef_to_match[stepdef_key] << {
-            :keyword => keyword,
-            :step_match => step_match,
-            :status => status,
+            :keyword => step_result.keyword,
+            :step_match => step_result.step_match,
+            :status => step_result.status,
             :file_colon_line => @step.file_colon_line,
             :duration => @duration
           }

data/lib/lucid/interface_rb/rb_world.rb

@@ -77,12 +77,6 @@ module Lucid
         @__lucid_runtime.doc_string(string_without_triple_quotes, content_type, line_offset)
       end
 
-      # @deprecated Use {#puts} instead.
-      def announce(*messages)
-        STDERR.puts AnsiEscapes.failed + "WARNING: #announce is deprecated. Use #puts instead:" + caller[0] + AnsiEscapes.reset
-        puts(*messages)
-      end
-
       # Print a message to the output.
       #
       # @note Lucid might surprise you with the behavior of this method. Instead

data/lib/lucid/platform.rb

@@ -2,7 +2,7 @@ require 'rbconfig'
 
 module Lucid
   unless defined?(Lucid::VERSION)
-    VERSION       = '0.0.6'
+    VERSION       = '0.0.7'
     BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/lucid')
     LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
     JRUBY         = defined?(JRUBY_VERSION)

data/lib/lucid/runtime.rb

@@ -26,7 +26,7 @@ module Lucid
       @results = Results.new(@configuration)
     end
 
-    # Allows you to take an existing runtime and change it's configuration
+    # Used to take an existing runtime and change its configuration.
     def configure(new_configuration)
       @configuration = Configuration.parse(new_configuration)
       @orchestrator.configure(@configuration)
@@ -42,9 +42,9 @@ module Lucid
       fire_after_configuration_hook
 
       tdl_walker = @configuration.establish_tdl_walker(self)
-      self.visitor = tdl_walker # Ugly circular dependency, but needed to support Domain#puts
+      self.visitor = tdl_walker
 
-      tdl_walker.visit_features(specs)
+      specs.accept(tdl_walker)
     end
 
     def features_paths
@@ -120,13 +120,13 @@ module Lucid
       @orchestrator.unknown_programming_language?
     end
 
-    def write_stepdefs_json
+    def write_testdefs_json
       if(@configuration.testdefs)
         stepdefs = []
         @orchestrator.step_definitions.sort{|a,b| a.to_hash['source'] <=> a.to_hash['source']}.each do |stepdef|
           stepdef_hash = stepdef.to_hash
           steps = []
-          features.each do |feature|
+          specs.each do |feature|
             feature.feature_elements.each do |feature_element|
               feature_element.raw_steps.each do |step|
                 args = stepdef.arguments_from(step.name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucid
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,6 +171,7 @@ files:
 - lib/lucid/ast/step.rb
 - lib/lucid/ast/step_collection.rb
 - lib/lucid/ast/step_invocation.rb
+- lib/lucid/ast/step_result.rb
 - lib/lucid/ast/table.rb
 - lib/lucid/ast/tags.rb
 - lib/lucid/ast/tdl_walker.rb
@@ -204,9 +205,9 @@ files:
 - lib/lucid/formatter/progress.rb
 - lib/lucid/formatter/rerun.rb
 - lib/lucid/formatter/standard.rb
-- lib/lucid/formatter/stepdefs.rb
 - lib/lucid/formatter/steps.rb
 - lib/lucid/formatter/summary.rb
+- lib/lucid/formatter/testdefs.rb
 - lib/lucid/formatter/unicode.rb
 - lib/lucid/formatter/usage.rb
 - lib/lucid/generator.rb
@@ -259,7 +260,7 @@ homepage: https://github.com/jnyman/lucid
 licenses:
 - MIT
 post_install_message: ! "\n(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
-  (::)\n\n  Thanks for installing Lucid 0.0.6.\n\n(::) (::) (::) (::) (::) (::) (::)
+  (::)\n\n  Thanks for installing Lucid 0.0.7.\n\n(::) (::) (::) (::) (::) (::) (::)
   (::) (::) (::) (::) (::)\n  "
 rdoc_options:
 - --charset=UTF-8
@@ -282,6 +283,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: lucid-0.0.6
+summary: lucid-0.0.7
 test_files: []
 has_rdoc: