approvals 0.0.1 → 0.0.2

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 1.9.2
+  - 1.9.3
 script: bundle exec rspec spec

data/README.md

@@ -14,7 +14,7 @@ See [ApprovalTests](http://www.approvaltests.com) for videos and additional docu
 Also, check out  Herding Code's [podcast #117](http://t.co/GLn88R5) in
 which Llewellyn Falco is interviewed about approvals.
 
-[![Build Status](https://secure.travis-ci.org/kytrinyx/rspec-approvals.png?branch=master)](http://travis-ci.org/kytrinyx/rspec-approvals)
+[![Build Status](https://secure.travis-ci.org/kytrinyx/approvals.png?branch=master)](http://travis-ci.org/kytrinyx/approvals)
 
 ## Configuration
 
@@ -32,14 +32,12 @@ The default location for the output files is
 
 This will raise an `ApprovalError` in the case of a failure.
 
-The `:inspect` method on the subject will be used to generate the output for
+The default writer uses the `:to_s` method on the subject will be used to generate the output for
 the `received` file. For custom complex objects you will need to override
-`:to_s` or `:inspect` to get helpful output, rather than the default:
+`:to_s` to get helpful output, rather than the default:
 
     #<Object:0x0000010105ea40> # or whatever the object id is
 
-Note: `:inspect` uses `:to_s` unless it has been specifically defined to do something else.
-
 The first time the approval is run, a file will be created with the contents of the subject of your approval:
 
     the_name_of_the_approval.received.txt # or .json, .html, .xml as appropriate

data/TODO

@@ -1,2 +1 @@
-[ ] add default namer
-    Approvals.verify(something, :name => 'the name of this test')
+[ ] add cucumber support (namer + extension + features)

data/approvals.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "approvals"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Katrina Owen"]
   s.email       = ["katrina.owen@gmail.com"]
   s.homepage    = ""

data/bin/approvals

@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'thor'
-require 'approvals'
 require 'approvals/utilities/cli'
 
 Approvals::CLI.start

data/lib/approvals.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'nokogiri'
 require 'approvals/configuration'
 require 'approvals/approval'

data/lib/approvals/approval.rb

@@ -56,13 +56,15 @@ module Approvals
     end
 
     def fail_with(message)
+      FileUtils.touch(approved_path) unless File.exists? approved_path
+
+      Dotfile.append(diff_path)
+
       if subject.respond_to?(:on_failure)
         subject.on_failure.call(approved_text) if approved?
         subject.on_failure.call(received_text)
       end
 
-      Dotfile.append(diff_path)
-
       raise ApprovalError.new("Approval Error: #{message}")
     end
 

data/lib/approvals/configuration.rb

@@ -18,7 +18,7 @@ module Approvals
     attr_writer :approvals_path
 
     def approvals_path
-      @approvals_path ||= 'approvals/'
+      @approvals_path ||= 'fixtures/approvals/'
     end
   end
 end

data/lib/approvals/reporters.rb

@@ -1,3 +1,14 @@
 require 'singleton'
 require 'approvals/reporters/first_working_reporter'
+
 require 'approvals/reporters/image_reporter'
+require 'approvals/reporters/image_reporter/image_magick_reporter'
+require 'approvals/reporters/image_reporter/html_image_reporter'
+
+require 'approvals/reporters/launcher'
+require 'approvals/reporters/reporter'
+require 'approvals/reporters/diff_reporter/opendiff_reporter'
+require 'approvals/reporters/diff_reporter/vimdiff_reporter'
+require 'approvals/reporters/diff_reporter/diffmerge_reporter'
+require 'approvals/reporters/diff_reporter/tortoisediff_reporter'
+require 'approvals/reporters/filelauncher_reporter'

data/lib/approvals/reporters/diff_reporter/diffmerge_reporter.rb

@@ -0,0 +1,18 @@
+module Approvals
+  module Reporters
+    class DiffmergeReporter < Reporter
+      include Singleton
+
+      class << self
+        def report(received, approved)
+          self.instance.report(received, approved)
+        end
+      end
+
+      def default_launcher
+        Launcher.diffmerge
+      end
+
+    end
+  end
+end

data/lib/approvals/reporters/diff_reporter/opendiff_reporter.rb

@@ -0,0 +1,18 @@
+module Approvals
+  module Reporters
+    class OpendiffReporter < Reporter
+      include Singleton
+
+      class << self
+        def report(received, approved)
+          self.instance.report(received, approved)
+        end
+      end
+
+      def default_launcher
+        Launcher.opendiff
+      end
+
+    end
+  end
+end

data/lib/approvals/reporters/diff_reporter/tortoisediff_reporter.rb

@@ -0,0 +1,18 @@
+module Approvals
+  module Reporters
+    class TortoisediffReporter < Reporter
+      include Singleton
+
+      class << self
+        def report(received, approved)
+          self.instance.report(received, approved)
+        end
+      end
+
+      def default_launcher
+        Launcher.tortoisediff
+      end
+
+    end
+  end
+end

data/lib/approvals/reporters/diff_reporter/vimdiff_reporter.rb

@@ -0,0 +1,18 @@
+module Approvals
+  module Reporters
+    class VimdiffReporter < Reporter
+      include Singleton
+
+      class << self
+        def report(received, approved)
+          self.instance.report(received, approved)
+        end
+      end
+
+      def default_launcher
+        Launcher.vimdiff
+      end
+
+    end
+  end
+end

data/lib/approvals/reporters/filelauncher_reporter.rb

@@ -0,0 +1,18 @@
+module Approvals
+  module Reporters
+    class FilelauncherReporter < Reporter
+      include Singleton
+
+      class << self
+        def report(received, approved = nil)
+          self.instance.report(received, approved)
+        end
+      end
+
+      def default_launcher
+        Launcher.filelauncher
+      end
+
+    end
+  end
+end

data/lib/approvals/reporters/image_reporter.rb

@@ -1,6 +1,3 @@
-require 'approvals/reporters/image_reporter/image_magick_reporter'
-require 'approvals/reporters/image_reporter/html_image_reporter'
-
 module Approvals
   module Reporters
 

data/lib/approvals/reporters/image_reporter/image_magick_reporter.rb

@@ -4,7 +4,7 @@ module Approvals
       include Singleton
 
       def working_in_this_environment?
-        SystemCommand.exists? "compare"
+        Approvals::SystemCommand.exists? "compare"
       end
 
       def create_command_line(received, approved)

data/lib/approvals/reporters/launcher.rb

@@ -0,0 +1,49 @@
+
+module Approvals
+  module Reporters
+    module Launcher
+
+      class << self
+        REPORTERS = [:opendiff, :diffmerge, :vimdiff, :tortoisediff, :filelauncher]
+
+        def memoized(instance_variable)
+          unless self.instance_variable_get(instance_variable)
+            value = yield
+            self.instance_variable_set(instance_variable, value)
+          end
+          self.instance_variable_get(instance_variable)
+        end
+
+        REPORTERS.each do |name|
+          define_method name do
+            memoized(:"@#{name}") do
+              lambda {|received, approved|
+                self.send("#{name}_command".to_sym, received, approved)
+              }
+            end
+          end
+        end
+
+        def opendiff_command(received, approved)
+          "opendiff #{received} #{approved}"
+        end
+
+        def diffmerge_command(received, approved)
+          "/Applications/DiffMerge.app/Contents/MacOS/DiffMerge --nosplash \"#{received}\" \"#{approved}\""
+        end
+
+        def vimdiff_command(received, approved)
+          "vimdiff #{received} #{approved}"
+        end
+
+        def tortoisediff_command(received, approved)
+          "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseMerge.exe #{received} #{approved}"
+        end
+
+        def filelauncher_command(received, approved)
+          "open #{received}"
+        end
+      end
+    end
+  end
+end

data/lib/approvals/reporters/reporter.rb

@@ -0,0 +1,30 @@
+module Approvals
+  module Reporters
+    class Reporter
+
+      attr_reader :launcher
+
+      def initialize(&launcher)
+        @launcher = launcher || default_launcher
+      end
+
+      def report(received, approved)
+        launch(received, approved)
+      end
+
+      def approved_when_reported?
+        false
+      end
+
+      def default_launcher
+        Launcher.opendiff
+      end
+
+      protected
+
+      def launch(received, approved)
+        exec launcher.call(received, approved)
+      end
+    end
+  end
+end

data/lib/approvals/utilities/cli.rb

@@ -1,3 +1,5 @@
+# don't require the approvals library here, as it will reset the dotfile.
+# or find a better way to reset the dotfile before a run.
 module Approvals
   class CLI < Thor
 
@@ -5,7 +7,6 @@ module Approvals
     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 = []
@@ -13,7 +14,7 @@ module Approvals
         system("#{options[:diff]} #{approval}")
 
         if options[:ask] && yes?("Approve?")
-            system("mv #{approval}")
+          system("mv #{approval}")
         else
           rejected << approval
         end

data/lib/approvals/writer.rb

@@ -1,5 +1,6 @@
 require 'approvals/writers/text_writer'
 require 'approvals/writers/array_writer'
+require 'approvals/writers/hash_writer'
 require 'approvals/writers/html_writer'
 require 'approvals/writers/xml_writer'
 require 'approvals/writers/json_writer'

data/lib/approvals/writers/hash_writer.rb

@@ -0,0 +1,16 @@
+module Approvals
+  module Writers
+    class HashWriter < TextWriter
+
+      def format(data)
+        s = "{\n"
+        data.each do |key, value|
+          s << "\t#{key.inspect} => #{value.inspect}\n"
+        end
+        s << "}"
+        s
+      end
+
+    end
+  end
+end

data/lib/approvals/writers/text_writer.rb

@@ -14,7 +14,7 @@ module Approvals
       end
 
       def format(data)
-        data.inspect
+        data.to_s
       end
 
     end

data/spec/approvals_spec.rb

@@ -24,6 +24,16 @@ describe Approvals do
     Approvals.verify array, :namer => namer
   end
 
+  it "verifies a hash" do
+    hash = {
+      :meal => 'breakfast',
+      :proteins => '90%',
+      :price => 38,
+      :delicious => true
+    }
+    Approvals.verify hash, :namer => namer
+  end
+
   it "verifies a complex object" do
     hello = Object.new
     def hello.to_s

data/spec/configuration_spec.rb

@@ -2,8 +2,8 @@ require 'approvals/configuration'
 
 describe Approvals::Configuration do
 
-  it "defaults to 'approvals/'" do
-    Approvals.configuration.approvals_path.should eq('approvals/')
+  it "defaults to 'fixtures/approvals/'" do
+    Approvals.configuration.approvals_path.should eq('fixtures/approvals/')
   end
 
   describe "when set" do

data/spec/fixtures/approvals/approvals_verifies_a_complex_object.approved.txt

@@ -1 +1 @@
-#<The World Says: Hello!>
+Hello, World!

data/spec/fixtures/approvals/approvals_verifies_a_hash.approved.txt

@@ -0,0 +1,6 @@
+{
+	:meal => "breakfast"
+	:proteins => "90%"
+	:price => 38
+	:delicious => true
+}

data/spec/fixtures/approvals/approvals_verifies_a_string.approved.txt

@@ -1 +1 @@
-"We have, I fear, confused power with greatness."
+We have, I fear, confused power with greatness.

data/spec/fixtures/approvals/verifies_a_complex_object.approved.txt

@@ -1 +1 @@
-#<The World Says: Hello!>
+Hello, World!

data/spec/fixtures/approvals/verifies_a_string.approved.txt

@@ -1 +1 @@
-"We have, I fear, confused power with greatness."
+We have, I fear, confused power with greatness.

data/spec/fixtures/one.txt

@@ -0,0 +1 @@
+one

data/spec/fixtures/two.txt

@@ -0,0 +1 @@
+two

data/spec/namers/default_namer_spec.rb

@@ -2,9 +2,8 @@ require 'approvals/configuration'
 require 'approvals/namers/default_namer'
 
 describe Approvals::Namers::DefaultNamer do
-  include Approvals::Namers
 
-  subject { DefaultNamer.new("a f!$^%&*(unky name") }
+  subject { Approvals::Namers::DefaultNamer.new("a f!$^%&*(unky name") }
 
   it "normalizes the name" do
     subject.name.should eq("a_funky_name")
@@ -29,7 +28,7 @@ describe Approvals::Namers::DefaultNamer do
   end
 
   it "must have a name" do
-    ->{ DefaultNamer.new(nil) }.should raise_error(ArgumentError)
+    ->{ Approvals::Namers::DefaultNamer.new(nil) }.should raise_error(ArgumentError)
   end
 
 end

data/spec/namers/rspec_namer_spec.rb

@@ -1,14 +1,13 @@
 require 'approvals'
 
 describe Approvals::Namers::RSpecNamer do
-  include Approvals::Namers
 
   it "uses non-$%^&*funky example description" do
-    RSpecNamer.new(self.example).name.should eq("approvals_namers_rspecnamer_uses_non_funky_example_description")
+    Approvals::Namers::RSpecNamer.new(self.example).name.should eq("approvals_namers_rspecnamer_uses_non_funky_example_description")
   end
 
   it "has a decent default" do
-    RSpecNamer.new(self.example).output_dir.should eq('spec/fixtures/approvals/')
+    Approvals::Namers::RSpecNamer.new(self.example).output_dir.should eq('spec/fixtures/approvals/')
   end
 
   context "when RSpec is configured" do
@@ -25,7 +24,7 @@ describe Approvals::Namers::RSpecNamer do
     end
 
     it "uses the rspec config option" do
-      RSpecNamer.new(self.example).output_dir.should eq('spec/output/dir/')
+      Approvals::Namers::RSpecNamer.new(self.example).output_dir.should eq('spec/output/dir/')
     end
   end
 end

data/spec/namers_spec.rb

@@ -1,10 +1,9 @@
 require 'approvals'
 
 describe Approvals::Namers do
-  include Approvals::Namers
 
   it "uses the RSpecNamer" do
-    approval = Approvals::Approval.new("naming with rspec namer", :namer => RSpecNamer.new(self.example))
+    approval = Approvals::Approval.new("naming with rspec namer", :namer => Approvals::Namers::RSpecNamer.new(self.example))
     approval.name.should eq("approvals_namers_uses_the_rspecnamer")
   end
 

data/spec/reporters/first_working_reporter_spec.rb

@@ -1,24 +1,24 @@
 require 'approvals/reporters/first_working_reporter'
 
 describe Approvals::Reporters::FirstWorkingReporter do
-  include Approvals::Reporters
+
 
   let(:no) { stub(:working_in_this_environment? => false) }
   let(:yes) { stub(:working_in_this_environment? => true) }
   let(:yes_too) { stub(:working_in_this_environment? => true) }
 
   context "when at least one reporter works" do
-    subject { FirstWorkingReporter.new(no, yes) }
+    subject { Approvals::Reporters::FirstWorkingReporter.new(no, yes) }
     its(:working_in_this_environment?) { should be_true }
   end
 
   context "when no reporters work" do
-    subject { FirstWorkingReporter.new(no, no) }
+    subject { Approvals::Reporters::FirstWorkingReporter.new(no, no) }
     its(:working_in_this_environment?) { should be_false }
   end
 
   it "calls the first working reporter" do
-    working = FirstWorkingReporter.new(no, yes, yes_too)
+    working = Approvals::Reporters::FirstWorkingReporter.new(no, yes, yes_too)
 
     no.should_not_receive(:report)
     yes.should_receive(:report)

data/spec/reporters/html_image_reporter_spec.rb

@@ -2,12 +2,11 @@ require 'approvals/reporters'
 require 'approvals/utilities/scrubber'
 
 describe Approvals::Reporters::HtmlImageReporter do
-  include Approvals
 
-  subject { Reporters::HtmlImageReporter.instance }
+  subject { Approvals::Reporters::HtmlImageReporter.instance }
 
   it "creates the template" do
-    scrubber = Scrubber.new(subject.html("spec/fixtures/one.png", "spec/fixtures/two.png"))
+    scrubber = Approvals::Scrubber.new(subject.html("spec/fixtures/one.png", "spec/fixtures/two.png"))
     scrubber.to_s.should eq('<html><head><title>Approval</title></head><body><center><table style="text-align: center;" border="1"><tr><td><img src="file://{{current_dir}}/spec/fixtures/one.png"></td><td><img src="file://{{current_dir}}/spec/fixtures/two.png"></td></tr><tr><td>received</td><td>approved</td></tr></table></center></body></html>')
   end
 

data/spec/reporters/image_magick_reporter_spec.rb

@@ -1,8 +1,7 @@
 require 'approvals/reporters'
 
 describe Approvals::Reporters::ImageMagickReporter do
-  include Approvals::Reporters
-  subject { ImageMagickReporter.instance }
+  subject { Approvals::Reporters::ImageMagickReporter.instance }
 
   it "creates the appropriate command" do
     result = subject.create_command_line("spec/fixtures/one.png", "spec/fixtures/two.png")

data/spec/reporters/launcher_spec.rb

@@ -0,0 +1,25 @@
+require 'approvals/reporters/launcher'
+
+describe Approvals::Reporters::Launcher do
+
+
+  it "has a vimdiff launcher" do
+    Approvals::Reporters::Launcher.vimdiff.call('one', 'two').should eq("vimdiff one two")
+  end
+
+  it "has an opendiff launcher" do
+    Approvals::Reporters::Launcher.opendiff.call('one', 'two').should eq("opendiff one two")
+  end
+
+  it "has a diffmerge launcher" do
+    Approvals::Reporters::Launcher.diffmerge.call('one', 'two').should match(/DiffMerge.*\"one\"\ \"two\"/)
+  end
+
+  it "has a tortoisediff launcher" do
+    Approvals::Reporters::Launcher.tortoisediff.call('one', 'two').should match(/TortoiseMerge.exe.*one.*two/)
+  end
+
+  it "has a filelauncher launcher" do
+    Approvals::Reporters::Launcher.filelauncher.call('one', 'two').should eq("open one")
+  end
+end

data/spec/reporters/opendiff_reporter_spec.rb

@@ -0,0 +1,15 @@
+require 'approvals'
+
+describe Approvals::Reporters::OpendiffReporter do
+
+  it "has a nice launcher" do
+    pending "Breaks off execution of the tests. Horrible."
+    one = 'spec/fixtures/one.txt'
+    two = 'spec/fixtures/two.txt'
+    executable = Approvals::Executable.new(Approvals::Reporters::OpendiffReporter.instance.launcher.call(one, two)) do |command|
+      Approvals::Reporters::OpendiffReporter.report(one, two)
+    end
+
+    Approvals.verify(executable, :name => 'opendiff launcher')
+  end
+end

data/spec/reporters/reporter_spec.rb

@@ -0,0 +1,20 @@
+require 'approvals/reporters'
+
+describe Approvals::Reporters::Reporter do
+
+  it "is not approved by default" do
+    Approvals::Reporters::Reporter.new.should_not be_approved_when_reported
+  end
+
+  it "takes a launcher" do
+    move = lambda {|received, approved|
+      "echo \"mv #{received} #{approved}\""
+    }
+
+    Approvals::Reporters::Reporter.new(&move).launcher.call('received.txt', 'approved.txt').should eq("echo \"mv received.txt approved.txt\"")
+  end
+
+  it "defaults to the default OpenDiff launcher" do
+    Approvals::Reporters::Reporter.new.launcher.should eq(Approvals::Reporters::Launcher.opendiff)
+  end
+end

data/spec/utilities/dotfile_spec.rb

@@ -1,22 +1,21 @@
 require 'approvals/utilities/dotfile'
 
 describe Approvals::Dotfile do
-  include Approvals
   let(:dotfile) { '/tmp/.approvals' }
 
   before(:each) do
-    Dotfile.stub(:path => dotfile)
-    Dotfile.reset
+    Approvals::Dotfile.stub(:path => dotfile)
+    Approvals::Dotfile.reset
   end
 
   it "appends the text" do
-    Dotfile.append('text')
+    Approvals::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')
+    Approvals::Dotfile.append('text')
+    Approvals::Dotfile.append('text')
     File.readlines(dotfile).map(&:chomp).should eq(['text'])
   end
 end

data/spec/utilities/executable_spec.rb

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

data/spec/utilities/scrubber_spec.rb

@@ -1,11 +1,10 @@
 require 'approvals/utilities/scrubber'
 
 describe Approvals::Scrubber do
-  include Approvals
 
   describe "defaults" do
     let(:path) { File.expand_path('.') }
-    subject { Scrubber.new("I am currently at #{path}") }
+    subject { Approvals::Scrubber.new("I am currently at #{path}") }
 
     its(:to_s) { should eq("I am currently at {{current_dir}}") }
 
@@ -19,6 +18,6 @@ describe Approvals::Scrubber do
   end
 
   it "overrides default hash" do
-    Scrubber.new("oh, my GAWD", {"deity" => "GAWD"}).to_s.should eq('oh, my {{deity}}')
+    Approvals::Scrubber.new("oh, my GAWD", {"deity" => "GAWD"}).to_s.should eq('oh, my {{deity}}')
   end
 end

data/spec/utilities/system_command_spec.rb

@@ -1,13 +1,12 @@
 require 'approvals/utilities/system_command'
 
 describe Approvals::SystemCommand, "#exists?" do
-  include Approvals
 
   it "does" do
-    SystemCommand.exists?("ls").should be_true
+    Approvals::SystemCommand.exists?("ls").should be_true
   end
 
   it "does not" do
-    SystemCommand.exists?("absolutelydoesnotexistonyoursystem").should be_false
+    Approvals::SystemCommand.exists?("absolutelydoesnotexistonyoursystem").should be_false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: approvals
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70351267248460 !ruby/object:Gem::Requirement
+  requirement: &70196756887140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70351267248460
+  version_requirements: *70196756887140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70351267246520 !ruby/object:Gem::Requirement
+  requirement: &70196756886080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351267246520
+  version_requirements: *70196756886080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70351267200860 !ruby/object:Gem::Requirement
+  requirement: &70196756885140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351267200860
+  version_requirements: *70196756885140
 description: Approval Tests for Ruby
 email:
 - katrina.owen@gmail.com
@@ -73,10 +73,17 @@ files:
 - lib/approvals/namers/default_namer.rb
 - lib/approvals/namers/rspec_namer.rb
 - lib/approvals/reporters.rb
+- lib/approvals/reporters/diff_reporter/diffmerge_reporter.rb
+- lib/approvals/reporters/diff_reporter/opendiff_reporter.rb
+- lib/approvals/reporters/diff_reporter/tortoisediff_reporter.rb
+- lib/approvals/reporters/diff_reporter/vimdiff_reporter.rb
+- lib/approvals/reporters/filelauncher_reporter.rb
 - lib/approvals/reporters/first_working_reporter.rb
 - lib/approvals/reporters/image_reporter.rb
 - lib/approvals/reporters/image_reporter/html_image_reporter.rb
 - lib/approvals/reporters/image_reporter/image_magick_reporter.rb
+- lib/approvals/reporters/launcher.rb
+- lib/approvals/reporters/reporter.rb
 - lib/approvals/utilities.rb
 - lib/approvals/utilities/cli.rb
 - lib/approvals/utilities/dotfile.rb
@@ -84,8 +91,8 @@ files:
 - lib/approvals/utilities/scrubber.rb
 - lib/approvals/utilities/system_command.rb
 - lib/approvals/writer.rb
-- lib/approvals/writers.rb
 - lib/approvals/writers/array_writer.rb
+- lib/approvals/writers/hash_writer.rb
 - lib/approvals/writers/html_writer.rb
 - lib/approvals/writers/json_writer.rb
 - lib/approvals/writers/text_writer.rb
@@ -93,7 +100,9 @@ files:
 - spec/approvals_spec.rb
 - spec/configuration_spec.rb
 - spec/extensions/rspec_approvals_spec.rb
+- spec/fixtures/approvals/approvals_fails.approved.txt
 - spec/fixtures/approvals/approvals_verifies_a_complex_object.approved.txt
+- spec/fixtures/approvals/approvals_verifies_a_hash.approved.txt
 - spec/fixtures/approvals/approvals_verifies_a_string.approved.txt
 - spec/fixtures/approvals/approvals_verifies_an_array.approved.txt
 - spec/fixtures/approvals/approvals_verifies_an_executable.approved.txt
@@ -109,13 +118,18 @@ files:
 - spec/fixtures/approvals/verifies_json.approved.json
 - spec/fixtures/approvals/verifies_xml.approved.xml
 - spec/fixtures/one.png
+- spec/fixtures/one.txt
 - spec/fixtures/two.png
+- spec/fixtures/two.txt
 - spec/namers/default_namer_spec.rb
 - spec/namers/rspec_namer_spec.rb
 - spec/namers_spec.rb
 - spec/reporters/first_working_reporter_spec.rb
 - spec/reporters/html_image_reporter_spec.rb
 - spec/reporters/image_magick_reporter_spec.rb
+- spec/reporters/launcher_spec.rb
+- spec/reporters/opendiff_reporter_spec.rb
+- spec/reporters/reporter_spec.rb
 - spec/utilities/dotfile_spec.rb
 - spec/utilities/executable_spec.rb
 - spec/utilities/scrubber_spec.rb
@@ -140,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: approvals
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Approval Tests for Ruby

data/lib/approvals/writers.rb

@@ -1,5 +0,0 @@
-require 'approvals/writers/text_writer'
-require 'approvals/writers/array_writer'
-require 'approvals/writers/html_writer'
-require 'approvals/writers/xml_writer'
-require 'approvals/writers/json_writer'