stepdown 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28dff0daab83a979840d182b9efdcada6c958861
-  data.tar.gz: 0e172af55a83cfcd9a50e661fc99c907260f483d
+  metadata.gz: 33164129ac3bed55b04982c7468555c3e1058bdb
+  data.tar.gz: 96504134c823975da8fe0288ab8bdbda19c1dd99
 SHA512:
-  metadata.gz: 942b4276a92f9820cb14c80225eb615155344bbcac4c874b6506f6b2d0afe8a8663e342551f4a0e79573538b5aaaf2d7975925b483a4a57fcb08b1fc6ed8c853
-  data.tar.gz: 8ea4b89c294210380def272e33ded0a93672c781e20442b5e23aa4cb956d01f8711ccb1113391aef4dd9edcbe1388fa9f164bccd7fa8bb539aa67421ed628ee1
+  metadata.gz: 38194d27e8692fec98f6dd292a4f9e80df54c7645b4a728dde67584f2e3378026ab5b48997cc4840366d62032c0bb3493e4af8252a5202d8a0b03d2a2494e56a
+  data.tar.gz: aabc5045200206b0c2d8f04aa78de71b8587418288413d90e4330acc26fc716079154fc35ce4bd80d4df954fdf34d4e4e10a1b28caae62c48d99f81c8847df26

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    stepdown (1.0.0)
-      bundler (> 1.0)
+    stepdown (1.0.1)
+      bundler (~> 1.0)
       gherkin (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.0.8)
-    diff-lcs (1.2.4)
-    gherkin (2.12.1)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
     method_source (0.8.1)
-    multi_json (1.7.9)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rake (10.0.3)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.1)
+    multi_json (1.10.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.3.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.99.2)
     sass (3.2.5)
-    slop (3.3.3)
+    slop (3.4.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pry
-  rake
+  pry (~> 0.10)
+  rake (~> 10.0)
   rspec (~> 2.5)
   sass (~> 3.1)
   stepdown!

data/lib/stepdown/options.rb

@@ -32,7 +32,7 @@ module Stepdown
           @features_dir = o
         end
 
-        opts.on("--quiet", "-q", "Supress output") do |o|
+        opts.on("--quiet", "-q", "Suppress output") do |o|
           @quiet = true
         end
 

data/lib/stepdown/reporter.rb

@@ -1,23 +1,9 @@
-require 'stepdown/step_group'
-require 'stepdown/step_usage'
 require 'delegate'
 
 module Stepdown
-  class Reporter < Delegator
-    
+  class Reporter < SimpleDelegator
     def initialize(statistics)
-      @statistics = statistics
-      super @statistics
+      super
     end
-
-    def __getobj__
-      @statistics  
-    end
-
-    def __setobj__(statistics)
-      @statistics = statistics
-    end
-
   end
 end
-

data/lib/stepdown/statistics.rb

@@ -1,3 +1,5 @@
+require 'stepdown/step_group'
+require 'stepdown/step_usage'
 
 module Stepdown
   class Statistics

data/lib/stepdown/step.rb

@@ -18,5 +18,8 @@ module Stepdown
       self.id == other.id
     end
 
+    def to_s
+      regex.inspect.to_s
+    end
   end
-end
+end

data/lib/stepdown/step_collection.rb

@@ -6,7 +6,6 @@ module Stepdown
 
     def initialize
       @steps = {}
-      @addition_order = []
     end
 
     def add_step(id, regex)
@@ -15,7 +14,6 @@ module Stepdown
       else
         @steps[id] = Stepdown::Step.new(id, regex)
         @steps[id].count = 1
-        @addition_order << id
       end
     end
 
@@ -24,7 +22,7 @@ module Stepdown
     end
 
     def each
-      @addition_order.each{|id| yield @steps[id] }
+      @steps.each{|id, _| yield @steps[id] }
     end
 
     def [](id)
@@ -35,4 +33,4 @@ module Stepdown
       @steps.length
     end
   end
-end
+end

data/lib/stepdown/step_group.rb

@@ -35,7 +35,7 @@ module Stepdown
       step_collection[0..10].each do |step|
 
         next if step.regex.nil?
-        base += "a--\"#{CGI.escape(CGI.escapeHTML(step.regex.inspect.to_s))}\" [weight=#{step.count}];"
+        base += "a--\"#{CGI.escape(CGI.escapeHTML(step.to_s))}\" [weight=#{step.count}];"
         #a [label=\"#{grouping.in_steps[0][:step].regex.inspect}\"]; a--b [penwidth=3,weight=2];b--d}"
       end
       base += "}"

data/lib/stepdown/step_instance.rb

@@ -18,6 +18,10 @@ module Stepdown
       define_step(regex,&block)
     end
 
+    def And(regex,&block)
+      define_step(regex,&block)
+    end
+
     def define_step(regex,&block)
       @steps << regex
     end

data/lib/stepdown/text_reporter.rb

@@ -8,7 +8,7 @@ module Stepdown
       output = File.new(Stepdown.output_directory + '/analysis.txt', "w+")
 
       output.puts "Total number of scenarios: #{total_scenarios}"
-      output.puts "Total numer of steps: #{total_steps}"
+      output.puts "Total number of steps: #{total_steps}"
       output.puts "Unused steps: #{unused_step_count}"
       output.puts "Steps per scenario: #{steps_per_scenario}"
       output.puts "Unique steps per scenario: #{unique_steps}"
@@ -18,22 +18,16 @@ module Stepdown
       usages.each{|use| output.puts used_step_line(use) }
 
       output.puts "Unused steps"
-      unused.each{|use| output.puts unused_step_line(use) }
+      unused.each{|use| output.puts use.step }
 
       output.close
 
       puts "Report output to #{Stepdown.output_directory}/analysis.txt" unless Stepdown.quiet
-
     end
 
     def used_step_line(use)
-      line = [use.step.regex.inspect, use.total_usage, use.number_scenarios, use.use_scenario]
+      line = [use.step, use.total_usage, use.number_scenarios, use.use_scenario]
       line.join("|")
     end
-
-    def unused_step_line(use)
-      use.step.regex.inspect
-    end
-
   end
 end

data/lib/stepdown/version.rb

@@ -1,3 +1,3 @@
 module Stepdown
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/lib/stepdown/step_instance_spec.rb

@@ -57,6 +57,11 @@ describe Stepdown::StepInstance do
       @step_instance.line_matches("Then matched step").regex.should == /matched step/
     end
 
+    it "should parse And steps" do
+      @step_instance.And(/matched step/)
+      @step_instance.line_matches("And matched step").regex.should == /matched step/
+    end
+
   end
   
   describe "parsing step definitions" do
@@ -81,5 +86,11 @@ describe Stepdown::StepInstance do
       @step_instance.step_collection.should be_an_instance_of Stepdown::StepCollection
       @step_instance.step_collection.count.should == 1
     end
+
+    it "should define and steps" do
+      @step_instance.And(@regex)
+      @step_instance.step_collection.should be_an_instance_of Stepdown::StepCollection
+      @step_instance.step_collection.count.should == 1
+    end
   end
 end

data/stepdown.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "stepdown"
 
   s.add_dependency('gherkin', '~> 2.3')
-  s.add_dependency('bundler', '> 1.0')
+  s.add_dependency('bundler', '~> 1.0')
   s.add_development_dependency('rspec', "~> 2.5")
   s.add_development_dependency('sass', "~> 3.1")
-  s.add_development_dependency('rake')
-  s.add_development_dependency('pry')
+  s.add_development_dependency('rake', '~> 10.0')
+  s.add_development_dependency('pry', '~> 0.10')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/templates/_grouping.html.erb

@@ -21,7 +21,7 @@
           <% grouping.step_collection.each do |step| %>
             <tr>
               <td><%= step.count %></td>
-              <td><%= CGI.escapeHTML step.regex.inspect %></td>
+              <td><%= CGI.escapeHTML step.to_s %></td>
             </tr>
           <% end %>
         </tbody>

data/templates/_usages.html.erb

@@ -1,6 +1,6 @@
 <% usages_rest.each do |use| %>
   <tr>
-    <td><%= use.step.regex.inspect %></td>
+    <td><%= use.step.to_s %></td>
     <td><%= use.total_usage %></td>
     <td><%= use.number_scenarios %></td>
     <td><%= use.use_scenario %></td>

data/templates/index.html.erb

@@ -125,7 +125,7 @@
 
             <% usages.each do |use| %>
               <tr>
-                <td><%= use.step.regex.inspect %></td>
+                <td><%= use.step.to_s %></td>
                 <td><%= use.total_usage %></td>
                 <td><%= use.number_scenarios %></td>
                 <td><%= use.use_scenario %></td>
@@ -144,7 +144,7 @@
 
               <% unused.each do |use| %>
                 <tr>
-                  <td><%= use.step.regex.inspect %></td>
+                  <td><%= use.step.to_s %></td>
                 </tr>
               <% end %>
           </tbody>
@@ -193,7 +193,7 @@
                         <% grouping.step_collection.each do |step| %>
                           <tr>
                             <td><%= step.count %></td>
-                            <td><%= CGI.escapeHTML(step.regex.inspect) %></td>
+                            <td><%= CGI.escapeHTML(step.to_s) %></td>
                           </tr>
                         <% end %>
                       </tbody>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepdown
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sean Caffery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -28,14 +28,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -70,30 +70,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: Stepdown allows you to see where your most used Cucumber steps are, your
   unused steps and how they are clustered
 email: