cuporter 0.2.4 → 0.2.5

data/Rakefile

@@ -56,7 +56,7 @@ namespace :cuporter do
 
   spec = Gem::Specification.new do |s|
     s.name = 'cuporter'
-    s.version = '0.2.4'
+    s.version = '0.2.5'
     s.rubyforge_project = s.name
 
     s.platform = Gem::Platform::RUBY
@@ -69,11 +69,12 @@ namespace :cuporter do
     s.email = 'twcamper@thoughtworks.com'
     s.homepage = 'http://github.com/twcamper/cuporter'
     s.required_ruby_version = '>= 1.8.7'
+    s.add_dependency('builder', '>= 2.1.2')
     s.default_executable = "cuporter"
     s.executables = [s.default_executable]
 
     s.files =  %w(LICENSE README.textile Rakefile) + 
-      FileList["lib/**/*.{rb,css}", "spec/**/*.rb", "features/**/*.{feature,rb}", "bin/*"].to_a
+      FileList["lib/**/*.{rb,css}", "bin/*"].to_a
 
     s.require_path = "lib"
   end

data/lib/cuporter/example_set_node.rb

@@ -2,10 +2,6 @@
 module Cuporter
   class ExampleSetNode < TagListNode
 
-    def initialize(name, tags)
-      super(name, tags)
-    end
-
     def sort!
       # no op
     end

data/lib/cuporter/feature_parser.rb

@@ -10,16 +10,17 @@ module Cuporter
     EXAMPLE_SET_LINE      = /^\s*(Examples:[^#]*)$/
     EXAMPLE_LINE          = /^\s*(\|.*\|)\s*$/
 
-    def initialize
+    def initialize(file)
+      @file = file
       @current_tags = []
     end
 
-    def self.parse(feature_content)
-      self.new.parse(feature_content)
+    def self.parse(file)
+      self.new(file).parse
     end
 
-    def parse(feature_content)
-      lines = feature_content.split(/\n/)
+    def parse
+      lines = File.read(@file).split(/\n/)
 
       lines.each_with_index do |line, i|
         case line
@@ -28,6 +29,7 @@ module Cuporter
           @current_tags |= $1.strip.split(/\s+/)
         when FEATURE_LINE
           @feature = TagListNode.new($1, @current_tags)
+          @feature.file = @file.sub(/^.*features\//,"features/")
           @current_tags = []
         when SCENARIO_LINE
           # How do we know when we have read all the lines from a "Scenario Outline:"?

data/lib/cuporter/formatters/cuporter.css

@@ -34,8 +34,8 @@ ul {
 .feature_name {
 	margin-left: -2em;
 	padding-left: 2em;
-	padding-top:  0.1em;
-	padding-bottom: 0.1em;
+	padding-top:  0.3em;
+	padding-bottom: 0.3em;
 	font-weight: bold;
 	background-color: #24A6C1;
 	color: white;
@@ -68,4 +68,11 @@ ul {
 	left: 4.5em;
 	font-weight: bold;
 }
+.file {
+  float: right;
+  padding-right: 0.5em;
+  font-weight: normal;
+  font-size: 1.1em;
+  color: black;
 
+}

data/lib/cuporter/formatters/html_node_writer.rb

@@ -29,7 +29,10 @@ module Cuporter
 
       def write_node_name(node)
         builder.span("#{node.number}.", :class => :number) if node.number
-        builder.div(node.name, :class => "#{node_class(node.name)}_name")
+        builder.div(:class => "#{node_class(node.name)}_name") do
+          builder.span(node.name)
+          builder.span(node.file, :class => :file) if node.file
+        end
       end
 
       def write_children(node)

data/lib/cuporter/node.rb

@@ -3,8 +3,9 @@ module Cuporter
   class Node
     include Comparable
 
-    attr_reader :name, :children
-    attr_accessor :number
+    attr_reader :name
+    attr_accessor :children, :number, :file
+
 
     def initialize(name)
       @name = name.to_s.strip
@@ -67,20 +68,6 @@ module Cuporter
     end
     alias :== :eql?
 
-    # Have my children adopt the other node's grandchildren.
-    #
-    # Copy children of other node's top-level, direct descendants to this 
-    # node's direct descendants of the same name.
-    def merge(other)
-      other.children.each do |other_child|
-        direct_child = find_or_create_child(other_child.name)
-        new_grandchild = Node.new(other.name)
-        other_child.children.collect do |c|
-          new_grandchild.add_child(c)
-        end
-        direct_child.add_child(new_grandchild)
-      end
-    end
 
     def total
       number_all_descendants unless @numberer

data/lib/cuporter/tag_list_node.rb

@@ -21,5 +21,20 @@ module Cuporter
       end
     end
 
+    # Have my children adopt the other node's grandchildren.
+    #
+    # Copy children of other node's top-level, direct descendants to this 
+    # node's direct descendants of the same name.
+    def merge(other)
+      other.children.each do |other_child|
+        direct_child               = find_or_create_child(other_child.name)
+        new_grandchild             = Node.new(other.name)
+        new_grandchild.children    = other_child.children
+        new_grandchild.file        = other.file
+
+        direct_child.add_child(new_grandchild)
+      end
+    end
+
   end
 end

data/lib/cuporter/tag_report.rb

@@ -13,8 +13,8 @@ module Cuporter
     def scenarios_per_tag
       tags = TagListNode.new("report",[])
       files.each do |file|
-        content = File.read(file)
-        tags.merge(FeatureParser.parse(content)) unless content.empty?
+        feature = FeatureParser.parse(file)
+        tags.merge(feature) if feature
       end
       tags.sort_all_descendants!
       tags

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuporter
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Tim Camper
@@ -15,10 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -04:00
+date: 2010-09-14 00:00:00 -04:00
 default_executable: cuporter
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  version_requirements: *id001
 description: Scrapes Cucumber *.feature files to build report on tag usage
 email: twcamper@thoughtworks.com
 executables: 
@@ -48,19 +63,6 @@ files:
 - lib/cuporter/tag_report.rb
 - lib/cuporter.rb
 - lib/cuporter/formatters/cuporter.css
-- spec/cuporter/node_spec.rb
-- spec/cuporter/sort_node_spec.rb
-- spec/cuporter/feature_parser_spec.rb
-- spec/cuporter/support/functional/cli.rb
-- spec/cuporter/node_numberer_spec.rb
-- spec/cuporter/example_set_node_spec.rb
-- spec/cuporter/functional/scenario_outlines_spec.rb
-- spec/cuporter/functional/single_feature_spec.rb
-- spec/cuporter/tag_list_node_spec.rb
-- spec/spec_helper.rb
-- features/pretty_print.feature
-- features/support/env.rb
-- features/step_definitions/cuporter_steps.rb
 - bin/cuporter
 has_rdoc: true
 homepage: http://github.com/twcamper/cuporter

data/features/pretty_print.feature

@@ -1,7 +0,0 @@
-Feature: Pretty print report on 3 features
-
-  @just_me
-  Scenario: Everything in fixtures/self_test
-    When I run cuporter --in fixtures/self_test
-    Then the output should have the same contents as "features/reports/pretty_with_outlines_and_examples.txt"
-    

data/features/step_definitions/cuporter_steps.rb

@@ -1,8 +0,0 @@
-When /^I run cuporter (.*)$/ do |cuporter_opts|
-  @output = `bin#{File::SEPARATOR}cuporter #{cuporter_opts}`
-end
-
-
-Then /^.* should have the same contents as "([^"]*)"$/ do |expected_file|
-  @output.should == IO.read(File.expand_path(expected_file))
-end

data/features/support/env.rb

@@ -1,2 +0,0 @@
-$LOAD_PATH << File.expand_path('../../../lib' , __FILE__)
-require 'cuporter'

data/spec/cuporter/example_set_node_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-module Cuporter
-  describe ExampleSetNode do
-    context 'empty' do
-      it 'raises no error when numbering' do
-        node = ExampleSetNode.new("Scenarios: stuff", [])
-        expect do
-          node.number_all_descendants
-        end.to_not raise_error
-        node.total.should == 0
-      end
-    end
-
-    context 'with children' do
-      it 'does not count first or "header" row' do
-        node = ExampleSetNode.new("Scenarios: stuff", [])
-        node.add_child(Node.new("|col1|col2|"))
-        node.add_child(Node.new("|val1|val2|"))
-
-        node.number_all_descendants
-        node.children.first.number.should be_nil
-        node.children.last.number.should == 1
-      end
-    end
-  end
-end

data/spec/cuporter/feature_parser_spec.rb

@@ -1,78 +0,0 @@
-require 'spec_helper'
-
-module Cuporter
-  describe FeatureParser do
-    context "#tags" do
-      context "one tag" do
-        it "returns one tag" do
-          feature = FeatureParser.parse("@wip\nFeature: foo")
-          feature.tags.should == ["@wip"]
-        end
-      end
-
-      context "two tags on one line" do
-        it "returns two tags" do
-          feature = FeatureParser.parse(" \n@smoke @wip\nFeature: foo")
-          feature.tags.sort.should == %w[@smoke @wip].sort
-        end
-      end
-      context "two tags on two lines" do
-        it "returns two tags" do
-          feature = FeatureParser.parse(" \n@smoke\n @wip\nFeature: foo")
-          feature.tags.sort.should == %w[@smoke @wip].sort
-        end
-      end
-      context "no tags" do
-        it "returns no tags" do
-          feature = FeatureParser.parse("\nFeature: foo")
-          feature.tags.should == []
-        end
-      end
-
-    end
-
-    context "#name" do
-      let(:name) {"Feature: consume a fairly typical feature name, and barf it back up"}
-      context "sentence with comma" do
-        it "returns the full name" do
-          feature = FeatureParser.parse("\n#{name}\n  Background: blah")
-          feature.name.should == name
-        end
-      end
-      context "name followed by comment" do
-        it "returns only the full name" do
-          feature = FeatureParser.parse("# Here is a feature comment\n# And another comment\n #{name} # comment text here\n  Background: blah")
-          feature.name.should == name
-        end
-      end
-
-    end
-
-    context "#parse" do
-      context "table which is not an example set" do
-        it "does not raise an error" do
-          content = <<EOF
-
-Feature: table not examples
-
-    Scenario: no examples under here
-      Given foo
-      When bar
-      Then wow:
-        | All       |
-        | Some      |
-        | Any       |
-        | Few       |
-        | Most      |
-EOF
-
-          expect do
-            FeatureParser.parse(content)
-          end.to_not raise_error
-        end
-      end
-    end
-
-  end
-end
-