cuporter 0.2.9 → 0.3.0

data/README.textile

@@ -2,13 +2,13 @@ h1. Cuporter
 
 Scrapes your feature files and shows 2 possible reports:
 
-# scenarios and examples per tag
+# Tag Report: scenarios and examples per tag
 ** in Feature and Scenario Outline context, as appropriate
-** sorted alphbetically
+** sorted alphbetically by file path, scenario name, scenario outline name, example name
 ** optionally numbered*, counting scenarios and outline examples per tag
-# feature, scenario and example names
+# Inventory Report: feature, scenario and example names
 ** may be filtered by tags, using same CLI syntax as Cucumber
-** sorted alphbetically
+** sorted alphbetically by file path, scenario name, scenario outline name, example name
 ** optionally numbered*, using 1 count of all scenarios and outline examples for the report
 
 <notextile>*</notextile> _HTML reports are always numbered._
@@ -106,20 +106,12 @@ h4. run script directly
   #  pretty-print demo report to stdout
   $ ./bin/cuporter -i fixtures/self_text
 
-  #  default input features/**/*.feature to named output file
-  $ ./bin/cuporter -f html -o feature_tag_report.html
-
   #  same, but number the scenarios and example rows
-  $ ./bin/cuporter -f html --numbers -o feature_tag_report.html
-
-  #  filtered html name report, with non-default title
-  $ ./bin/cuporter -f html -o active_customer.html -r name -n -T "Active Customer Test Inventory" -t ~@wip -t @customer,@client
-</pre>
+  $ ./bin/cuporter -i fixtures/self_text -n
 
-h4. run via rake
-
-<pre>
-  $ rake cuporter:run["-i fixtures/self_text"]
+  #  default input features/**/*.feature to named html output file
+  $ ./bin/cuporter -f html -o feature_tag_report.html
 
-  $ rake cuporter:run["-f html -o feature_tag_report.html"]
+  #  filtered html name report, with non-default title
+  $ ./bin/cuporter -f html -o active_customer.html -r name -T "Active Customer Test Inventory" -t ~@wip -t @customer,@client
 </pre>

data/Rakefile

@@ -56,7 +56,7 @@ namespace :cuporter do
 
   spec = Gem::Specification.new do |s|
     s.name = 'cuporter'
-    s.version = '0.2.9'
+    s.version = '0.3.0'
     s.rubyforge_project = s.name
 
     s.platform = Gem::Platform::RUBY

data/lib/cuporter/feature_parser.rb

@@ -1,7 +1,7 @@
 # Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
 
 module Cuporter
-  module FeatureParser
+  class FeatureParser
     FEATURE_LINE          = /^\s*(Feature:[^#]+)/
     TAG_LINE              = /^\s*(@\w.+)/
     SCENARIO_LINE         = /^\s*(Scenario:[^#]+)$/
@@ -11,11 +11,55 @@ module Cuporter
     EXAMPLE_LINE          = /^\s*(\|.*\|)\s*$/
 
     def self.tag_list(file)
-      TagList.new(file).parse_feature
+      TagListParser.new(file).parse_feature
     end
 
     def self.name_list(file, filter)
-      NameList.new(file, filter).parse_feature
+      NameListParser.new(file, filter).parse_feature
+    end
+
+    def initialize(file)
+      @file = file
+      @current_tags = []
+      @lines = File.read(@file).split(/\n/)
+    end
+
+    def parse_feature
+      @lines.each do |line|
+        case line
+        when FeatureParser::TAG_LINE
+          # may be more than one tag line
+          @current_tags |= $1.strip.split(/\s+/)
+        when FeatureParser::FEATURE_LINE
+          @feature = new_feature_node($1)
+          @feature.file = @file.sub(/^.*features\//,"features/")
+          @current_tags = []
+        when FeatureParser::SCENARIO_LINE
+          # How do we know when we have read all the lines from a "Scenario Outline:"?
+          # One way is when we encounter a "Scenario:"
+          close_scenario_outline
+
+          handle_scenario_line($1)
+          @current_tags = []
+        when FeatureParser::SCENARIO_OUTLINE_LINE
+          # ... another is when we hit a subsequent "Scenario Outline:"
+          close_scenario_outline
+
+          @scenario_outline  = new_scenario_outline_node($1)
+          @current_tags = []
+        when FeatureParser::EXAMPLE_SET_LINE, FeatureParser::SCENARIO_SET_LINE
+          handle_example_set_line if @example_set
+
+          @example_set = new_example_set_node($1)
+          @current_tags = []
+        when @example_set && FeatureParser::EXAMPLE_LINE
+          @example_set.add_child(Node.new($1))
+        end
+      end
+
+      # EOF is the final way that we know we are finished with a "Scenario Outline"
+      close_scenario_outline
+      return @feature
     end
 
   end

data/lib/cuporter/formatter/cuporter.css

@@ -7,7 +7,6 @@ body {
   padding-left: 2em; 
   padding-bottom: 0.3em; 
   padding-top: 0.05em; 
-  background-color: #24A6C1;
   color: white;
   height: 7em;
 }
@@ -15,12 +14,6 @@ body {
   padding-right: 2em;
   float: left;
 }
-#filter_summary {
-  width: 60em;
-  float: right;
-  padding-top: 1.2em;
-}
-
 #summary {
   position: absolute;
   right: 1em;
@@ -28,87 +21,40 @@ body {
   top: 1.2em;
 }
 
-#summary p, #filter_summary p {
+#summary p {
   margin: 0px 0px 0px 2px;
 }
 
-.tag_report #expand-collapse {
-  position: absolute;
-  right: 1em;
-  text-align: right;
-  top:   0.5em;
-}
 ul {
   list-style-type: none;
 }
-.tag_list {
+.main_list {
   padding-left: 0.5em; 
 }
-.tag_name {
-  height: 2em;
-  font-weight: bold;
-  font-size: 1.5em; 
-}
-.total {
-  margin-left: 0.5em;
-  font-weight: normal;
-  font-size: 0.8em;
-}
-.tag {
-  margin-bottom: 1em;
-}
-
 .feature {
   margin-bottom: 0.5em;
   margin-right: 1em;
 }
 .feature_name {
-  margin-left: -2em;
-  padding-left: 2em;
   padding-top:  0.3em;
   padding-bottom: 0.3em;
   font-weight: bold;
-  background-color: #24A6C1;
-  color: white;
-}
-.example_rows { 
-  background-color: lightblue;
-  margin-left: -7.2em;
-  padding-left: 7.2em;
 }
 
-.example_set_name {
-  margin-left: -2em;
-}
-.example {
-  background-color:  #26A6C0;
+.file {
+  float: right;
+  padding-right: 0.5em;
+  font-weight: normal;
+  color: black;
 }
 
 .example td.val {
   padding-left: 0.5em;
 }
-.scenario_name {
-  margin-left: -3.8em;
-  padding-left: 3.8em;
-  background-color: lightblue;
-
-}
 
 .number {
   position: absolute;
-  left: 4.5em;
   font-weight: bold;
 }
 
-.name_report .number {
-  left: 4em;
-}
-.file {
-  float: right;
-  padding-right: 0.5em;
-  font-weight: normal;
-  font-size: 1.1em;
-  color: black;
-
-}
 

data/lib/cuporter/formatter/html_methods.rb

@@ -6,24 +6,63 @@ module Cuporter
   module Formatter
     module HtmlMethods
 
-      def inline_style
-        File.read(File.dirname(__FILE__) + "/cuporter.css")
+      def document
+        builder = Builder::XmlMarkup.new
+        builder.declare!(:DOCTYPE, :html,
+                         :PUBLIC, "-//W3C//DTD XHTML 1.0 Transitional//EN",
+                         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+        )
+        builder
       end
 
-      def get_binding
-        binding
+      def html
+        document.html(:xmlns => "http://www.w3.org/1999/xhtml") do |html|
+          head(html)
+          body(html)
+        end.to_s.sub("<to_s/>",'')
       end
 
-      def rhtml
-        ERB.new(self.class::RHTML)
+      def head(html)
+        html.head do |head|
+          head.title(title)
+          head.style(inline_file("cuporter.css"))
+          head.style(inline_file(inline_style))
+          head.script(:type => "text/javascript") do
+            head << inline_jquery  # jquery is corrupted if it isn't handled this way
+            head << inline_js_content
+          end
+        end
+      end
+      
+      def body(html)
+        html.body do |body|
+          header(body)
+          body.ul(:class => :main_list) do |ul|
+            write_report_node(body)
+          end
+        end
+      end
+
+      def label(header)
+        header.div(:id => :label) do |div|
+          div.h1(title)
+        end
+      end
+
+      def inline_file(file_name)
+        File.read("#{File.dirname(__FILE__)}/#{file_name}")
+      end
+
+      def write_report_node(body)
+        report_node_writer.new(@report, body).write_report_node
       end
 
       def write
-        @output.puts rhtml.result(get_binding).reject {|line| /^\s+$/ =~ line}
+        @output.puts html
       end
 
       def inline_jquery
-        File.read(File.dirname(__FILE__) + '/jquery-min.js')
+        inline_file('/jquery-min.js')
       end
       
       def inline_js_content
@@ -72,7 +111,7 @@ module Cuporter
     });
 
     // load page with features collapsed
-    $("#expand_tags, #collapse_features").click();
+    $("#collapser, #collapse_features").click();
   })
   
         EOF

data/lib/cuporter/formatter/html_node_writer.rb

@@ -8,17 +8,11 @@ module Cuporter
 
       attr_reader :builder
 
-      def initialize
-        @builder = Builder::XmlMarkup.new
+      def initialize(report, builder)
+        @report  = report
+        @builder = builder
       end
 
-        def write_nodes(report, number_scenarios)
-          report.report_node.number_all_descendants if number_scenarios
-          report.report_node.children.each do |child_node|
-            write_node(child_node)
-          end
-          builder
-        end
       def write_node(node)
         builder.li(:class => node_class(node.name)) do
           write_node_name(node)
@@ -79,18 +73,18 @@ module Cuporter
 
       def node_class(name)
         case name
-          when FeatureParser::TAG_LINE
-            :tag
-          when FeatureParser::FEATURE_LINE
-            :feature
-          when FeatureParser::SCENARIO_LINE
-            :scenario
-          when FeatureParser::SCENARIO_OUTLINE_LINE
-            :scenario_outline
-          when FeatureParser::SCENARIO_SET_LINE, FeatureParser::EXAMPLE_SET_LINE
-            :example_set
-          else
-            :example
+        when FeatureParser::TAG_LINE
+          :tag
+        when FeatureParser::FEATURE_LINE
+          :feature
+        when FeatureParser::SCENARIO_LINE
+          :scenario
+        when FeatureParser::SCENARIO_OUTLINE_LINE
+          :scenario_outline
+        when FeatureParser::SCENARIO_SET_LINE, FeatureParser::EXAMPLE_SET_LINE
+          :example_set
+        else
+          :example
         end
       end
 

data/lib/cuporter/formatter/name_report/html.rb

@@ -1,20 +1,34 @@
 # Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
-require 'rubygems'
-require 'erb'
-
 module Cuporter
   module Formatter
     module NameReport
       class Html < Writer
         include HtmlMethods
 
+        def report_node_writer
+          Cuporter::Formatter::NameReport::HtmlNodeWriter
+        end
+
         def title
           @report.title
         end
 
-        def filter_summary
+        def header(body)
+          body.div(:class => :cuporter_header) do |header|
+            label(header)
+            filter_summary(header)
+            header.div(:id => :summary) do |div|
+              div.p("#{@report.report_node.total} Scenarios", :id => :total)
+              div.div(:id => "expand-collapse") do |exp_col|
+                exp_col.p("Expand All", :id => :expand_features)
+                exp_col.p("Collapse All", :id => :collapse_features)
+              end
+            end
+          end
+        end
+
+        def filter_summary(builder)
           return if @report.filter.empty?
-          builder = Builder::XmlMarkup.new
           builder.div(:id => :filter_summary) do |div|
             div.p("Filtering:")
             div.p("Include: #{@report.filter.all.join(' AND ')}") unless @report.filter.all.empty?
@@ -23,40 +37,10 @@ module Cuporter
           end
         end
 
-        RHTML = %{
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title><%= title %></title>
-    <style type="text/css">
-      <%= inline_style%>
-    </style>
-    <script type="text/javascript">
-      <%= inline_jquery%>
-      <%= inline_js_content%>
-    </script>
-</head>
-<body class="name_report">
-    <div class="cuporter_header">
-      <div id="label">
-          <h1><%= title %></h1>
-      </div>
-      <%= filter_summary %>
-      <div id="summary">
-          <p id="total"><%= @report.report_node.total%> Scenarios </p>
-          <div id="expand-collapse">
-              <p id="expand_features">Expand All</p>
-              <p id="collapse_features">Collapse All</p>
-           </div>
-      </div>
-    </div>
-    <ul class="tag_list, name_report">
-      <%= Cuporter::Formatter::NameReport::HtmlNodeWriter.new.write_nodes(@report)%>
-    </ul>
-</body>
-</html>
-      }
-
+        def inline_style
+          "name_report/style.css"
+        end
+        
 
       end
     end

data/lib/cuporter/formatter/name_report/html_node_writer.rb

@@ -5,8 +5,8 @@ module Cuporter
     module NameReport
       class HtmlNodeWriter < Cuporter::Formatter::HtmlNodeWriter
 
-        def write_nodes(report)
-          report.report_node.children.each do |child_node|
+        def write_report_node
+          @report.report_node.children.each do |child_node|
             write_node(child_node)
           end
           builder

data/lib/cuporter/formatter/name_report/style.css

@@ -0,0 +1,58 @@
+/*  Name Report */
+.number {
+  left: 3.0em;
+}
+
+#filter_summary {
+  width: 60em;
+  float: right;
+  padding-top: 1.2em;
+}
+
+#filter_summary p {
+  margin: 0px 0px 0px 2px;
+}
+
+.cuporter_header {
+  background-color: #65C400;
+}
+
+.feature_name {
+  margin-left: 0.5em;
+  font-size: 1.5em;
+}
+
+.file {
+  font-size: 0.8em;
+}
+
+.scenario_name {
+  margin-left: -2.4em;
+  padding-left: 4.0em;
+  padding-top: 0.1em;
+  padding-bottom: 0.2em;
+}
+.scenario_outline_name {
+  margin-left: -2.4em;
+  padding-left: 4.5em;
+  padding-top: 0.1em;
+  padding-bottom: 0.2em;
+
+}
+
+.example {
+  background-color:  #65C400;
+}
+
+.example_rows {
+  margin-left: -6.0em;
+  padding-left: 7.6em;
+}
+
+.scenario_name, .example_rows {
+  margin-top: 0.2em;
+  margin-bottom: 0.2em;
+  background-color: #DBFFB4;
+  border-left: 0.5em solid #65c400;
+  border-bottom: 1px solid #65c400;
+}

data/lib/cuporter/formatter/tag_report/html.rb

@@ -1,48 +1,33 @@
 # Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
-require 'rubygems'
-require 'erb'
-
 module Cuporter
   module Formatter
     module TagReport
       class Html < Writer
         include HtmlMethods
 
+        def report_node_writer
+          Cuporter::Formatter::TagReport::HtmlNodeWriter
+        end
+
         def title
           "Cucumber Tags"
         end
 
-        RHTML = %{
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title><%= title %></title>
-    <style type="text/css">
-      <%= inline_style%>
-    </style>
-    <script type="text/javascript">
-      <%= inline_jquery%>
-      <%= inline_js_content%>
-    </script>
-</head>
-<body class="tag_report">
-    <div class="cuporter_header">
-      <div id="label">
-          <h1><%= title %></h1>
-      </div>
-          <div id="expand-collapse">
-             <p id="expand_tags">Expand Tags</p>
-             <p id="expand_all">Expand All</p>
-             <p id="collapser">Collapse All</p>
-          </div>
-    </div>
-    <ul class="tag_list">
-      <%= Cuporter::Formatter::TagReport::HtmlNodeWriter.new.write_nodes(@report)%>
-    </ul>
-</body>
-</html>
-      }
+        def inline_style
+          "tag_report/style.css"
+        end
+
+        def header(body)
+          body.div(:class => :cuporter_header) do |header|
+            label(header)
 
+            body.div(:id => "expand-collapse") do |div|
+              div.p("Expand Tags", :id => :expand_tags)
+              div.p("Expand All", :id => :expand_all)
+              div.p("Collapse All", :id => :collapser)
+            end
+          end
+        end
 
       end
     end

data/lib/cuporter/formatter/tag_report/html_node_writer.rb

@@ -5,8 +5,8 @@ module Cuporter
     module TagReport
       class HtmlNodeWriter < Cuporter::Formatter::HtmlNodeWriter
 
-        def write_nodes(report)
-          report.report_node.children.each do |tag_node|
+        def write_report_node
+          @report.report_node.children.each do |tag_node|
             tag_node.number_all_descendants
             write_node(tag_node)
           end

data/lib/cuporter/formatter/tag_report/style.css

@@ -0,0 +1,78 @@
+/* Tag Report */
+.number {
+  left: 4.5em;
+}
+
+#expand-collapse {
+  position: absolute;
+  right: 1em;
+  text-align: right;
+  top:   0.5em;
+}
+
+.cuporter_header {
+  background-color: #24A6C1;
+}
+
+.tag_name {
+  font-weight: bold;
+  font-size: 1.5em; 
+}
+.total {
+  margin-left: 0.5em;
+  font-weight: normal;
+  font-size: 0.8em;
+}
+
+.tag {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+
+.tag ul {
+  margin-top: 1.0em;
+  margin-bottom: 0.5em;
+}
+.feature_name {
+  margin-left: -2em;
+  padding-left: 1.5em;
+  background-color: #24A6C1;
+  color: white;
+}
+
+.file {
+  font-size: 1.1em;
+}
+
+.scenario_name {
+  margin-left: -4.0em;
+  padding-left: 4.0em;
+  background-color: lightblue;
+}
+
+.scenario_outline_name {
+  margin-left: -4.0em;
+  padding-left: 4.5em;
+}
+
+.example_rows {
+  margin-left: -7.7em;
+  padding-left: 7.7em;
+  background-color: lightblue;
+}
+
+.example {
+  background-color:  #26A6C0;
+}
+
+.example_set_name {
+  margin-left: -2em;
+}
+
+.scenario_name, .example_rows {
+  margin-top: 0.2em;
+  margin-bottom: 0.2em;
+  background-color: #lightblue;
+  border-left: 0.5em solid #26A6C0;
+  border-bottom: 1px solid #26A6C0;
+}

data/lib/cuporter/name_list_parser.rb

@@ -0,0 +1,44 @@
+# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
+
+module Cuporter
+  class NameListParser < FeatureParser
+
+    # ++sub_expression++ is the paren group in the regex, dereferenced with $1 in the caller
+    def new_feature_node(sub_expression)
+      TagListNode.new(sub_expression, @current_tags, @filter)
+    end
+
+    def handle_scenario_line(sub_expression)
+      @feature.filter_child(Node.new(sub_expression), @current_tags)
+    end
+
+    def new_scenario_outline_node(sub_expression)
+      TagListNode.new(sub_expression, @current_tags, @filter)
+    end
+
+    def handle_example_set_line
+      @scenario_outline.filter_child(@example_set, @example_set.tags)
+    end
+
+    def new_example_set_node(sub_expression)
+      ExampleSetNode.new(sub_expression, @feature.tags | @current_tags, @filter)
+    end
+
+    def close_scenario_outline
+      if @scenario_outline
+        if @example_set
+          @scenario_outline.filter_child(@example_set, @example_set.tags) if @example_set
+          @example_set = nil
+        end
+        @feature.add_child(@scenario_outline) if @scenario_outline.has_children?
+        @scenario_outline = nil
+      end
+    end
+
+    def initialize(file, filter)
+      super(file)
+      @filter = filter
+    end
+
+  end
+end

data/lib/cuporter/node.rb

@@ -48,9 +48,13 @@ module Cuporter
       children.sort!
     end
 
-    # sort on name or substring of name after any ':'
+    # sort on: file path, name, substring of name after any ':'
     def <=>(other)
-      name_without_title <=> other.name_without_title
+      if file
+        file <=> other.file
+      else
+        name_without_title <=> other.name_without_title
+      end
     end
     
     # value equivalence

data/lib/cuporter/tag_list_parser.rb

@@ -0,0 +1,39 @@
+# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
+
+module Cuporter
+  class TagListParser < FeatureParser
+
+    # ++sub_expression++ is the paren group in the regex, dereferenced with $1 in the caller
+    def new_feature_node(sub_expression)
+      TagListNode.new(sub_expression, @current_tags)
+    end
+
+    def handle_scenario_line(sub_expression)
+      @feature.add_to_tag_nodes(TagListNode.new(sub_expression, @current_tags))
+    end
+
+    def new_scenario_outline_node(sub_expression)
+      TagListNode.new(sub_expression, @current_tags)
+    end
+
+    def handle_example_set_line
+      @scenario_outline.add_to_tag_nodes(@example_set)
+    end
+
+    def new_example_set_node(sub_expression)
+      ExampleSetNode.new(sub_expression, @feature.tags | @current_tags)
+    end
+
+    def close_scenario_outline
+      if @scenario_outline
+        if @example_set
+          @scenario_outline.add_to_tag_nodes(@example_set) if @example_set
+          @example_set = nil
+        end
+        @feature.merge_tag_nodes(@scenario_outline)
+        @scenario_outline = nil
+      end
+    end
+
+  end
+end

data/lib/cuporter.rb

@@ -1,12 +1,12 @@
 # Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
 require 'cuporter/node'
 require 'cuporter/filter'
-require 'cuporter/tag_list'
-require 'cuporter/name_list'
 require 'cuporter/tag_list_node'
 require 'cuporter/example_set_node'
 require 'cuporter/node_numberer'
 require 'cuporter/feature_parser'
+require 'cuporter/tag_list_parser'
+require 'cuporter/name_list_parser'
 require 'cuporter/extensions/string'
 require 'cuporter/cli/options'
 require 'cuporter/cli/filter_args_builder'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuporter
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tim Camper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 -04:00
+date: 2010-10-04 00:00:00 -04:00
 default_executable: cuporter
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
-- lib/cuporter/name_list.rb
+- lib/cuporter/tag_list_parser.rb
 - lib/cuporter/example_set_node.rb
 - lib/cuporter/formatter/tag_report/csv.rb
 - lib/cuporter/formatter/tag_report/text_node_writer.rb
@@ -65,7 +65,6 @@ files:
 - lib/cuporter/formatter/name_report/text.rb
 - lib/cuporter/formatter/name_report/html_node_writer.rb
 - lib/cuporter/formatter/name_report/html.rb
-- lib/cuporter/tag_list.rb
 - lib/cuporter/report/report.rb
 - lib/cuporter/report/name_report.rb
 - lib/cuporter/report/tag_report.rb
@@ -75,9 +74,12 @@ files:
 - lib/cuporter/extensions/string.rb
 - lib/cuporter/feature_parser.rb
 - lib/cuporter/node.rb
+- lib/cuporter/name_list_parser.rb
 - lib/cuporter/filter.rb
 - lib/cuporter/node_numberer.rb
 - lib/cuporter.rb
+- lib/cuporter/formatter/tag_report/style.css
+- lib/cuporter/formatter/name_report/style.css
 - lib/cuporter/formatter/cuporter.css
 - lib/cuporter/formatter/jquery-min.js
 - bin/cuporter

data/lib/cuporter/name_list.rb

@@ -1,65 +0,0 @@
-# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
-
-module Cuporter
-  class NameList
-
-    def initialize(file, filter)
-      @file = file
-      @current_tags = []
-      @filter = filter
-    end
-
-    def parse_feature
-      lines = File.read(@file).split(/\n/)
-
-      lines.each do |line|
-        case line
-        when FeatureParser::TAG_LINE
-          # may be more than one tag line
-          @current_tags |= $1.strip.split(/\s+/)
-        when FeatureParser::FEATURE_LINE
-          @feature = TagListNode.new($1, @current_tags, @filter)
-          @feature.file = @file.sub(/^.*features\//,"features/")
-          @current_tags = []
-        when FeatureParser::SCENARIO_LINE
-          # How do we know when we have read all the lines from a "Scenario Outline:"?
-          # One way is when we encounter a "Scenario:"
-          close_scenario_outline
-
-          @feature.filter_child(Node.new($1), @current_tags)
-          @current_tags = []
-        when FeatureParser::SCENARIO_OUTLINE_LINE
-          # ... another is when we hit a subsequent "Scenario Outline:"
-          close_scenario_outline
-
-          @scenario_outline  = TagListNode.new($1, @current_tags, @filter)
-          @current_tags = []
-        when FeatureParser::EXAMPLE_SET_LINE, FeatureParser::SCENARIO_SET_LINE
-          @scenario_outline.filter_child(@example_set, @example_set.tags) if @example_set
-
-          @example_set = ExampleSetNode.new($1, @feature.tags | @current_tags, @filter)
-          @current_tags = []
-        when @example_set && FeatureParser::EXAMPLE_LINE
-          @example_set.add_child(Node.new($1))
-        end
-      end
-
-      # EOF is the final way that we know we are finished with a "Scenario Outline"
-      close_scenario_outline
-      return @feature
-    end
-
-    def close_scenario_outline
-      if @scenario_outline
-        if @example_set
-          @scenario_outline.filter_child(@example_set, @example_set.tags) if @example_set
-          @example_set = nil
-        end
-        @feature.add_child(@scenario_outline) if @scenario_outline.has_children?
-        @scenario_outline = nil
-      end
-    end
-
-  end
-
-end

data/lib/cuporter/tag_list.rb

@@ -1,64 +0,0 @@
-# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
-
-module Cuporter
-  class TagList
-
-    def initialize(file)
-      @file = file
-      @current_tags = []
-    end
-
-    def parse_feature
-      lines = File.read(@file).split(/\n/)
-
-      lines.each do |line|
-        case line
-        when FeatureParser::TAG_LINE
-          # may be more than one tag line
-          @current_tags |= $1.strip.split(/\s+/)
-        when FeatureParser::FEATURE_LINE
-          @feature = TagListNode.new($1, @current_tags)
-          @feature.file = @file.sub(/^.*features\//,"features/")
-          @current_tags = []
-        when FeatureParser::SCENARIO_LINE
-          # How do we know when we have read all the lines from a "Scenario Outline:"?
-          # One way is when we encounter a "Scenario:"
-          close_scenario_outline
-
-          @feature.add_to_tag_nodes(TagListNode.new($1, @current_tags))
-          @current_tags = []
-        when FeatureParser::SCENARIO_OUTLINE_LINE
-          # ... another is when we hit a subsequent "Scenario Outline:"
-          close_scenario_outline
-
-          @scenario_outline  = TagListNode.new($1, @current_tags)
-          @current_tags = []
-        when FeatureParser::EXAMPLE_SET_LINE, FeatureParser::SCENARIO_SET_LINE
-          @scenario_outline.add_to_tag_nodes(@example_set) if @example_set
-
-          @example_set = ExampleSetNode.new($1, @feature.tags | @current_tags)
-          @current_tags = []
-        when @example_set && FeatureParser::EXAMPLE_LINE
-          @example_set.add_child(Node.new($1))
-        end
-      end
-
-      # EOF is the final way that we know we are finished with a "Scenario Outline"
-      close_scenario_outline
-      return @feature
-    end
-
-    def close_scenario_outline
-      if @scenario_outline
-        if @example_set
-          @scenario_outline.add_to_tag_nodes(@example_set) if @example_set
-          @example_set = nil
-        end
-        @feature.merge_tag_nodes(@scenario_outline)
-        @scenario_outline = nil
-      end
-    end
-
-  end
-
-end