stepdown 0.1 → 0.2

data/Gemfile

@@ -1,4 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'haml'
-gem 'rspec'
+
+group :development,:test do
+  gem 'rspec'
+end

data/bin/stepdown

@@ -4,9 +4,26 @@ $:.unshift lib unless $:.include?(lib)
 
 require 'step_down'
 
+  def show_help
+    puts "Usage: stepdown step_definition_dir feature_file_directory"
+    puts "eg. stepdown ./features/step_definitions/ ./features/"
+  end
+
 begin
-  StepDown.new(ARGV[0], ARGV[1]).analyse
+
+  if ARGV[0] =~ /(-h|--help)/ || ARGV.length != 2
+    show_help
+    exit
+  end
+
+  if ARGV.length <=> 2
+    default_path = Dir.pwd
+    StepDown.new(default_path + "/features/step_definitions", default_path + "/features").analyse
+  else
+    StepDown.new(ARGV[0], ARGV[1]).analyse
+  end
 rescue Interrupt => e
   puts "Quiting..."
   exit 1
 end
+

data/lib/counting_step.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/step')
+class CountingStep < Step
+  attr_accessor :count
+
+  def initialize(id, regex)
+    @count = 0
+    super(id, regex)
+  end
+
+  def <=>(step)
+    self.count <=> step.count
+  end
+
+end

data/lib/step_group.rb

@@ -1,6 +1,7 @@
 require 'cgi'
+require 'counting_step'
 class StepGroup
-  attr_reader :id, :regex, :in_steps, :total_usage
+  attr_reader :id, :regex, :total_usage
 
   def initialize(step)
     @id = step.id
@@ -10,16 +11,15 @@ class StepGroup
   end
 
   def in_steps
-    @in_steps.sort{|a,b| b[0] <=> a[0] }
+    @in_steps.sort{|a,b| b[1] <=> a[1]}
   end
 
   def add_step(step)
     if @in_steps[step.id]
-      @in_steps[step.id][:count] += 1
+      @in_steps[step.id].count += 1
     else
-      @in_steps[step.id] = {}
-      @in_steps[step.id][:count] = 1
-      @in_steps[step.id][:step] = step
+      @in_steps[step.id] = CountingStep.new(step.id, step.regex)
+      @in_steps[step.id].count = 1
     end
   end
 
@@ -27,7 +27,7 @@ class StepGroup
     @total_usage = 0
     #puts step[:in_steps].inspect
     @in_steps.each do |key,val|
-      @total_usage += val[:count]
+      @total_usage += val.count
     end
     @total_usage
   end

data/spec/lib/step_group_spec.rb

@@ -0,0 +1,119 @@
+require 'rspec'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/step_group')
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/counting_step')
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/step')
+
+describe StepGroup do
+
+  describe "returning the number of steps that are near the current step" do
+    before :each do
+      @step_group = StepGroup.new(Step.new(0,/regex/))
+    end
+
+    it "should return an empty hash when for an empty group" do
+      @step_group.in_steps.should be_empty
+    end
+
+    it "should return the current steps in the group" do
+      @step_group.add_step(Step.new(1,/regex/))
+      @step_group.add_step(Step.new(2,/regex/))
+      @step_group.add_step(Step.new(3,/regex/))
+
+      @step_group.in_steps.count.should == 3
+    end
+
+    it "should return the steps ordered by use count" do
+      @step_group.add_step(Step.new(1,/regex/))
+      @step_group.add_step(Step.new(1,/regex/))
+      @step_group.add_step(Step.new(3,/regex/))
+      @step_group.add_step(Step.new(3,/regex/))
+      @step_group.add_step(Step.new(3,/regex/))
+      @step_group.add_step(Step.new(2,/regex/))
+
+      @step_group.in_steps[0][1].count.should == 3
+      @step_group.in_steps[1][1].count.should == 2
+      @step_group.in_steps[2][1].count.should == 1
+    end
+
+  end
+
+  describe "adding a step to the step group" do
+    before :each do
+      @step_group = StepGroup.new(Step.new(0,/regex/))
+    end
+
+    it "should add new steps" do
+      step1 = Step.new(1,/regex/)
+      counting_step = mock("counting_step")
+      CountingStep.stub!(:new).and_return(counting_step)
+      counting_step.should_receive(:count=).with(1)
+      @step_group.add_step(step1)
+      @step_group.in_steps.should == [[1, counting_step]]
+
+    end
+
+    it "should update the count for an existing step" do
+
+      step1 = Step.new(1,/regex/)
+      @step_group.add_step(step1)
+      @step_group.add_step(step1)
+
+      @step_group.in_steps[0][1].count.should == 2
+    end
+
+    it "should update step counts when multiple steps present" do
+      step1 = Step.new(1,/regex/)
+      @step_group.add_step(step1)
+      @step_group.add_step(step1)
+
+      step2 = Step.new(2,/regex/)
+      @step_group.add_step(step2)
+
+      step3 = Step.new(3,/regex/)
+      @step_group.add_step(step3)
+      @step_group.add_step(step3)
+      @step_group.add_step(step3)
+
+      @step_group.in_steps[0][1].count.should == 3
+      @step_group.in_steps[1][1].count.should == 2
+      @step_group.in_steps[2][1].count.should == 1
+
+    end
+
+  end
+
+  describe "updating the use count of the main step" do
+    before :each do
+      @step_group = StepGroup.new(Step.new(0,/regex/))
+    end
+
+    it "should return 0 for an empty group" do
+      @step_group.update_use_count.should be_zero
+    end
+
+    it "should return the total use" do
+      @step_group.add_step(Step.new(1,/regex/))
+      @step_group.add_step(Step.new(1,/regex/))
+      @step_group.add_step(Step.new(3,/regex/))
+      @step_group.add_step(Step.new(4,/regex/))
+      @step_group.add_step(Step.new(1,/regex/))
+
+      @step_group.update_use_count.should == 5
+    end
+
+    it "should update the use when new steps are added" do
+      @step_group.add_step(Step.new(1,/regex/))
+      @step_group.add_step(Step.new(1,/regex/))
+
+      @step_group.update_use_count.should == 2
+
+      @step_group.add_step(Step.new(3,/regex/))
+      @step_group.add_step(Step.new(4,/regex/))
+      @step_group.add_step(Step.new(1,/regex/))
+
+      @step_group.update_use_count.should == 5
+    end
+
+  end
+
+end

data/stepdown.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name = "stepdown"
-  s.version = "0.1"
+  s.version = "0.2"
   s.platform = Gem::Platform::RUBY
   s.authors = "Sean Caffery"
   s.email = "sean@lineonpoint.com"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: stepdown
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Sean Caffery
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +11:00
+date: 2011-02-15 00:00:00 +11:00
 default_executable: stepdown
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,10 +43,12 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
 - bin/stepdown
+- lib/counting_step.rb
 - lib/feature_parser.rb
 - lib/html_reporter.rb
 - lib/scenario.rb
@@ -57,6 +59,7 @@ files:
 - lib/step_usage.rb
 - public/jquery-1.4.3.min.js
 - public/step_down.js
+- spec/lib/step_group_spec.rb
 - stepdown.gemspec
 - templates/main.html.haml
 - templates/style.sass