hot_or_not 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/bin/hot_or_not

@@ -5,16 +5,21 @@ require File.dirname(__FILE__) + '/../lib/hot_or_not'
 require 'optparse'
 
 defaults = {
-  :output_directory => 'test_results'
+  :output_directory => 'test_results',
+  :test_names       => :all
 }
 
 options = {}
 parser = ::OptionParser.new do |opts|
   opts.banner = "Usage: hot_or_not [options] URL_FILE"
-  opts.on("-o", "--output-dir", "Ouput directory. DEFAULT: #{defaults[:output_directory]}") do |d|
+  opts.on("-o", "--output-dir [DIRECTORY]", "Ouput base directory. DEFAULT: #{defaults[:output_directory]}") do |d|
     options[:output_directory] = d
   end 
 
+  opts.on('-n', '--name [NAMES]', "Test names to run. DEFAULT: all") do |test_names|
+    options[:test_names] = test_names.split(',')
+  end
+
   opts.on_tail("--example-file", "Output contents of example file") do
     puts
     puts File.read(File.dirname(__FILE__) + '/../test/data/simple_urls.yml')
@@ -43,5 +48,8 @@ unless File.exists? yaml_file
   exit
 end
 
-announcer = HotOrNot::ConsoleAnnouncer.new options[:output_directory]
-HotOrNot::Runner.run_from(yaml_file, announcer).run!
+suite_name = File.basename(yaml_file).gsub('.yml', '').gsub('.erb', '')
+output_dir = File.join options[:output_directory], suite_name
+
+announcer = HotOrNot::ConsoleAnnouncer.new output_dir
+HotOrNot::Runner.run_from(yaml_file, announcer).run! options[:test_names]

data/lib/hot_or_not/comparison_result.rb

@@ -1,5 +1,6 @@
 module HotOrNot
   class ComparisonResult
+    extend Forwardable
 
     class << self
       def for(compare_url)
@@ -10,6 +11,7 @@ module HotOrNot
     end
 
     attr_reader :message
+    def_delegators :@compare_url, :short_name
 
     def initialize(compare_url, side_a_results, side_b_results)
       @compare_url, @side_a_results, @side_b_results = compare_url, side_a_results, side_b_results

data/lib/hot_or_not/runner.rb

@@ -8,9 +8,11 @@ module HotOrNot
       @urls, @announcer = urls, announcer
     end
 
-    def run!
+    def run!(to_run = :all)
+      @to_run = to_run
       @announcer.starting
       @urls.each do |url|
+        next unless should_run? url
         result = ComparisonResult.for url
         if result.success?
           @announcer.announce_success result
@@ -22,5 +24,13 @@ module HotOrNot
       end
       @announcer.ending
     end
+
+    private
+    def should_run?(url)
+      return true if @to_run == :all
+      Array(@to_run).any? do |to_run|
+        url.full_name == to_run || url.short_name == to_run
+      end
+    end
   end
 end

data/test/runner_test.rb

@@ -2,39 +2,81 @@ require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
 
 module HotOrNot
   class RunnerTest < Test::Unit::TestCase
+
     def initialize(*args)
       @announcer = Class.new do
         include Announcer
 
         attr_reader :messages
         def initialize
-          @messages = {}
+          @messages = Hash.new { |hash, key| hash[key] = [] }
         end
 
         def starting
-          @messages[:starting] = true
+          @messages[:starting] << :starting
         end
 
         def ending
-          @messages[:ending] = true
+          @messages[:ending] << :ending
         end
 
         def announce_success(result)
-          @messages[:success] = true
+          @messages[:success] << result.short_name
         end
 
         def announce_failure(result)
-          @messages[:failure] = true
+          @messages[:failure] << result.short_name
         end
 
         def announce_error(result)
-          @messages[:error] = true
+          @messages[:error] << result.short_name
         end
       end.new
 
       super
     end
 
+    context "running" do
+
+      context "all" do
+        setup do
+          @url1 = mock_compare_url('Foo', '/api/foo', 'foo', 'foo')
+          @url2 = mock_compare_url('Bar', '/api/bar', 'bar', 'bar')
+          @urls = [@url1, @url2]
+        end
+
+        should "if nothing passed in" do
+          Runner.new(@urls, @announcer).run!
+          assert_ran @announcer, @url1.full_name, @url2.full_name
+        end
+
+        should "if :all passed in" do
+          Runner.new(@urls, @announcer).run! :all
+          assert_ran @announcer, @url1.full_name, @url2.full_name
+        end
+
+        should "run all specified tests" do
+          Runner.new(@urls, @announcer).run! @urls.map(&:short_name)
+          assert_ran @announcer, @url1.full_name, @url2.full_name
+        end
+      end
+
+      context "one" do
+        setup do
+          @url1 = mock_compare_url('Foo', '/api/foo', 'foo', 'foo')
+          @url2 = CompareUrl.new('Bar', '/api/bar', 'bar', 'bar')
+          @urls = [@url1, @url2]
+        end
+
+        should "only run specified test" do
+          Runner.new(@urls, @announcer).run! @url1.full_name
+
+          assert_ran @announcer, @url1.full_name
+          assert_not_ran @announcer, @url2.full_name
+        end
+      end
+    end
+
     context "successful comparison" do
       setup do
         urls = [mock_compare_url('Foo', '/api/foo', 'foo', 'foo')]
@@ -42,17 +84,17 @@ module HotOrNot
       end
 
       should "announce starting" do
-        assert @announcer.messages[:starting]
+        assert_called @announcer, :starting
       end
 
       should "announce ending" do
-        assert @announcer.messages[:ending]
+        assert_called @announcer, :ending
       end
 
       should "only annouce success" do
-        assert @announcer.messages[:success]
-        assert_false @announcer.messages[:failure]
-        assert_false @announcer.messages[:error]
+        assert_called @announcer, :success
+        assert_not_called @announcer, :failure
+        assert_not_called @announcer, :error
       end
     end
 
@@ -63,17 +105,17 @@ module HotOrNot
       end
 
       should "announce starting" do
-        assert @announcer.messages[:starting]
+        assert_called @announcer, :starting
       end
 
       should "announce ending" do
-        assert @announcer.messages[:ending]
+        assert_called @announcer, :ending
       end
 
       should "only annouce failure" do
-        assert @announcer.messages[:failure]
-        assert_false @announcer.messages[:success]
-        assert_false @announcer.messages[:error]
+        assert_called @announcer, :failure
+        assert_not_called @announcer, :success
+        assert_not_called @announcer, :error
       end
     end
 
@@ -84,19 +126,50 @@ module HotOrNot
       end
 
       should "announce starting" do
-        assert @announcer.messages[:starting]
+        assert_called @announcer, :starting
       end
 
       should "announce ending" do
-        assert @announcer.messages[:ending]
+        assert_called @announcer, :ending
       end
 
       should "only annouce error" do
-        assert @announcer.messages[:error]
-        assert_false @announcer.messages[:success]
-        assert_false @announcer.messages[:failure]
+        assert_called @announcer, :error
+        assert_not_called @announcer, :success
+        assert_not_called @announcer, :failure
+      end
+    end
+
+    private
+    def assert_called(announcer, type, times = 1, msg = nil)
+      msg ||= "The #{type} message was not announced #{times} time(s)."
+      assert_equal times, announcer.messages[type.to_sym].count, msg
+    end
+    
+    def assert_not_called(announcer, type)
+      assert_called announcer, type, 0, "The #{type} messages was called when it shouldn't have been"
+    end
+
+    def assert_ran(announcer, *tests)
+      tests.each do |test|
+        assert_equal 1, count_results(announcer, test), "Test '#{test}' was not run."
       end
     end
 
+    def assert_not_ran(announcer, *tests)
+      tests.each do |test|
+        assert_equal 0, count_results(announcer, test), "Test '#{test}' was run and shouldn't have been."
+      end
+    end
+
+    def count_results(announcer, test)
+      test_name = test.underscore.gsub(/\s+/, '_')
+      count = 0
+      count += announcer.messages[:success].count { |result_name| result_name == test_name }
+      count += announcer.messages[:failure].count { |result_name| result_name == test_name }
+      count += announcer.messages[:error].count { |result_name| result_name == test_name }
+      count
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hot_or_not
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Joel Friedman