wally 0.0.17 → 0.0.18

data/features/counts.feature

@@ -0,0 +1,19 @@
+Feature: Counts
+  In order to understand the size of the project
+  As a stakeholder
+  I want a visual indication of the number of tags, scenarios and features
+
+  Scenario: Tags, scenarios, and features count
+    Given a feature file named "sample.feature" with the contents:
+    """
+    @tag1
+    Feature: Tag Feature
+    @tag2 @multiple
+    Scenario: Tag Foo 1
+    @tag3 @multiple
+    Scenario: Tag Bar 2
+    """
+    When I visit the home page
+    Then I should see a heading "Features (1)"
+    And I should see a heading "Tags (4)"
+    And I should see a heading "Scenarios (2)"

data/features/notifications.feature

@@ -6,4 +6,4 @@ Feature: Notifications
   Scenario: Ten @wip tags
     Given a feature file with 10 @wip tags
     When I visit the home page
-    Then I should see a notification that says "You have 10 @wip tags"
+    Then I should see a notification that says "You have 10 @wip tags :("

data/features/step_definitions/browse_features_steps.rb

@@ -44,3 +44,9 @@ end
 Then /^the features are ordered alphabetically$/ do
   page.body.should =~ /Elle Macpherson.*Jessica-Jane Clement.*Kate Moss.*Katie Price/m
 end
+
+
+Then /^I should see a heading "([^"]*)"$/ do |text|
+  page.body.should have_content text
+end
+

data/lib/wally/application.rb

@@ -13,13 +13,14 @@ before do
   @features = @lists_features.features
   @tag_count = Wally::CountsTags.new(@lists_features).count_tags
   @excessive_wip_tags = @tag_count["@wip"] >= 10
+  @scenario_count = @features.to_s.scan(/scenario/).length
 end
 
 get '/?' do
   haml :index
 end
 
-get '/features/:feature/?' do |feature|
+get '/features/:feature/?' do |feature|  
   @features.each do |feature_hash|
    @feature = feature_hash if feature_hash["id"] == feature
   end
@@ -40,7 +41,7 @@ get '/features/:feature/scenario/:scenario/?'  do  |feature_id, scenario_id|
         if element["type"] == "background"
           @background = element
         end
-        if element["type"] == "scenario" && element["id"] == "#{feature_id};#{scenario_id}"
+        if (element["type"] == "scenario" || element["type"] == "scenario_outline") && element["id"] == "#{feature_id};#{scenario_id}"
           @scenario = element
         end
       end
@@ -58,7 +59,7 @@ def get_sorted_scenarios(feature)
 
   if feature["elements"]
     feature["elements"].each do |element|
-      if element["type"] == "scenario"
+      if element["type"] == "scenario" || element["type"] == "scenario_outline"
         scenarios << element
       end
     end

data/lib/wally/counts_tags.rb

@@ -8,14 +8,14 @@ module Wally
       @lists_features.features.inject(Hash.new(0)) do |tag_count, feature|
         if feature["tags"]
           feature["tags"].each do |tag|
-            tag_count[tag["name"]] += 1
+            tag_count[tag["name"].downcase] += 1
           end
         end
         if feature["elements"]
           feature["elements"].each do |element|
             if element["tags"]
               element["tags"].each do |tag|
-                tag_count[tag["name"]] += 1
+                tag_count[tag["name"].downcase] += 1
               end
             end
           end

data/lib/wally/lists_features.rb

@@ -18,7 +18,9 @@ module Wally
     def features
       features = []
       Dir.glob("#{@feature_path}/*.feature").each do |path|
-        features << parse_gherkin(File.read(path))
+        gherkinese = parse_gherkin(File.read(path))
+        gherkinese["path"] = path
+        features << gherkinese
       end
       features.sort {|a,b| a["name"] <=> b["name"]}
     end

data/lib/wally/public/skin.css

@@ -72,6 +72,7 @@ input, textarea, select, .uneditable-input {
 .sidebar {
   padding-top: 18px;
   padding-right: 19px;
+  padding-bottom: 200px;
   border-right: 1px solid #dfdfdf;
 }
 
@@ -102,6 +103,11 @@ p {
   content: "\2691";
 }
 
+section.scenarios {
+    border-bottom: 1px dotted #ccc;
+    margin-bottom: 18px;
+}
+
 section.feature p:first-child {
     white-space: pre-wrap
 }

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/lib/wally/views/feature.haml

@@ -1,3 +1,6 @@
+- if @feature["path"]
+  %pre
+    = @feature["path"]
 - if @feature["description"]
   %h2 Scenarios
   %section{:class=>"scenarios"}

data/lib/wally/views/layout.haml

@@ -17,13 +17,20 @@
           %input.btn{:type => "submit", :id => "search", :value => "Search"}
     %div.container-fluid
       %div.sidebar
+        %ul
+          %li
+            %a{:href => "/search?q="}
+              = "Scenarios (#{@scenario_count})"
+          %li
+            %a{:href => "/"}
+              = "Features (#{@features.length})"             
         %h2
           Features
         %ul
           - @features.each do |feature|
             = haml :feature_link, {:locals => {:feature => feature}, :layout => false}
         - if @tag_count.any?
-          %h2 Tags
+          %h2 Tags (#{@tag_count.length})
           %ul
             - @tag_count.each do |tag, count|
               %li
@@ -33,5 +40,5 @@
         - if @excessive_wip_tags
           %div.alert-message.error
             %p
-              = "You have #{@tag_count["@wip"]} @wip tags"
+              = "You have #{@tag_count["@wip"]} @wip tags :("
         = yield

data/lib/wally/views/scenario.haml

@@ -8,7 +8,7 @@
   - @background["steps"].each do |step|
     %p
       %span.step-keyword
-        = step["keyword"]
+        &= step["keyword"]
       = step["name"]
 - if @scenario["steps"]
   %h3 Steps:
@@ -16,7 +16,20 @@
     %p
       %span.step-keyword
         = step["keyword"]
-      = step["name"]
+      = escape_once(step["name"])
 - else
   %p{:class => 'nosteps'}
     = "Where's Wally? This scenario has no steps!?"
+- if @scenario["examples"]
+  %h3 Examples:
+  %table
+    - @scenario["examples"].first["rows"].each_with_index do |row, index|
+      %tr
+        - row["cells"].each do |cell|
+          - if index === 0
+            %th
+              = escape_once(cell)
+          - else
+            %td
+              = escape_once(cell)
+

data/spec/wally/counts_tags_spec.rb

@@ -38,5 +38,17 @@ module Wally
         "@tag3" => 1
       }
     end
+
+    it "counts feature tags irrespective of their case" do
+      write_feature("feature-1.feature", "@tag1\nFeature: Feature 1")
+      write_feature("feature-2.feature", "@TAG1\nFeature: Feature 2")
+      write_feature("feature-3.feature", "Feature: Feature 2\n@TAG1\nScenario: Scenario 1")
+      lists_features = ListsFeatures.new("application-features")
+
+      CountsTags.new(lists_features).count_tags.should == {
+        "@tag1" => 3
+      }
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wally
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000Z
+date: 2011-11-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70317088116700 !ruby/object:Gem::Requirement
+  requirement: &70275484147260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317088116700
+  version_requirements: *70275484147260
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70317088116180 !ruby/object:Gem::Requirement
+  requirement: &70275484146640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317088116180
+  version_requirements: *70275484146640
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70317088115600 !ruby/object:Gem::Requirement
+  requirement: &70275484145140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317088115600
+  version_requirements: *70275484145140
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70317088115020 !ruby/object:Gem::Requirement
+  requirement: &70275484144540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317088115020
+  version_requirements: *70275484144540
 - !ruby/object:Gem::Dependency
   name: komainu
-  requirement: &70317088114380 !ruby/object:Gem::Requirement
+  requirement: &70275484143720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317088114380
+  version_requirements: *70275484143720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70317088113840 !ruby/object:Gem::Requirement
+  requirement: &70275484140820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317088113840
+  version_requirements: *70275484140820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70317088113300 !ruby/object:Gem::Requirement
+  requirement: &70275484134100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317088113300
+  version_requirements: *70275484134100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70317088112820 !ruby/object:Gem::Requirement
+  requirement: &70275484133480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317088112820
+  version_requirements: *70275484133480
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70317088112340 !ruby/object:Gem::Requirement
+  requirement: &70275484132820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317088112340
+  version_requirements: *70275484132820
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -131,6 +131,7 @@ files:
 - example-features/generic/multiple-scenarios.feature
 - example-features/too-many-wip-tags/too-many-wip-tags.feature
 - features/browse_features.feature
+- features/counts.feature
 - features/list_tags.feature
 - features/notifications.feature
 - features/search_features.feature
@@ -186,6 +187,7 @@ specification_version: 3
 summary: ''
 test_files:
 - features/browse_features.feature
+- features/counts.feature
 - features/list_tags.feature
 - features/notifications.feature
 - features/search_features.feature