RubyGems - rspec-approvals - Versions diffs - 0.0.4 → 0.0.5 - Mend

rspec-approvals 0.0.4 → 0.0.5

Files changed (24) hide show

data/.gitignore +2 -0
data/README.md +21 -16
data/bin/approvals +10 -0
data/lib/rspec/approvals.rb +9 -2
data/lib/rspec/approvals/approval.rb +43 -76
data/lib/rspec/approvals/cli.rb +30 -0
data/lib/rspec/approvals/dotfile.rb +40 -0
data/lib/rspec/approvals/dsl.rb +3 -2
data/lib/rspec/approvals/empty_approval.rb +12 -0
data/lib/rspec/approvals/executable.rb +16 -0
data/lib/rspec/approvals/formatter.rb +58 -0
data/lib/rspec/approvals/version.rb +1 -1
data/rspec-approvals.gemspec +2 -1
data/spec/approval_spec.rb +54 -119
data/spec/approvals/fairy_dust_and_unicorns.approved.txt +1 -0
data/spec/approvals/{rspec_approvals_a_complex_object.approved.txt → rspec_approvals_a_complex_object_with_implicit_inspect.approved.txt} +0 -0
data/spec/approvals/rspec_approvals_an_executable.approved.txt +1 -0
data/spec/approvals/rspec_approvals_formats_json_nicely.approved.txt +3 -0
data/spec/approvals_spec.rb +21 -11
data/spec/dotfile_spec.rb +22 -0
data/spec/executable_spec.rb +15 -0
metadata +64 -65
data/lib/rspec/approvals/formatters/opendiff_formatter.rb +0 -22
data/spec/spec_helper.rb +0 -2

data/.gitignore CHANGED

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+*.received.txt
+.approvals

data/README.md CHANGED

@@ -31,7 +31,7 @@ You can change this using the configuration option
 The basic format of the approval is modeled after RSpec's `it`:
-    approve "something" do
+    verify "something" do
       "this is the received contents"
     end
@@ -56,14 +56,18 @@ The contents of the two files are compared, and the approval will fail at this p
 ### Formatting
 You can pass options to format output before it gets written to the file.
-At the moment, only xml and html are supported.
+At the moment, only xml, html, and json are supported.
-Simply add a `:format => :xml` or `:format => :html` option to the example:
+Simply add a `:format => :xml`, `:format => :html`, or `:format => :json` option to the example:
-    approve "some html", :format => :html do
+    verify "some html", :format => :html do
       "<html><head></head><body><h1>ZOMG</h1></body></html>"
     end
+    verify "some json", :format => :json do
+      {"beverage" => "coffee"}.to_json
+    end
 ### Approving a spec
@@ -76,22 +80,23 @@ For an example who's full description is `My Spec`:
 When you rerun the spec, it should now pass.
-### Formatters
-You can specify a custom formatter when you run the specs.
+### Expensive computations
-E.g.
+The Executable class allows you to perform expensive operations only when the command to execute it changes.
-    rspec --require /path/to/lib/rspec/approvals/formatters/opendiff_formatter.rb \
-    -f RSpec::Approvals::Formatters::OpendiffFormatter spec/
+For example, if you have a SQL query that is very slow, you can create an executable with the actual SQL to be performed.
-The OpendiffFormatter automatically launches opendiff for each failed
-approval. It falls back on the ProgressFormatter for all non-approval
-specs.
-That's pretty unweildy, so I'm looking at options to add shortcuts for
-this.
+The first time the spec runs, it will fail, allowing you to inspect the results.
+If this output looks right, approve the query. The next time the spec is run, it will compare only the actual SQL.
+If someone changes the query, then the comparison will fail. Both the previously approved command and the received command will be executed so that you can inspect the difference between the results of the two.
+    verify "an executable" do
+      sql = subject.expensive_sql # the actual sql as a string
+      RSpec::Approvals::Executable.new(sql) do |command|
+         result = ActiveRecord::Base.connection.execute(command)
+         # do something to display the result
+      end
+    end
 Copyright (c) 2011 Katrina Owen, released under the MIT license

data/bin/approvals ADDED

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'thor'
+require 'rspec'
+require 'rspec-approvals'
+require 'rspec/approvals/cli'
+RSpec::Approvals::CLI.start

data/lib/rspec/approvals.rb CHANGED

@@ -3,13 +3,15 @@ require 'xml'
 require "rspec/approvals/version"
 require "rspec/approvals/approval"
 require "rspec/approvals/dsl"
-require 'rspec/approvals/formatters/opendiff_formatter'
+require 'rspec/approvals/dotfile'
+require 'rspec/approvals/formatter'
+require 'rspec/approvals/executable'
 module RSpec
   RSpec.configure do |c|
     c.extend RSpec::Approvals::DSL
     c.add_setting :approvals_path, :default => 'spec/approvals'
+    c.before(:suite) { RSpec::Approvals.reset }
   end
   module Approvals
@@ -22,6 +24,11 @@ module RSpec
       def path
         RSpec.configuration.approvals_path + "/"
       end
+      def reset
+        Dotfile.reset
+      end
     end
   end

data/lib/rspec/approvals/approval.rb CHANGED

@@ -1,41 +1,37 @@
 require 'rspec/expectations/errors'
+require 'rspec/approvals/empty_approval'
 module RSpec
   module Approvals
     class ReceivedDiffersError < RSpec::Expectations::ExpectationNotMetError; end
-    class EmptyApproval
-      def inspect
-        ""
-      end
-      def strip; end
-    end
     class Approval
-      def self.normalize(s)
-        s.gsub(/[\W]/, ' ').strip.squeeze(" ").gsub(' ', '_').downcase
-      end
-      def self.base_path(s)
-        Approvals.path + normalize(s)
+      class << self
+        def normalize(s)
+          s.gsub(/[\W]/, ' ').strip.squeeze(" ").gsub(' ', '_').downcase
+        end
       end
-      attr_reader :location
+      attr_reader :location, :name, :options, :path, :received
       def initialize(example, received = '', options = {})
-        @path = Approval.base_path(example.full_description)
+        @name = Approval.normalize(example.full_description)
+        @path = Approvals.path + name
         @options = options
+        @received = received
+        @formatter = Formatter.new(self)
         example.options[:approval] = true
         example.options[:approval_diff_paths] = {
           :received => received_path,
           :approved => approved_path,
         }
+      end
-        write(:approved, EmptyApproval.new) unless File.exists?(approved_path)
-        write(:received, received)
+      def location=(backtrace)
+        @location = [backtrace.first.gsub(Dir.pwd, '.').gsub(/:in\ .*$/, '')]
       end
       def approved_path
@@ -46,82 +42,53 @@ module RSpec
         "#{@path}.received.txt"
       end
-      def write(suffix, contents)
-        File.open("#{@path}.#{suffix}.txt", 'w') do |f|
-          if xml?
-            parser = XML::Parser.string contents.strip
-            doc = parser.parse
-            f.write doc.to_s
-          elsif contents.respond_to?(:each_pair)
-            contents.each_pair do |k,v|
-              f.write "#{k.inspect} => #{v.inspect}\n"
-            end
-          elsif contents.respond_to?(:each_with_index)
-            contents.each_with_index do |v,i|
-              f.write "[#{i.inspect}] #{v.inspect}\n"
-            end
-          else
-            f.write contents.inspect
+      def diff_path
+        "#{received_path} #{approved_path}"
+      end
+      def approved_text
+        if File.exists?(approved_path)
+          File.read(approved_path)
+        else
+          EmptyApproval.new.inspect
+        end
+      end
+      def received_text
+        @received_text ||= Formatter.new(self).as_s(received)
+      end
+      def verify
+        unless received_text == approved_text
+          write(received_path, received_text)
+          Dotfile.append(diff_path)
+          if received.respond_to?(:on_failure)
+            received.on_failure.call(approved_text)
+            received.on_failure.call(received_text)
           end
+          raise RSpec::Approvals::ReceivedDiffersError, failure_message, location
         end
       end
-      def failure_message
-        return failure_message_exposing_received if show_received?
-        return default_failure_message
+      def write(path, contents)
+        File.open(path, 'w') do |f|
+          f.write contents
+        end
       end
-      def default_failure_message
+      def failure_message
         <<-FAILURE_MESSAGE
         Approval Failure:
-        The received contents did not match the approved contents.
+          The received contents did not match the approved contents.
         Inspect the differences in the following files:
         #{received_path}
         #{approved_path}
-        If you like what you see in the *.received.txt file, you can approve it
-        by renaming it with the .approved.txt suffix.
-        mv #{received_path} #{approved_path}
         FAILURE_MESSAGE
       end
-      def failure_message_exposing_received
-        default_failure_message << "        received:\n        " << received << "\n\n\n"
-      end
-      def location=(backtrace)
-        @location = [backtrace.first.gsub(Dir.pwd, '.')]
-      end
-      def verify
-        if FileUtils.cmp(received_path, approved_path)
-          File.unlink(received_path)
-        else
-          raise RSpec::Approvals::ReceivedDiffersError, failure_message, location
-        end
-      end
-      def approved
-        File.read(approved_path)
-      end
-      def received
-        File.read(received_path)
-      end
-      def xml?
-        [:xml, :html].include? @options[:format]
-      end
-      def show_received?
-        @options[:show_received]
-      end
     end
   end
 end

data/lib/rspec/approvals/cli.rb ADDED

@@ -0,0 +1,30 @@
+module RSpec
+  module Approvals
+    class CLI < Thor
+      desc "verify", "Go through all failing approvals with a diff tool"
+      method_option :diff, :type => :string, :default => 'vimdiff', :aliases => '-d', :desc => 'The difftool to use'
+      method_option :ask, :type => :boolean, :default => false, :aliases => "-a", :desc => 'Offer to approve the received file for you.'
+      def verify
+        approvals = File.read('.approvals').split("\n")
+        rejected = []
+        approvals.each do |approval|
+          system("#{options[:diff]} #{approval}")
+          if options[:ask] && yes?("Approve?")
+              system("mv #{approval}")
+          else
+            rejected << approval
+          end
+        end
+        File.open('.approvals', 'w') do |f|
+          f.write rejected.join("\n")
+        end
+      end
+    end
+  end
+end

data/lib/rspec/approvals/dotfile.rb ADDED

@@ -0,0 +1,40 @@
+module RSpec
+  module Approvals
+    class Dotfile
+      class << self
+        def reset
+          File.delete(path) if File.exists?(path)
+          touch
+        end
+        def path
+          '.approvals'
+        end
+        def touch
+          FileUtils.touch(path)
+        end
+        def append(text)
+          unless includes?(text)
+            write text
+          end
+        end
+        def includes?(text)
+          system("cat #{path} | grep -q \"^#{text}$\"")
+        end
+        def write(text)
+          File.open(path, 'a+') do |f|
+            f.write "#{text}\n"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/approvals/dsl.rb CHANGED

@@ -4,15 +4,16 @@ module RSpec
   module Approvals
     module DSL
-      def approve(description, options = {})
+      def verify(description, options = {})
+        origin = caller
         specify(description) do
           approval = Approval.new(example, yield, options)
           # We may be able to set file_path and
           # line_number on example in the approval
           # see RSpec::Core::Metadata::LocationKeys
-          approval.location = caller
+          approval.location = origin
           approval.verify
         end

data/lib/rspec/approvals/empty_approval.rb ADDED

@@ -0,0 +1,12 @@
+module RSpec
+  module Approvals
+    class EmptyApproval
+      def inspect
+        ""
+      end
+      def strip; end
+    end
+  end
+end

data/lib/rspec/approvals/executable.rb ADDED

@@ -0,0 +1,16 @@
+module RSpec
+  module Approvals
+    class Executable
+      attr_accessor :command, :on_failure
+      def initialize(command, &block)
+        self.command = command
+        self.on_failure = block
+      end
+      def to_s
+        command
+      end
+    end
+  end
+end

data/lib/rspec/approvals/formatter.rb ADDED

@@ -0,0 +1,58 @@
+module RSpec
+  module Approvals
+    class Formatter
+      attr_accessor :approval
+      def initialize(approval)
+        self.approval = approval
+      end
+      def as_s(contents)
+        if xml?
+          as_xml(contents)
+        elsif json?
+          as_json(contents)
+        elsif contents.respond_to?(:each_pair)
+          as_hash(contents)
+        elsif contents.respond_to?(:each_with_index)
+          as_array(contents)
+        else
+          contents.inspect
+        end
+      end
+      def xml?
+        [:xml, :html].include? approval.options[:format]
+      end
+      def json?
+        approval.options[:format] == :json
+      end
+      def as_json(contents)
+        JSON.pretty_generate(JSON.parse(contents))
+      end
+      def as_xml(contents)
+        parser = XML::Parser.string contents.strip
+        parser.parse.to_s
+      end
+      def as_hash(contents)
+        s = ""
+        contents.each_pair do |k,v|
+          s << "#{k.inspect} => #{v.inspect}\n"
+        end
+        s
+      end
+      def as_array(contents)
+        s = ""
+        contents.each_with_index do |v,i|
+          s << "[#{i.inspect}] #{v.inspect}\n"
+        end
+        s
+      end
+    end
+  end
+end

data/lib/rspec/approvals/version.rb CHANGED

@@ -1,5 +1,5 @@
 module RSpec
   module Approvals
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/rspec-approvals.gemspec CHANGED

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency 'rspec', '~> 2.6'
+  s.add_dependency 'rspec', '~> 2.7'
+  s.add_dependency 'thor'
   s.add_dependency 'libxml-ruby'
 end

data/spec/approval_spec.rb CHANGED

@@ -1,28 +1,27 @@
-require 'spec_helper'
+require 'rspec/approvals'
-describe Approvals::Approval do
-  let(:description) { 'spec/approvals/fairy_dust_and_unicorns' }
-  let(:example) { stub('example', :full_description => 'fairy dust and unicorns').as_null_object }
+describe RSpec::Approvals::Approval do
+  include RSpec::Approvals
   describe "#normalize" do
     it "downcases" do
-      Approvals::Approval.normalize("KTHXBYE").should eq("kthxbye")
+      Approval.normalize("KTHXBYE").should eq("kthxbye")
     end
     it "replaces spaces with underscores" do
-      Approvals::Approval.normalize("the spec").should eq("the_spec")
+      Approval.normalize("the spec").should eq("the_spec")
     end
     it "leaves numbers alone" do
-      Approvals::Approval.normalize('a 2009 party').should eq("a_2009_party")
+      Approval.normalize('a 2009 party').should eq("a_2009_party")
     end
     it "deletes funky characters" do
-      Approvals::Approval.normalize('the !@\#$%^&*(){}+| name').should eq("the_name")
+      Approval.normalize('the !@\#$%^&*(){}+| name').should eq("the_name")
     end
     it "collapses spaces before replacing with underscores" do
-      Approvals::Approval.normalize('omf             g').should eq('omf_g')
+      Approval.normalize('omf             g').should eq('omf_g')
     end
     it "deletes all sorts of spaces" do
@@ -30,152 +29,88 @@ describe Approvals::Approval do
 The::Class       \t \r\n \fname
       FUNKY_NAME
-      Approvals::Approval.normalize(name).should eq('the_class_name')
+      Approval.normalize(name).should eq('the_class_name')
     end
   end
-  it "knows the approved_path" do
-    approval = Approvals::Approval.new(example)
-    approval.approved_path.should eq("#{description}.approved.txt")
-  end
-  it "knows the received path" do
-    approval = Approvals::Approval.new(example)
-    approval.received_path.should eq("#{description}.received.txt")
-  end
+  let(:example) { stub('example', :full_description => 'fairy dust and unicorns').as_null_object }
-  it "can set a location" do
-    Dir.stub(:pwd => 'the/path')
-    approval = Approvals::Approval.new(example)
-    approval.location = ['the/path/to/my/heart:9372 <is through my stomach>', 'bla bla bla']
-    approval.location.should eq(['./to/my/heart:9372 <is through my stomach>'])
-  end
+  describe "an approval" do
+    let(:path) { 'spec/approvals/fairy_dust_and_unicorns' }
+    subject { Approval.new(example) }
-  context "approvals" do
-    before :each do
-      @approved_file = "#{description}.approved.txt"
-      @received_file = "#{description}.received.txt"
-    end
+    its(:approved_path) { should eq("#{path}.approved.txt") }
+    its(:received_path) { should eq("#{path}.received.txt") }
-    after :each do
-      File.delete(@approved_file) if File.exists?(@approved_file)
-      File.delete(@received_file) if File.exists?(@received_file)
+    it "can set a location" do
+      Dir.stub(:pwd => 'the/path')
+      subject.location = ['the/path/to/my/heart:9372:in <is through my stomach>', 'bla bla bla']
+      subject.location.should eq(['./to/my/heart:9372'])
     end
+  end
-    describe "on the filesystem" do
-      it "writes the approved file if it doesn't exist" do
-        File.delete(@approved_file) if File.exists?(@approved_file)
-        Approvals::Approval.new(example)
+  describe "verification" do
+    let(:approval) { Approval.new(example, 'xyz') }
-        File.exists?(@approved_file).should be_true
-        File.read(@approved_file).should eq('')
+    context "with a match" do
+      before :each do
+        approval.stub(:approved_text => 'xyz', :received_text => 'xyz')
       end
-      it "doesn't overwrite an existing approved file" do
-        File.open(@approved_file, 'w') do |f|
-          f.write "this doesn't get deleted"
-        end
-        Approvals::Approval.new(example)
-        File.exists?(@approved_file).should be_true
-        File.read(@approved_file).should eq("this doesn't get deleted")
+      it "does not raise an error" do
+        lambda { approval.verify }.should_not raise_error(RSpec::Approvals::ReceivedDiffersError)
       end
-      it "writes the received contents to file" do
-        approval = Approvals::Approval.new(example, 'oooh, shiney!')
-        File.exists?(@received_file).should be_true
-        File.read(@received_file).should eq('"oooh, shiney!"')
+      it "does not leave a received file" do
+        lambda { approval.verify }.call
+        File.exists?(approval.received_path).should be_false
       end
     end
-    describe "verification" do
-      context "with a match" do
-        before :each do
-          @approval = Approvals::Approval.new(example, 'xyz')
-          @approval.write(:approved, 'xyz')
-        end
+    context "with a mismatch" do
+      before :each do
+        approval.stub(:approved_text => 'xyz', :received_text => 'abc')
+      end
-        it "does not raise an error" do
-          lambda { @approval.verify }.should_not raise_error(RSpec::Approvals::ReceivedDiffersError)
-        end
+      after :each do
+        File.delete(approval.received_path) if File.exists?(approval.received_path)
+      end
-        it "does not leave a received file" do
-          lambda { @approval.verify }.call
-          File.exists?(@approval.received_path).should be_false
-        end
+      it "raises an error" do
+        lambda { approval.verify }.should raise_error(RSpec::Approvals::ReceivedDiffersError)
       end
-      context "with a mismatch" do
-        before :each do
-          @approval = Approvals::Approval.new(example, 'xyz')
-          @approval.write(:approved, 'abc')
+      it "leaves a received file" do
+        begin
+          approval.verify
+        rescue RSpec::Approvals::ReceivedDiffersError => e
+          # we want to land here and then move on
         end
+        File.exists?(approval.received_path).should be_true
+      end
-        it "raises an error" do
-          lambda { @approval.verify }.should raise_error(RSpec::Approvals::ReceivedDiffersError)
-        end
+      it "appends to the dotfile" do
+        approval.stub(:diff_path => 'the diff path')
+        Dotfile.should_receive(:append).with "the diff path"
-        it "leaves a received file" do
-          begin
-            @approval.verify
-          rescue RSpec::Approvals::ReceivedDiffersError => e
-            # we want to land here and then move on
-          end
-          File.exists?(@approval.received_path).should be_true
+        begin
+          approval.verify
+        rescue RSpec::Approvals::ReceivedDiffersError => e
+          # moving on
         end
       end
     end
     it "fails magnificently" do
-      approval = Approvals::Approval.new(example, 'xyz')
       message = <<-FAILURE_MESSAGE
         Approval Failure:
-        The received contents did not match the approved contents.
+          The received contents did not match the approved contents.
         Inspect the differences in the following files:
         #{approval.received_path}
         #{approval.approved_path}
-        If you like what you see in the *.received.txt file, you can approve it
-        by renaming it with the .approved.txt suffix.
-        mv #{approval.received_path} #{approval.approved_path}
-      FAILURE_MESSAGE
-      approval.failure_message.should eq(message)
-    end
-    it "fails with exposed 'received'" do
-      approval = Approvals::Approval.new(example, 'aoeu', :show_received => true)
-      message = <<-FAILURE_MESSAGE
-        Approval Failure:
-        The received contents did not match the approved contents.
-        Inspect the differences in the following files:
-        #{approval.received_path}
-        #{approval.approved_path}
-        If you like what you see in the *.received.txt file, you can approve it
-        by renaming it with the .approved.txt suffix.
-        mv #{approval.received_path} #{approval.approved_path}
-        received:
-        #{approval.received}
       FAILURE_MESSAGE
       approval.failure_message.should eq(message)

data/spec/approvals/fairy_dust_and_unicorns.approved.txt ADDED

	@@ -0,0 +1 @@
1	+ "abc"

data/spec/approvals/{rspec_approvals_a_complex_object.approved.txt → rspec_approvals_a_complex_object_with_implicit_inspect.approved.txt} RENAMED

File without changes

data/spec/approvals/rspec_approvals_an_executable.approved.txt ADDED

	@@ -0,0 +1 @@
1	+ SELECT 1

data/spec/approvals/rspec_approvals_formats_json_nicely.approved.txt ADDED

@@ -0,0 +1,3 @@
+{
+  "hello": "world"
+}

data/spec/approvals_spec.rb CHANGED

@@ -1,6 +1,8 @@
-require 'spec_helper'
+require 'rspec/approvals'
+require 'json'
-describe Approvals do
+describe RSpec::Approvals do
+  include RSpec
   it "defaults the output dir to spec/approvals" do
     RSpec.configuration.approvals_path.should == 'spec/approvals'
@@ -24,13 +26,11 @@ describe Approvals do
     end
   end
-  it "needs to be able to run with :filtered => true"
-  approve "a string" do
+  verify "a string" do
     "We have, I fear, confused power with greatness."
   end
-  approve "a hash" do
+  verify "a hash" do
     {
       :universe => {
         :side => :dark,
@@ -41,7 +41,7 @@ describe Approvals do
     }
   end
-  approve "an array" do
+  verify "an array" do
     [
       "abc",
       123,
@@ -50,7 +50,7 @@ describe Approvals do
     ]
   end
-  approve "a complex object" do
+  verify "a complex object with implicit #inspect" do
     hello = Object.new
     def hello.to_s
       "Hello, World!"
@@ -60,17 +60,27 @@ describe Approvals do
       "#<The World Says: Hello!>"
     end
-    hello # => output matches hello.inspect
+    hello
   end
-  approve "formats html nicely", :format => :html, :show_received => true do
+  verify "formats html nicely", :format => :html do
     <<-XML
     <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>blog</title><script type="text/javascript" src="/blog/static/jquery-1.1.3.pack.js"></script><script type="text/javascript" src="/blog/static/blog.js"></script><link type="text/css" rel="stylesheet" href="/blog/styles.css" media="screen"/></head><body><h1 class="header"><a href="/blog/">blog</a></h1><div class="content"><h1 class="post_head"><a href="/blog/view/2">Hej</a><a class="edit_link" href="/blog/edit/2">edit</a></h1><p>ASDJlksdjfsld
     </p><h2 class="comment_head"><a href="javascript:getComments(2)">See comments (2)</a></h2><div id="comments"><h3>tyysen</h3><p>miljoooner</p><h3>hej</h3><p>bulan</p></div><h2 class="add_comment_head"><a href="#comment_form">Add comment</a></h2><form method="post" name="comment_form" id="comment_form" action="/blog/comment"><label for="post_username">Name</label><br/><input type="text" name="post_username"/><br/><label for="post_body">Comment</label><br/><textarea name="post_body"></textarea><br/><input type="hidden" name="post_id" value="2"/><input type="submit" value="Add comment"/></form></div></body></html>
     XML
   end
-  approve "formats xml nicely", :format => :xml, :show_received => true do
+  verify "formats xml nicely", :format => :xml, do
     "<xml testsdf=\"dsfsdf\"><test/><node><content attr='fgsd' /></node><node id='2'><content /></node></xml>"
   end
+  verify "formats json nicely", :format => :json do
+    {"hello" => "world"}.to_json
+  end
+  verify "an executable" do
+    executable = RSpec::Approvals::Executable.new('SELECT 1') do |command|
+      puts "your slip is showing (#{command})"
+    end
+  end
 end

data/spec/dotfile_spec.rb ADDED

@@ -0,0 +1,22 @@
+require 'rspec/approvals/dotfile'
+describe RSpec::Approvals::Dotfile do
+  include RSpec::Approvals
+  let(:dotfile) { '/tmp/.approvals' }
+  before(:each) do
+    Dotfile.stub(:path => dotfile)
+    Dotfile.reset
+  end
+  it "appends the text" do
+    Dotfile.append('text')
+    File.readlines(dotfile).map(&:chomp).should eq(['text'])
+  end
+  it "appends the text exactly once" do
+    Dotfile.append('text')
+    Dotfile.append('text')
+    File.readlines(dotfile).map(&:chomp).should eq(['text'])
+  end
+end

data/spec/executable_spec.rb ADDED

@@ -0,0 +1,15 @@
+require 'rspec/approvals/executable'
+describe RSpec::Approvals::Executable do
+  include RSpec::Approvals
+  subject { Executable.new('SELECT 1') }
+  its(:inspect) { should eq('SELECT 1') }
+  it "takes a block" do
+    executable = Executable.new('SELECT 1') do |command|
+      "execute query: #{command}"
+    end
+    executable.on_failure.call('SELECT 1').should eq('execute query: SELECT 1')
+  end
+end

metadata CHANGED

@@ -1,111 +1,110 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: rspec-approvals
-version: !ruby/object:Gem::Version
-  prerelease: false
-  segments:
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.5
+  prerelease:
 platform: ruby
-authors:
+authors:
 - Katrina Owen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00 +02:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2012-02-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
+  requirement: &70165236704760 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70165236704760
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70165236701340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: libxml-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
+  version_requirements: *70165236701340
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: &70165236698420 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: An RSpec extension that adds support for approvals. Based on the idea of the Golden Master.
-email:
+  prerelease: false
+  version_requirements: *70165236698420
+description: An RSpec extension that adds support for approvals. Based on the idea
+  of the Golden Master.
+email:
 - katrina.owen@gmail.com
-executables: []
+executables:
+- approvals
 extensions: []
 extra_rdoc_files: []
-files:
+files:
 - .gitignore
 - Gemfile
 - License.txt
 - README.md
 - Rakefile
+- bin/approvals
 - lib/rspec-approvals.rb
 - lib/rspec/approvals.rb
 - lib/rspec/approvals/approval.rb
+- lib/rspec/approvals/cli.rb
+- lib/rspec/approvals/dotfile.rb
 - lib/rspec/approvals/dsl.rb
-- lib/rspec/approvals/formatters/opendiff_formatter.rb
+- lib/rspec/approvals/empty_approval.rb
+- lib/rspec/approvals/executable.rb
+- lib/rspec/approvals/formatter.rb
 - lib/rspec/approvals/version.rb
 - rspec-approvals.gemspec
 - spec/approval_spec.rb
-- spec/approvals/rspec_approvals_a_complex_object.approved.txt
+- spec/approvals/fairy_dust_and_unicorns.approved.txt
+- spec/approvals/rspec_approvals_a_complex_object_with_implicit_inspect.approved.txt
 - spec/approvals/rspec_approvals_a_hash.approved.txt
 - spec/approvals/rspec_approvals_a_string.approved.txt
 - spec/approvals/rspec_approvals_an_array.approved.txt
+- spec/approvals/rspec_approvals_an_executable.approved.txt
 - spec/approvals/rspec_approvals_formats_html_nicely.approved.txt
+- spec/approvals/rspec_approvals_formats_json_nicely.approved.txt
 - spec/approvals/rspec_approvals_formats_xml_nicely.approved.txt
 - spec/approvals_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+- spec/dotfile_spec.rb
+- spec/executable_spec.rb
+homepage: ''
 licenses: []
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project: rspec-approvals
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: Approval Tests for Ruby
 test_files: []

data/lib/rspec/approvals/formatters/opendiff_formatter.rb DELETED

@@ -1,22 +0,0 @@
-require 'rspec/core/formatters/progress_formatter'
-module RSpec
-  module Approvals
-    module Formatters
-      class OpendiffFormatter < RSpec::Core::Formatters::ProgressFormatter
-        def dump_failures
-          super
-          failed_examples.each do |example|
-            if example.options[:approval]
-              paths = example.options[:approval_diff_paths]
-              system("opendiff #{paths[:received]} #{paths[:approved]} &")
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/spec/spec_helper.rb DELETED

	@@ -1,2 +0,0 @@
1	- require 'rspec/approvals'
2	- include RSpec