flatware 0.0.2 → 0.0.3

data/lib/flatware/checkpoint.rb

@@ -0,0 +1,22 @@
+module Flatware
+  class Checkpoint
+    attr_reader :steps, :scenarios
+    def initialize(steps, scenarios)
+      @steps, @scenarios = serialize_steps(steps), serialize_scenarios(scenarios)
+    end
+
+    private
+
+    def serialize_steps(steps)
+      steps.map do |step|
+        StepResult.new step.status, step.exception
+      end
+    end
+
+    def serialize_scenarios(scenarios)
+      scenarios.map do |scenario|
+        ScenarioResult.new scenario.status
+      end
+    end
+  end
+end

data/lib/flatware/cucumber/formatter.rb

@@ -1,149 +1,49 @@
 require 'cucumber/formatter/console'
+require 'flatware/checkpoint'
 module Flatware
   module Cucumber
     class Formatter
       def initialize(step_mother, *)
-        @step_mother = step_mother
+        @collector = Collector.new step_mother
       end
 
-      def scenario_name(keyword, name, file_colon_line, source_indent)
-        @current_scenario = file_colon_line
+      def after_features(*)
+        Sink.push collector.checkpoint
       end
 
-      def before_feature_element(feature_element)
-        case feature_element
-        when ::Cucumber::Ast::ScenarioOutline
-          @outline_steps = feature_element
-        end
-      end
-
-      def after_feature_element(feature_element)
-        @outline_steps = nil
-      end
-
-      def after_feature(*)
-        background_steps.each do |step|
-          Sink.push step
-        end unless current_scenario
-      end
-
-      # keyword,
-      # step_match,
-      # multiline_arg,
-      # status,
-      # exception,
-      # source_indent,
-      # background,
-      # file_colon_line
-      def after_step_result(_, _, _, status, exception, _, background, _)
-        result = if status_only? background
-          background_steps << Result.background(status, exception)
-          Result.status status
-        else
-          Result.step status, exception, current_scenario
-        end
-
-        Sink.push result
-      end
-
-      def before_outline_table(outline_table)
-        @outline_table = outline_table
-      end
-
-      def after_outline_table(outline_table)
-        @outline_table = nil
-      end
-
-      def before_table_row(table_row)
-        if example_row? table_row
-          @step_collector = StepCollector.new(step_mother)
-        end
-      end
-
-      def after_table_row(table_row)
-        if example_row? table_row
-          step_collector.stop table_row
-          Sink.push Result.new step_collector.progress, step_collector.steps
-        end
+      def after_step_result(_, _, _, status, *)
+        send_progress(status)
       end
 
       def table_cell_value(_, status)
-        Sink.push Result.status status if example_cell? status
+        send_progress(status) if status
       end
 
       private
+      attr_reader :collector
 
-      attr_reader :step_mother, :step_collector, :current_scenario
-
-      def background_steps
-        @background_steps ||= []
+      def send_progress(status)
+        Sink.push Result.status status
       end
 
-      def status_only?(background)
-        scenario_outline? or (background and not current_scenario)
-      end
-
-      def scenario_outline?
-        !!@outline_steps
-      end
-
-      def example_row?(table_row)
-        table_row.respond_to? :failed? and outline_table? and not table_header_row? table_row
-      end
-
-      def example_cell?(status)
-        outline_table? and not table_header_cell? status
-      end
-
-      def table_header_cell?(status)
-        status == :skipped_param
-      end
-
-      def outline_table?
-        !!@outline_table
-      end
-
-      def table_header_row?(table_row)
-        table_row.failed?
-      rescue ::Cucumber::Ast::OutlineTable::ExampleRow::InvalidForHeaderRowError
-        true
-      else
-        false
-      end
-
-      class StepCollector
+      class Collector
         attr_reader :step_mother
         def initialize(step_mother)
           @step_mother = step_mother
-          snapshot_steps
-        end
-
-        def stop(table_row)
-          @scenario_id = extract_scenario(table_row)
-          @example_row_steps = step_mother.steps - ran_steps
+          snapshot
         end
 
-        def steps
-          example_row_steps or raise('stop collecting first')
-          example_row_steps.map do |step|
-            StepResult.new(step.status, step.exception, scenario_id)
+        def checkpoint
+          Checkpoint.new(step_mother.steps - @ran_steps, step_mother.scenarios - @ran_scenarios).tap do
+            snapshot
           end
         end
 
-        def progress
-          ''
-        end
-
         private
 
-        attr_reader :example_row_steps, :scenario_id, :ran_steps
-
-        def extract_scenario(table_row)
-          table_row.scenario_outline.file_colon_line(table_row.line)
-        end
-
-        def snapshot_steps
+        def snapshot
           @ran_steps = step_mother.steps.dup
+          @ran_scenarios = step_mother.scenarios.dup
         end
       end
     end

data/lib/flatware/scenario_result.rb

@@ -1,24 +1,16 @@
 module Flatware
   class ScenarioResult
-    attr_reader :id, :steps
-
-    def initialize(id, steps=[])
-      @id = id
-      @steps = steps
-    end
-
-    def status
-      first(:failed) || first(:undefined) || :passed
+    attr_reader :status
+    def initialize(status)
+      @status = status
     end
 
-    private
-
-    def first(status)
-      statuses.detect {|s| s == status}
+    def passed?
+      status == :passed
     end
 
-    def statuses
-      steps.map &:status
+    def failed?
+      status == :failed
     end
   end
 end

data/lib/flatware/sink.rb

@@ -41,7 +41,8 @@ module Flatware
           case (result = Marshal.load message)
           when Result
             print result.progress
-            steps.push *result.steps
+          when Checkpoint
+            checkpoints << result
           when Job
             completed_jobs << result
             log "COMPLETED SCENARIO"
@@ -67,7 +68,9 @@ module Flatware
       end
 
       def summarize
-        Summary.new(steps, out).summarize
+        steps = checkpoints.map(&:steps).flatten
+        scenarios = checkpoints.map(&:scenarios).flatten
+        Summary.new(steps, scenarios, out).summarize
       end
 
       def summarize_remaining
@@ -91,8 +94,8 @@ module Flatware
         die.send 'seppuku'
       end
 
-      def steps
-        @steps ||= []
+      def checkpoints
+        @checkpoints ||= []
       end
 
       def completed_jobs

data/lib/flatware/step_result.rb

@@ -1,9 +1,9 @@
 module Flatware
   class StepResult
-    attr_reader :status, :exception, :scenario_id
+    attr_reader :status, :exception
 
-    def initialize(status, exception, scenario_id=nil)
-      @status, @exception, @scenario_id = status, serialized(exception), scenario_id
+    def initialize(status, exception)
+      @status, @exception = status, serialized(exception)
     end
 
     def passed?

data/lib/flatware/summary.rb

@@ -1,18 +1,14 @@
 require 'cucumber/formatter/console'
+require 'flatware/checkpoint'
 module Flatware
   class Summary
     include ::Cucumber::Formatter::Console
-    attr_reader :io, :steps
+    attr_reader :io, :steps, :scenarios
 
-    def initialize(steps, io=StringIO.new)
+    def initialize(steps, scenarios=[], io=StringIO.new)
       @io = io
       @steps = steps
-    end
-
-    def scenarios
-      @scenarios ||= scenario_steps.group_by(&:scenario_id).map do |scenario, steps|
-        ScenarioResult.new(scenario, steps)
-      end
+      @scenarios = scenarios
     end
 
     def summarize
@@ -24,10 +20,6 @@ module Flatware
 
     private
 
-    def scenario_steps
-      steps.select &:scenario_id
-    end
-
     def print_steps(status)
       print_elements steps.select(&with_status(status)), status, 'steps'
     end
@@ -53,9 +45,5 @@ module Flatware
 
       " (#{status_counts})"
     end
-
-    def count(status)
-      completed_scenarios.select {|scenario| scenario.status == status}.count
-    end
   end
 end

data/lib/flatware/version.rb

@@ -0,0 +1,3 @@
+module Flatware
+  VERSION = '0.0.3'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flatware
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - lib/flatware.rb
+- lib/flatware/checkpoint.rb
 - lib/flatware/cli.rb
 - lib/flatware/cucumber.rb
 - lib/flatware/cucumber/formatter.rb
@@ -134,6 +135,7 @@ files:
 - lib/flatware/sink.rb
 - lib/flatware/step_result.rb
 - lib/flatware/summary.rb
+- lib/flatware/version.rb
 - lib/flatware/worker.rb
 - LICENSE.txt
 - README.rdoc