approval_tests 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWY3NTQ1YWVlYWFlZWYwNzc3NzQ2Y2RjNjI2MjAzZTA2ZmYyMTUxMg==
+  data.tar.gz: !binary |-
+    MDhjN2I2OWM5MTI5YjRiYmM3MmQ2ZjEzMmRjNWE0MWU0Mjc4NzFmMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODZiMjZkNTIxYzk2YzI4MDBmMDQ3NzJhNmJkNTcxZDY2M2FiMmNiZDIzMThh
+    ZjU5YjkwOTI5NzcwYjA4MDVmOWYxYzZiMWU2MmFkMzY2NjFlYmQ3MTI4YjI5
+    YmEwZWMyMzY2MjVhNDQwZDEyMWM5MWRjNzQyZmY2ODIyZmUxZGE=
+  data.tar.gz: !binary |-
+    MWE4ODY0NzZjMWEzNzEzOGUyYjU2MTQ0NWM0MGE1ZDRiMDM1Y2JlMjAwMWM3
+    MGQ4ZTNlNjMxMzZjYjlkOTg3M2FiYTlkYTRhYmE4NTk5NmI5NThlZjkwN2My
+    OWI0MWIwODNhMTlhZmI1MDkzN2RjMDZjMWQ3MTQ1ZjQ0ZTFhNTQ=

data/Gemfile

@@ -0,0 +1,4 @@
+group :development, :test do
+  gem 'rspec'
+  gem 'cucumber'
+end

data/Gemfile.lock

@@ -0,0 +1,29 @@
+GEM
+  specs:
+    builder (2.1.2)
+    cucumber (1.0.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.4.6)
+      json (>= 1.4.6)
+    json (1.5.3)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    term-ansicolor (1.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  rspec

data/README

@@ -0,0 +1 @@
+Check out www.approvaltests.com for instructions

data/Rakefile

@@ -1,11 +1,15 @@
 require 'rubygems'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
 
-Spec::Rake::SpecTask.new('specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
+task :default => ["specs", "features"]
+
+RSpec::Core::RakeTask.new('specs') do |t|
+  t.rspec_opts = ["--format", "documentation", "--colour"]
 end
 
+Cucumber::Rake::Task.new('features')
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|

data/approval_tests.gemspec

@@ -1,68 +1,29 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{approval_tests}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = %q{1.3.4}
   s.authors = ["Dan Gilkerson, Llewellyn Falco"]
   s.date = %q{2009-07-03}
   s.description = %q{Approval testing library for ruby}
   s.email = %q{approvaltests@dangilkerson.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "README",
-     "Rakefile",
-     "VERSION",
-     "approval_tests.gemspec",
-     "lib/approval_tests.rb",
-     "lib/approval_tests/approvals.rb",
-     "lib/approval_tests/approvers/file_approver.rb",
-     "lib/approval_tests/extensions/rspec.rb",
-     "lib/approval_tests/namers/rspec_namer.rb",
-     "lib/approval_tests/reporters/diff_reporter.rb",
-     "lib/approval_tests/reporters/quiet_reporter.rb",
-     "lib/approval_tests/reporters/text_mate_reporter.rb",
-     "lib/approval_tests/writers/html_writer.rb",
-     "lib/approval_tests/writers/text_writer.rb",
-     "lib/approval_tests/writers/xml_writer.rb",
-     "spec/a.txt",
-     "spec/approvals_lists_should_show_empty_lists.approved.txt",
-     "spec/approvals_lists_should_write_arrays.approved.txt",
-     "spec/approvals_lists_should_write_maps.approved.txt",
-     "spec/approvals_multiple_describes_should_approve_multiple_describes.approved.txt",
-     "spec/approvals_should_approve_shared_behaviors.approved.txt",
-     "spec/approvals_should_successfully_approve_text.approved.txt",
-     "spec/approvals_spec.rb",
-     "spec/approvals_using_approval_blocks.approved.txt",
-     "spec/approvals_using_approval_blocks_the_last_statement.approved.txt",
-     "spec/approvals_xml_should_be_pretty.approved.txt",
-     "spec/b.txt",
-     "spec/cleanup_reporter.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/approvaltests/approval_tests}
+  s.extra_rdoc_files = ["README"]
+  s.homepage = %q{http://github.com/approvals/approval_tests}
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
   s.rubyforge_project = %q{approvaltests}
-  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Approval testing library}
-  s.test_files = [
-    "spec/approvals_spec.rb",
-     "spec/cleanup_reporter.rb",
-     "spec/spec_helper.rb"
-  ]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
   end
 end

data/cucumber.yml

@@ -0,0 +1 @@
+default: features

data/features/.received.txt

@@ -0,0 +1 @@
+Hello World

data/features/basic_approval.approves_string.approved.txt

@@ -0,0 +1 @@
+Hello World

data/features/basic_approval.feature

@@ -0,0 +1,13 @@
+Feature: Basic Approval
+  As a testing person 
+  I want to be able to use the basics of Approvals
+
+  Scenario: Approves String
+    Given a string "Hello World"
+    Then verify the string
+  
+  Scenario: Approval names
+    Then the approval name is "basic_approval_approval_names"
+
+  Scenario: Understand paths
+    Then the path contains "basic_approval.feature"

data/features/basic_approval_approves_string.approved.txt

@@ -0,0 +1 @@
+Hello World

data/features/step_definitions/basic_steps.rb

@@ -0,0 +1,17 @@
+Given /^a string "([^\"]*)"$/ do |str|
+  @string = str
+end
+
+Then /^verify the string$/ do
+  Approvals.reporter(Reporters::OpendiffReporter.new)
+  Approvals.approve(@string)
+end
+
+Then /^the approval name is "([^"]*)"$/ do |name|
+  Approvals.namer.approval_name.should == name
+end
+
+Then /^the path contains "([^"]*)"$/ do |file|
+  feature_file_with_path = Approvals.namer.source_file_path + "/" + file
+  File.exists?(feature_file_with_path).should be_true
+end

data/features/support/env.rb

@@ -0,0 +1,9 @@
+require 'cucumber/formatter/unicode'
+
+__DIR__ = File.join(File.dirname(__FILE__) + '/../../lib')
+$LOAD_PATH.unshift __DIR__ unless
+  $LOAD_PATH.include?(__DIR__) ||
+  $LOAD_PATH.include?(File.expand_path(__DIR__))
+
+require 'approval_tests'
+require 'approval_tests/extensions/cucumber'

data/features/support/paths.rb

@@ -0,0 +1,98 @@
+module NavigationHelpers
+  # Maps a static name to a static route.
+  #
+  # This method is *not* designed to map from a dynamic name to a 
+  # dynamic route like <tt>post_comments_path(post)</tt>. For dynamic 
+  # routes like this you should *not* rely on #path_to, but write 
+  # your own step definitions instead. Example:
+  #
+  #   Given /I am on the comments page for the "(.+)" post/ |name|
+  #     post = Post.find_by_name(name)
+  #     visit post_comments_path(post)
+  #   end
+  #
+  def path_to(page_name)
+    case page_name
+    
+    when /the homepage/
+      root_path
+    when /the signup page/
+      signup_path
+    when /the upgrade page/
+      upgrade_path
+    when /the credentials page/
+      credentials_path
+    when /the account page/
+      account_path
+    when /the (login|sign in) page/
+      login_path
+    when /my bedroom page/
+      bedroom_path(@current_user.person)
+    when /the bedroom page "([^\"]*)"/
+      bedroom_path($1)
+    when /the scene named "([^\"]*)"/
+      scene = Scene.find_by_title($1)
+      scene_path(scene)
+    when /the DHD signup page for "([^\"]*)"/
+      optionid = MembershipPackage.find_by_name($1).nats_product_id
+      username = @current_user.pending_upgrade.username
+      email = CGI.escape(@current_user.email)
+      password = @current_user.pending_upgrade.password
+
+      # build it by hand so we're actually checking everything
+      normalize_uri(
+        "http://enterbedrooms.naughtyamerica.com/signup/signup.php?" +
+        "cascade=credit" +
+        "&amp;nats=MTAwNDo0OjQx" +
+        "&amp;nextra%5BDHD%5D%5BDisableUser_Pass%5D=1" +
+        "&amp;nextra%5BDHD%5D%5Bsub_username%5D=#{username}" +
+        "&amp;nextra%5BDHD%5D%5BEmail_IsUsername%5D=0" +
+        "&amp;nextra%5BDHD%5D%5BWebSiteName%5D=Bedrooms" +
+        "&amp;nextra%5BDHD%5D%5BWebsiteHomepage%5D=http%3A%2F%2Fbedrooms.naughtyamerica.com%2F" +
+        "&amp;signup%5Bemail%5D=#{email}" +
+        "&amp;signup%5Boptionid%5D=#{optionid}" +
+        "&amp;signup%5Bpassword%5D=#{password}" +
+        "&amp;site=41" +
+        "&amp;step=2"
+      )
+    when /the "keycard" promotion page/
+      keycard_path
+    when /the candidate signup page/
+      signup_candidate_path
+    when /the new candidate page/
+      new_candidate_path
+    when /the candidate page for "([^\"]*)"/
+      "/candidates/#{$1}"
+    when /the naughty president update candidate page for "([^\"]*)"/
+      normalize_uri("http://www.naughtypresident.com/update/#{$1}")
+    when /the naughty president candidate page for "([^\"]*)"/
+      normalize_uri("http://www.naughtypresident.com/#{$1}")
+
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in features/support/paths.rb"
+    end
+  end
+
+  def normalize_uri(uri)
+    normalized_uri =
+      case uri
+      when URI then uri
+      else
+        uri = 'http://' + uri unless uri =~ %r|^https?://|
+        URI.parse(uri)
+      end
+    normalized_uri.query = sort_query_params(normalized_uri.query)
+    normalized_uri.normalize
+  end
+
+  def sort_query_params(query)
+    if query.nil? || query.empty?
+      nil
+    else
+      query.split('&').sort.join('&')
+    end
+  end
+end
+
+World(NavigationHelpers)

data/lib/approval_tests.rb

@@ -4,7 +4,25 @@ $LOAD_PATH.unshift __DIR__ unless
   $LOAD_PATH.include?(__DIR__) ||
   $LOAD_PATH.include?(File.expand_path(__DIR__))
 
-require "approval_tests/approvals"
 require "approval_tests/extensions/rspec"
 
-include ApprovalTests::Namers
+require "approval_tests/utils"
+require "approval_tests/namers"
+require "approval_tests/approvers/file_approver"
+
+require "approval_tests/writers"
+require "approval_tests/reporters"
+
+require "approval_tests/approvals"
+
+include ApprovalTests::Approvers
+include ApprovalTests::Writers
+include ApprovalTests::Reporters
+include ApprovalTests::Namers
+
+module ApprovalTests
+  class ApprovalError < Exception
+    attr_accessor :received_filename
+    attr_accessor :approved_filename
+  end
+end

data/lib/approval_tests/approvals.rb

@@ -1,42 +1,32 @@
 require 'fileutils'
-__DIR__ = File.dirname(__FILE__)
-require "#{__DIR__}/namers/rspec_namer"
-require "#{__DIR__}/approvers/file_approver"
-require "#{__DIR__}/writers/text_writer"
-require "#{__DIR__}/writers/html_writer"
-require "#{__DIR__}/writers/xml_writer"
-require "#{__DIR__}/reporters/quiet_reporter"
-require "#{__DIR__}/reporters/text_mate_reporter"
-require "#{__DIR__}/reporters/diff_reporter"
 
-include ApprovalTests::Approvers
-include ApprovalTests::Writers
-include ApprovalTests::Reporters
-
-module ApprovalTests
-  class ApprovalError < Exception
-    attr_accessor :received_filename
-    attr_accessor :approved_filename
-  end
+module ApprovalTests  
   class Approvals
     class << self
+      attr_accessor :namer
+      
       def approve_list(label, list)
-        
-        i = -1;
-        format = list.map do |m| 
-          i = i+1
-          "#{label}[#{i}] = #{m} \r"
+        format = if list.empty?
+          "#{label}.count = 0"
+        else
+          index = -1
+          list.reduce("") do |format, list_element| 
+            index += 1
+            format + "#{label}[#{index}] = #{list_element} \n"
+          end
         end
-        format = "#{label}.count = 0" if list.empty?
-        approve(format.to_s)
+        
+        approve(format)
       end
+      
       def approve_map(map)
         out = "";
-        map.each do |key,value| 
-          out += "[#{key}] = #{value} \r"
+        map.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key|
+          out += "[#{key}] = #{map[key]} \r"
         end
         approve(out)
       end
+      
       def approve(data)
         approve_with_writer(TextWriter.new(data))
       end
@@ -65,17 +55,15 @@ module ApprovalTests
           end
       end
       
-      def namer=(namer)
-        @namer = namer
-      end
-      
-      def namer
-        @namer
-      end
-    
       def get_default_reporter()
         @reporters ||= []
-        return @reporters.first() unless @reporters.empty?
+        unless @reporters.empty?
+          if @single_use
+            @single_use = false
+            return @reporters.pop
+          end
+          return @reporters.last
+        end
         if defined? Spec::Mate
           TextMateReporter.instance
         else
@@ -84,12 +72,24 @@ module ApprovalTests
       end
 
       def reporter(reporter)
+        prepare_reporters
+        @reporters.push(reporter)
+      end
+
+      def prepare_reporters
         @reporters ||= []
-        @reporters.push(reporter);
+        @reporters.pop if @single_use
+        @single_use = false
+      end
+
+      def single_use_reporter(reporter)
+        prepare_reporters
+        @reporters.push(reporter)
+        @single_use = true
       end
 
       def unregister_reporter(reporter)
-        @reporters.remove(reporter);
+        @reporters.remove(reporter)
       end
 
       def unregister_last_reporter()
@@ -97,4 +97,4 @@ module ApprovalTests
       end
     end
   end
-end
+end

data/lib/approval_tests/approvers.rb

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + '/approvers/*_approver.rb'].each {|approver| require approver}

data/lib/approval_tests/approvers/file_approver.rb

@@ -8,7 +8,7 @@ module ApprovalTests
   			@namer = namer
   		end
   		
-      def approve()
+      def approve
   			basename = "#{@namer.source_file_path}/#{@namer.approval_name}"
   			@approved = @writer.get_approval_filename(basename)
   			@received = @writer.get_received_filename(basename)
@@ -31,7 +31,7 @@ module ApprovalTests
   			return true
   		end
   		
-      def fail()
+      def fail
         raise @failure
       end
       		
@@ -39,7 +39,7 @@ module ApprovalTests
         reporter.report(@approved, @received);
       end
       		
-      def clean_up_after_success()
+      def clean_up_after_success
         File.delete(@received)
       end
     end

data/lib/approval_tests/extensions/cucumber.rb

@@ -0,0 +1,7 @@
+Before do |scenario|
+  CucumberNamer.create_namer(scenario)
+end
+
+World do
+  include ApprovalTests
+end

data/lib/approval_tests/extensions/rspec.rb

@@ -1,5 +1,3 @@
-require "#{File.dirname(__FILE__)}/../approvals"
-
 module ApprovalTests
   module Extensions
     module RSpec
@@ -38,13 +36,14 @@ module ApprovalTests
   end
 end
 
-Spec::Runner.configure do |config|  
-  config.before(:each) do
-    Approvals.namer = RSpecNamer.new()
-    extra_description = ""
-    extra_description = "_#{self.description}" if !self.description.empty?
-    Approvals.namer.approval_name = "#{self.class.description}#{extra_description}".gsub("/", "__FORWARD_SLASH__");
-    Approvals.namer.source_file_path = File.dirname(self.class.location)
+begin
+  RSpec.configure do |config|  
+    config.before(:each) do
+      Approvals.namer = RSpecNamer.new()
+      Approvals.namer.approval_name = self.example.metadata[:full_description].gsub("/", "__FORWARD_SLASH__");
+      Approvals.namer.source_file_path = File.dirname(self.class.metadata[:example_group].location)
+    end
+    config.extend(ApprovalTests::Extensions::RSpec)
   end
-  config.extend(ApprovalTests::Extensions::RSpec)
+rescue NoMethodError 
 end

data/lib/approval_tests/namers.rb

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + '/namers/*_namer.rb'].each {|namer| require namer}

data/lib/approval_tests/namers/cucumber_namer.rb

@@ -0,0 +1,29 @@
+module ApprovalTests
+  module Namers
+    class CucumberNamer
+      attr_reader :approval_name
+      attr_reader :source_file_path
+
+      def self.create_namer(scenario)
+        feature_file_and_path = scenario.instance_variable_get(:@feature).file
+        scenario_name = scenario.name
+
+        Approvals.namer = CucumberNamer.new(feature_file_and_path, scenario_name)
+      end
+
+      def initialize(feature_file_and_path, scenario_name)
+        feature_file_and_path =~ /([^\/]*)\.feature$/
+        feature_name = $1
+        
+        @source_file_path = File.dirname(File.expand_path(feature_file_and_path))
+        
+        @approval_name = format("#{feature_name}_#{scenario_name}")
+      end
+
+      def format(string)
+        string.downcase.gsub(/ |\./, "_")
+      end
+
+    end
+  end
+end

data/lib/approval_tests/namers/rspec_namer.rb

@@ -1,10 +1,8 @@
 module ApprovalTests
   module Namers
     class RSpecNamer
-      
-      def approval_name
-        @approval_name
-      end
+      attr_reader :approval_name
+      attr_writer :source_file_path
       
       def approval_name=(name)
         @approval_name = name.downcase.gsub(/ |\./, "_")
@@ -14,9 +12,6 @@ module ApprovalTests
         @source_file_path ||= File.dirname(File.expand_path(@approval_name))
       end
       
-      def source_file_path=(path)
-        @source_file_path = path
-      end
     end
   end
 end

data/lib/approval_tests/reporters.rb

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + '/reporters/*_reporter.rb'].each {|reporter| require reporter}

data/lib/approval_tests/reporters/diff_reporter.rb

@@ -3,16 +3,32 @@ require 'singleton'
 module ApprovalTests
   module Reporters
     class DiffReporter
-      include Singleton
+      def initialize(&block)
+        @launcher = block || self.class.default_launcher
+      end
 
   		def report(approved, received)
-  		   TextWriter.write_file(approved,"")  unless File.exists?(approved)
-        exec "/Applications/DiffMerge.app/Contents/MacOS/DiffMerge --nosplash \"#{received}\" \"#{approved}\""
+        TextWriter.write_file(approved,"")  unless File.exists?(approved)
+        QuietReporter.instance.report(approved, received)
+        launch(approved, received)
       end
       
-      def approved_when_reported()
+      def approved_when_reported
         false 
       end
+
+      protected
+
+      def launch(approved, received)
+        exec @launcher.call(approved, received)
+      end
+
+      def self.default_launcher
+        lambda { |app, rec|
+          "/Applications/DiffMerge.app/Contents/MacOS/DiffMerge --nosplash \"#{rec}\" \"#{app}\""
+        }
+      end
+
     end
   end
-end
+end

data/lib/approval_tests/reporters/file_launcher_reporter.rb

@@ -0,0 +1,14 @@
+
+require 'singleton'
+
+module ApprovalTests
+  module Reporters
+    class FileLauncherReporter < DiffReporter
+      def self.default_launcher
+        lambda { |app, rec|
+          "open #{rec}"
+        }
+      end
+    end
+  end
+end

data/lib/approval_tests/reporters/opendiff_reporter.rb

@@ -0,0 +1,13 @@
+require 'singleton'
+
+module ApprovalTests
+  module Reporters
+    class OpendiffReporter < DiffReporter
+      def self.default_launcher
+        lambda { |app, rec|
+          system("opendiff #{rec} #{app}")
+        }
+      end
+    end
+  end
+end

data/lib/approval_tests/reporters/quiet_reporter.rb

@@ -13,7 +13,7 @@ module ApprovalTests
 			  end
       end
       
-      def approved_when_reported()
+      def approved_when_reported
         false 
       end
     end

data/lib/approval_tests/reporters/rspec_reporter.rb

@@ -0,0 +1,17 @@
+require 'singleton'
+
+module ApprovalTests
+  module Reporters
+    class RspecReporter
+      include Singleton
+
+      def report(app, rec)
+        approved = ""
+        approved = File.read(app) if File.exists?(app)
+        received = File.read(rec)
+        received.should == approved
+      end
+    end
+  end
+end
+

data/lib/approval_tests/reporters/text_mate_reporter.rb

@@ -16,7 +16,7 @@ module ApprovalTests
         puts "<p></p><iframe src='tm-file://#{File.expand_path(received)}' width='100%' frameborder='0' style='border:solid 1px red'></iframe>"
       end
       
-      def approved_when_reported()
+      def approved_when_reported
         false 
       end
     end

data/lib/approval_tests/reporters/tortoisediff_reporter.rb

@@ -0,0 +1,15 @@
+require 'singleton'
+
+module ApprovalTests
+  module Reporters
+    class TortoisediffReporter < DiffReporter
+      TORTOISE_BIN = 'C:\\Program Files\\TortoiseSVN\\bin\\TortoiseMerge.exe'
+      
+      def self.default_launcher
+        lambda { |app, rec|
+          system("#{TORTOISE_BIN} #{rec} #{app}")
+        }
+      end
+    end
+  end
+end

data/lib/approval_tests/reporters/vimdiff_reporter.rb

@@ -0,0 +1,13 @@
+require 'singleton'
+
+module ApprovalTests
+  module Reporters
+    class VimdiffReporter < DiffReporter
+      def self.default_launcher
+        lambda { |app, rec|
+          "echo '#!/bin/sh' > /tmp/reporter.command; echo 'vimdiff #{rec} #{app}' > /tmp/reporter.command; chmod +x /tmp/reporter.command; open /tmp/reporter.command"
+        }
+      end
+    end
+  end
+end

data/lib/approval_tests/utils.rb

@@ -0,0 +1,7 @@
+module ApprovalTests
+  module Utils
+    def self.program_exists(name)
+      system("which #{name}")
+    end
+  end
+end

data/lib/approval_tests/writers.rb

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + '/writers/*_writer.rb'].each {|writer| require writer}

data/lib/approval_tests/writers/html_writer.rb

@@ -17,8 +17,10 @@ module ApprovalTests
         f = File.new("#{received}", "w+")
         f.write(@data)
         f.close()
+        system("xmllint --format --html --output #{f.path} #{f.path}") if Utils.program_exists('xmllint')
         f.path
       end
+
     end
   end
-end
+end

data/spec/approval_tests/approvals_lists_should_write_arrays.approved.txt

@@ -0,0 +1,3 @@
+name[0] = tom 
+name[1] = dick 
+name[2] = harry 

data/spec/approval_tests/approvals_lists_should_write_maps.approved.txt

@@ -0,0 +1 @@
+[age] = 25 

data/spec/approval_tests/approvals_should_approve_shared_behaviors.approved.txt

@@ -0,0 +1 @@
+shared behavior test

data/spec/{approvals_spec.rb → approval_tests/approvals_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require "spec_helper"
 
 shared_examples_for "Shared Behaviors" do
   it "should approve shared behaviors" do
@@ -10,29 +10,29 @@ describe "Approvals" do
   after(:each) do
     Approvals.unregister_last_reporter()
   end
-  
+
   it_should_behave_like "Shared Behaviors"
-  
+
   it "should successfully approve text" do
     Approvals.approve("should be approved")
   end
-  
+
   it "should raise mismatch error if received does not match approved" do
     Approvals.reporter(CleanupReporter.new);
     lambda { Approvals.approve("should fail with mismatch") }.should raise_error(ApprovalError)
   end
-  
+
   it "should raise missing approval error if has not been approved yet" do
     Approvals.reporter(CleanupReporter.new);
     lambda { Approvals.approve("should fail with a missing ") }.should raise_error(ApprovalError)
   end  
-  
+
   describe "Multiple describes" do
     it "should approve multiple describes" do
       Approvals.approve("multiple describes")
     end
   end
-  
+
   describe "lists" do
     it "should write arrays" do
       Approvals.approve_list("name",["tom","dick","harry"])
@@ -44,32 +44,28 @@ describe "Approvals" do
       Approvals.approve_map(:name=> "harry", :age => 25, :sex => "male")
     end
   end
-  
+
   describe "xml" do
     it "should be pretty" do
       Approvals.approve_xml('<?xml version="1.0" encoding="ISO-8859-1"?><data><a><b>Bee</b><c>Sea</c></a></data>')
     end
   end
-  
+
   describe "DiffReporter" do
     it "should launch" do
-      base = "approval_tests/spec/"
-   #   DiffReporter.instance.report("approval_tests/spec/a.txt", "approval_tests/spec/b.txt")    
-   end 
-     it "should create and launch" do
-        base = "approval_tests/spec/"
-        File.delete("#{base}c.txt") if File.exists?("#{base}c.txt")
-   #     DiffReporter.instance.report("#{base}c.txt", "#{base}a.txt")    
-      end
+      base = "approval_tests/spec/approval_tests"
+      #   DiffReporter.instance.report("approval_tests/spec/a.txt", "approval_tests/spec/b.txt")    
+    end 
+    it "should create and launch" do
+      base = "approval_tests/spec/approval_tests"
+      File.delete("#{base}c.txt") if File.exists?("#{base}c.txt")
+      #     DiffReporter.instance.report("#{base}c.txt", "#{base}a.txt")    
+    end
   end
-    
 end
 
-
-
 describe "Approvals", "using approval blocks" do
   approve "the last statement" do
     "approve this"
   end
-  
-end
+end

data/spec/approval_tests/reporter_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe "Reporters" do
+  it "calls the reporters in order" do
+    r1 = DiffReporter.new
+    r2 = DiffReporter.new
+
+    Approvals.reporter(r1)
+    Approvals.get_default_reporter.should == r1
+
+    Approvals.reporter(r2)
+    Approvals.get_default_reporter.should == r2
+
+    Approvals.unregister_last_reporter
+    Approvals.get_default_reporter.should == r1
+  end
+
+  it "one-use reporters" do
+    r1 = DiffReporter.new
+    r2 = DiffReporter.new
+
+    Approvals.reporter(r1)
+    Approvals.get_default_reporter.should == r1
+
+    Approvals.single_use_reporter(r2)
+    Approvals.get_default_reporter.should == r2
+
+    Approvals.get_default_reporter.should == r1
+  end
+
+  it "indecisive single use" do
+    r1 = DiffReporter.new
+    Approvals.single_use_reporter(r1)
+    Approvals.unregister_last_reporter
+    Approvals.single_use_reporter(r1)
+    Approvals.get_default_reporter.should_not be_nil
+  end
+
+  it "one-use reporter, expiration" do
+    r1 = DiffReporter.new
+    r2 = DiffReporter.new
+    r3 = DiffReporter.new
+
+    Approvals.reporter(r1)
+    Approvals.get_default_reporter.should == r1
+
+    Approvals.single_use_reporter(r2)
+    Approvals.single_use_reporter(r3)
+
+    Approvals.get_default_reporter.should == r3
+
+    Approvals.get_default_reporter.should == r1
+  end
+
+end

data/spec/approval_tests/self_example_group_full_description.received.txt

@@ -0,0 +1 @@
+approve this

data/spec/approval_tests/system_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe '#program_exists' do
+  it "should recognize a command that exists" do
+    ApprovalTests::Utils.program_exists('ls').should be_true
+  end
+
+  it "should not recognize weird commands" do
+    ApprovalTests::Utils.program_exists('weirdo-commando').should be_false
+  end
+end

data/spec/spec_helper.rb

@@ -1,18 +1,9 @@
 require 'rubygems'
-require 'spec'
-
-__DIR__ = File.join(File.dirname(__FILE__))
-$LOAD_PATH.unshift __DIR__ unless
-  $LOAD_PATH.include?(__DIR__) ||
-  $LOAD_PATH.include?(File.expand_path(__DIR__))
-
-require 'cleanup_reporter'
-
-__DIR__ = File.join(__DIR__,  "..", "lib")
+require 'rspec'
  
-$LOAD_PATH.unshift __DIR__ unless
-  $LOAD_PATH.include?(__DIR__) ||
-  $LOAD_PATH.include?(File.expand_path(__DIR__))
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__))  
 
 require 'approval_tests'
+
 include ApprovalTests

metadata

@@ -1,86 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: approval_tests
-version: !ruby/object:Gem::Version 
-  version: 0.0.8
+version: !ruby/object:Gem::Version
+  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Dan Gilkerson, Llewellyn Falco
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-07-03 00:00:00 -07:00
-default_executable: 
+date: 2009-07-03 00:00:00.000000000 Z
 dependencies: []
-
 description: Approval testing library for ruby
 email: approvaltests@dangilkerson.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
+- Gemfile
+- Gemfile.lock
 - README
 - Rakefile
 - VERSION
 - approval_tests.gemspec
+- cucumber.yml
+- features/.approved.txt
+- features/.received.txt
+- features/basic_approval.approves_string.approved.txt
+- features/basic_approval.feature
+- features/basic_approval_approves_string.approved.txt
+- features/step_definitions/basic_steps.rb
+- features/support/env.rb
+- features/support/paths.rb
 - lib/approval_tests.rb
 - lib/approval_tests/approvals.rb
+- lib/approval_tests/approvers.rb
 - lib/approval_tests/approvers/file_approver.rb
+- lib/approval_tests/extensions/cucumber.rb
 - lib/approval_tests/extensions/rspec.rb
+- lib/approval_tests/namers.rb
+- lib/approval_tests/namers/cucumber_namer.rb
 - lib/approval_tests/namers/rspec_namer.rb
+- lib/approval_tests/reporters.rb
+- lib/approval_tests/reporters/cleanup_reporter.rb
 - lib/approval_tests/reporters/diff_reporter.rb
+- lib/approval_tests/reporters/file_launcher_reporter.rb
+- lib/approval_tests/reporters/opendiff_reporter.rb
 - lib/approval_tests/reporters/quiet_reporter.rb
+- lib/approval_tests/reporters/rspec_reporter.rb
 - lib/approval_tests/reporters/text_mate_reporter.rb
+- lib/approval_tests/reporters/tortoisediff_reporter.rb
+- lib/approval_tests/reporters/vimdiff_reporter.rb
+- lib/approval_tests/utils.rb
+- lib/approval_tests/writers.rb
 - lib/approval_tests/writers/html_writer.rb
 - lib/approval_tests/writers/text_writer.rb
 - lib/approval_tests/writers/xml_writer.rb
-- spec/a.txt
-- spec/approvals_lists_should_show_empty_lists.approved.txt
-- spec/approvals_lists_should_write_arrays.approved.txt
-- spec/approvals_lists_should_write_maps.approved.txt
-- spec/approvals_multiple_describes_should_approve_multiple_describes.approved.txt
-- spec/approvals_should_approve_shared_behaviors.approved.txt
-- spec/approvals_should_successfully_approve_text.approved.txt
-- spec/approvals_spec.rb
-- spec/approvals_using_approval_blocks.approved.txt
-- spec/approvals_using_approval_blocks_the_last_statement.approved.txt
-- spec/approvals_xml_should_be_pretty.approved.txt
-- spec/b.txt
-- spec/cleanup_reporter.rb
-- spec/spec.opts
+- spec/approval_tests/a.txt
+- spec/approval_tests/approvals_it_should_behave_like_shared_behaviors_should_approve_shared_behaviors.approved.txt
+- spec/approval_tests/approvals_lists_should_show_empty_lists.approved.txt
+- spec/approval_tests/approvals_lists_should_write_arrays.approved.txt
+- spec/approval_tests/approvals_lists_should_write_maps.approved.txt
+- spec/approval_tests/approvals_multiple_describes_should_approve_multiple_describes.approved.txt
+- spec/approval_tests/approvals_should_approve_shared_behaviors.approved.txt
+- spec/approval_tests/approvals_should_successfully_approve_text.approved.txt
+- spec/approval_tests/approvals_spec.rb
+- spec/approval_tests/approvals_using_approval_blocks.approved.txt
+- spec/approval_tests/approvals_using_approval_blocks_the_last_statement.approved.txt
+- spec/approval_tests/approvals_xml_should_be_pretty.approved.txt
+- spec/approval_tests/b.txt
+- spec/approval_tests/reporter_spec.rb
+- spec/approval_tests/self_example_group_full_description.received.txt
+- spec/approval_tests/system_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/approvaltests/approval_tests
+homepage: http://github.com/approvals/approval_tests
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: approvaltests
-rubygems_version: 1.3.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Approval testing library
-test_files: 
-- spec/approvals_spec.rb
-- spec/cleanup_reporter.rb
-- spec/spec_helper.rb
+test_files: []
+has_rdoc: 

data/spec/approvals_lists_should_write_arrays.approved.txt

@@ -1 +0,0 @@
-name[0] = tom 

data/spec/approvals_lists_should_write_maps.approved.txt

@@ -1 +0,0 @@
-[name] = harry