approvals 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a754f80fcf4b9d5684a6ad266014cbe4f088d97
-  data.tar.gz: 9f9f31c64420640ae34acfab35f44a4b6bd42fd5
+  metadata.gz: a0a50b2c67393dc926d52f49df60c453975df001
+  data.tar.gz: 4ff2a58aedde600c73a24578d3e6e2a7cdda6c0d
 SHA512:
-  metadata.gz: 83e90620776b4f6cdfa6d280512c78979acde2d7b4478cdc5796bf8ecb8b13d67afea05534bd0312c8af34dbc8d6cbedc290f1100f9eb7ca79a88bc14bbfb433
-  data.tar.gz: 28376171ae47ec54b63f74ba094a0b9327d3248545fc4b80da1b3d6ec44bbd9827e11c1e631faed607cde89c1a1c9133ea3ce82fb5da443e59a261462f32bee7
+  metadata.gz: b9b8bd1f543244f6ff2427b41ca2658f5087f1173024e69990ef7f6b60bbc47d07c15554e4903640198de3438eb579561f6c593b0c967f8ab32ab36d9e5f5f6d
+  data.tar.gz: d43cb171f0f9ea3d377d01798d2df4eca92b2b093693eb7760facb2684b6667c84896196f3e0fcf445676ad23cc94e956b4c515aeb6cccd01073da80c0032da6

data/Changelog.md

@@ -1,10 +1,27 @@
 # Changelog
 
-## HEAD
+### HEAD
 
-* Added configuration option `diff_on_approval_failure`, and functionality to let rspec diff on an approval failure.
+- Allow to verify hashes and arrays as json
 
+- Added support for RSpec 3.0
 
-## Version 0.0.9
+### v0.0.12 (2014/02/16 16:43 +00:00)
+
+- Allow to configure a default format in RSpec
+
+### v0.0.11 (2014/02/16 16:33 +00:00)
+
+- Append a trailing newline to all approval files
+
+
+### v0.0.10 (2014/01/30 14:41 +00:00)
+- [#9](https://github.com/kytrinyx/approvals/pull/9) Send rspec approval failures to rspec for diffing (@jeremyruppel)
+
+- [#19](https://github.com/kytrinyx/approvals/pull/19) Switch rspec fail_with args so diff is correct (@bmarini)
+
+- Added configuration option `diff_on_approval_failure`, and functionality to let rspec diff on an approval failure.
+
+### v0.0.9
 
 Before this version, no changelog was maintained

data/README.md

@@ -20,8 +20,6 @@ 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.
 
-
-
 ## Configuration
 
 ```ruby
@@ -32,7 +30,9 @@ end
 
 The default location for the output files is
 
-    approvals/
+```plain
+approvals/
+```
 
 ## Usage
 
@@ -54,6 +54,50 @@ The first time the approval is run, a file will be created with the contents of
 
 Since you have not yet approved anything, the `*.approved` file does not exist, and the comparison will fail.
 
+## CLI
+
+The gem comes with a command-line tool that makes it easier to manage the
+`*.received.*` and `*.approved.*` files.
+
+The basic usage is:
+
+```bash
+approvals verify
+```
+
+This goes through each approval failure in turn showing you the diff.
+
+The option `--diff` or `-d` configures which difftool to use (for example
+`opendiff`, `vimdiff`, etc). The default value is `diff`.
+
+The option `--ask` or `-a`, which after showing you a diff will offer to
+approve the received file (move it from `*.received.*` to `*.approved.*`.).
+The default is `true`. If you set this to `false`, then nothing happens beyond
+showing you the diff, and you will need to rename files manually.
+
+### Workflow Using VimDiff
+
+I have the following mapped to `<leader>v` in my .vimrc file:
+
+```viml
+map <leader>v :!approvals verify -d vimdiff -a<cr>
+```
+
+I tend to run my tests from within vim with an on-the-fly mapping:
+
+```viml
+:map Q :wa <Bar> :!ruby path/to/test_file.rb<cr>
+```
+
+When I get one or more approval failures, I hit `<leader>v`. This gives me the
+vimdiff.
+
+When I've inspected the result, I hit `:qa` which closes both sides of the
+diff.
+
+Then I'm asked if I want to approve the received file `[yN]`. If there are
+multiple diffs, this handles each failure in turn.
+
 ### RSpec
 
 For the moment the only direct integration is with RSpec.

data/approvals.gemspec

@@ -20,7 +20,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_development_dependency 'rspec', '~> 2.9'
+  s.add_development_dependency 'rspec', '~> 2.99.0.beta2'
   s.add_development_dependency 'json', '~> 1.8'
   s.add_dependency 'thor', '~> 0.18'
   s.add_dependency 'nokogiri', '~> 1.6'

data/bin/approvals

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

data/lib/approvals.rb

@@ -6,8 +6,12 @@ require 'approvals/configuration'
 require 'approvals/approval'
 require 'approvals/dsl'
 require 'approvals/error'
-require 'approvals/utilities'
+require 'approvals/system_command'
+require 'approvals/scrubber'
+require 'approvals/dotfile'
+require 'approvals/executable'
 require 'approvals/reporters'
+require 'approvals/filter'
 require 'approvals/writer'
 require 'approvals/namers/default_namer'
 

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

@@ -8,8 +8,13 @@ module Approvals
       end
 
       def verify(options = {}, &block)
+        # Workaround to support both Rspec 2 and 3
+        # RSpec.current_example is the Rspec 3 way
+        fetch_current_example = ::RSpec.respond_to?(:current_example) ? proc { ::RSpec.current_example } : proc { |context| context.example }
+        # /Workaround
+
         group = eval "self", block.binding
-        namer = ::RSpec.configuration.approvals_namer_class.new(group.example)
+        namer = ::RSpec.configuration.approvals_namer_class.new(fetch_current_example.call(group))
         defaults = {
           :namer => namer
         }
@@ -27,8 +32,12 @@ module Approvals
       private
 
       def diff_on_approval_failure?
+        # Workaround to support both RSpec 2 and 3
+        fetch_current_example = ::RSpec.respond_to?(:current_example) ? proc { ::RSpec.current_example } : proc { |context| context.example }
+        # /Workaround
+
         ::RSpec.configuration.diff_on_approval_failure? ||
-          example.metadata[:diff_on_approval_failure]
+          fetch_current_example.call(self).metadata[:diff_on_approval_failure]
       end
     end
   end

data/lib/approvals/filter.rb

@@ -0,0 +1,45 @@
+module Approvals
+  class Filter
+    attr_reader :filters
+
+    def initialize(filters)
+      @filters = filters
+      @placeholder = {}
+    end
+
+    def apply hash_or_array
+      if @filters.any?
+        censored(hash_or_array)
+      else
+        hash_or_array
+      end
+    end
+
+    def censored value, key=nil
+      case value
+      when Array
+        value.map { |item| censored(item) }
+      when Hash
+        Hash[value.map { |key, value| [key, censored(value, key)] }]
+      else
+        if value.nil?
+          nil
+        elsif key && placeholder_for(key)
+          "<#{placeholder_for(key)}>"
+        else
+          value
+        end
+      end
+    end
+
+    def placeholder_for key
+      return @placeholder[key] if @placeholder.key? key
+
+      applicable_filters = filters.select do |placeholder, pattern|
+        pattern && key.match(pattern)
+      end
+
+      @placeholder[key] = applicable_filters.keys.last
+    end
+  end
+end

data/lib/approvals/version.rb

@@ -1,3 +1,3 @@
 module Approvals
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/approvals/writer.rb

@@ -9,22 +9,22 @@ require 'approvals/writers/binary_writer'
 module Approvals
   module Writer
     extend Writers
-    
+
     REGISTRY = {
-      json: Writers::JsonWriter.instance,
-      xml: Writers::XmlWriter.instance,
-      html: Writers::HtmlWriter.instance,
-      hash: Writers::HashWriter.instance,
-      array: Writers::ArrayWriter.instance,
+      json: Writers::JsonWriter.new,
+      xml: Writers::XmlWriter.new,
+      html: Writers::HtmlWriter.new,
+      hash: Writers::HashWriter.new,
+      array: Writers::ArrayWriter.new,
     }
-        
+
 
     class << self
       def for(format)
         if REGISTRY.include?(format)
           REGISTRY[format]
         else
-          TextWriter.instance
+          TextWriter.new
         end
       end
     end

data/lib/approvals/writers/array_writer.rb

@@ -3,11 +3,15 @@ module Approvals
     class ArrayWriter < TextWriter
 
       def format(data)
-        data.map.with_index do |value, i|
+        filter(data).map.with_index do |value, i|
           "[#{i.inspect}] #{value.inspect}\n"
         end.join
       end
 
+      def filter data
+        filter = ::Approvals::Filter.new(Approvals.configuration.excluded_json_keys)
+        filter.apply(data)
+      end
     end
   end
 end

data/lib/approvals/writers/binary_writer.rb

@@ -1,10 +1,6 @@
 module Approvals
-
   module Writers
-
     class BinaryWriter
-      include Singleton
-
       EXCEPTION_WRITER = Proc.new do |data, file|
         raise "BinaryWriter#callback missing"
       end
@@ -16,32 +12,32 @@ module Approvals
         self.write = opts[:write] || EXCEPTION_WRITER
         self.format = opts[:format] || :binary
       end
-           
+
       attr_accessor :autoregister
       attr_accessor :extension
       attr_accessor :write
       attr_accessor :detect
-      
-      
+
+
       attr_reader :format
 
       def format=(sym)
         unregister if autoregister
-                
-        @format = sym        
-        
+
+        @format = sym
+
         register if autoregister
-        
+
       end
-      
+
       def register
         if @format
-          Writer::REGISTRY[@format] = self 
+          Writer::REGISTRY[@format] = self
           Approval::BINARY_FORMATS << @format
           Approval::IDENTITIES[@format] = @detect if @detect
         end
       end
-      
+
       def unregister
         if @format
           Writer::REGISTRY.delete!(@format)
@@ -56,4 +52,4 @@ module Approvals
 
     end
   end
-end
+end

data/lib/approvals/writers/hash_writer.rb

@@ -3,13 +3,18 @@ module Approvals
     class HashWriter < TextWriter
 
       def format(data)
-        lines = data.map do |key, value|
+        lines = filter(data).map do |key, value|
           "\t#{key.inspect} => #{value.inspect}"
         end.join("\n")
 
         "{\n#{lines}\n}\n"
       end
 
+      def filter data
+        filter = ::Approvals::Filter.new(Approvals.configuration.excluded_json_keys)
+        filter.apply(data)
+      end
+
     end
   end
 end

data/lib/approvals/writers/json_writer.rb

@@ -1,50 +1,30 @@
 module Approvals
   module Writers
     class JsonWriter < TextWriter
-
       def extension
         'json'
       end
 
       def format(data)
-        hash_or_array = parse_data(data)
-
-        apply_filters!(hash_or_array) if filters.any?
+        hash_or_array = filter(parse_data(data))
 
         JSON.pretty_generate(hash_or_array) + "\n"
       end
 
       private
 
-      def filters
-        Approvals.configuration.excluded_json_keys
-      end
-
       def parse_data(data)
-        JSON.parse(data)
+        if data.respond_to?(:to_str)
+          # if the data is a string, assume it has been already json-ified
+          JSON.parse(data)
+        else
+          JSON.parse(data.to_json)
+        end
       end
 
-      def apply_filters!(hash_or_array)
-        case hash_or_array
-        when Array
-          for i in (0 ... hash_or_array.size) do
-            apply_filters!(hash_or_array[i])
-          end
-        when Hash
-          hash_or_array.each do |key, value|
-            next if value.nil?
-
-            if value.is_a?(Hash) || value.is_a?(Array)
-              apply_filters!(value)
-            else
-              filters.each do |placeholder, pattern|
-                if pattern && key.match(pattern)
-                  hash_or_array[key] = "<#{placeholder}>"
-                end
-              end
-            end
-          end
-        end
+      def filter data
+        filter = ::Approvals::Filter.new(Approvals.configuration.excluded_json_keys)
+        filter.apply(data)
       end
     end
   end

data/lib/approvals/writers/text_writer.rb

@@ -1,8 +1,6 @@
 module Approvals
   module Writers
     class TextWriter
-      include Singleton
-
       def extension
         'txt'
       end

data/spec/approvals_spec.rb

@@ -3,7 +3,7 @@ require 'approvals/namers/rspec_namer'
 
 describe Approvals do
 
-  let(:namer) { Approvals::Namers::RSpecNamer.new(self.example) }
+  let(:namer) { |example| Approvals::Namers::RSpecNamer.new(example) }
 
   it "fails" do
     Approvals::Dotfile.stub(:path => '/dev/null')
@@ -73,6 +73,15 @@ describe Approvals do
     Approvals.verify json, :format => :json, :namer => namer
   end
 
+  it "verifies an array as json when format is set to json" do
+    people = [
+      {"name" => "Alice", "age" => 28},
+      {"name" => "Bob", "age" => 22}
+    ]
+
+    Approvals.verify(people, format: :json, namer: namer)
+  end
+
   it "verifies an executable" do
     executable = Approvals::Executable.new('SELECT 1') do |command|
       puts "your slip is showing (#{command})"
@@ -87,7 +96,7 @@ describe Approvals do
     Approvals.verify string, :namer => namer
   end
 
-  describe "supports excluded keys option for json" do
+  describe "supports excluded keys option" do
     let(:hash) { {:object => {:id => rand(100), :created_at => Time.now, :name => 'test', deleted_at: nil}} }
 
     before do
@@ -106,5 +115,13 @@ describe Approvals do
     it "also supports an array of hashes" do
       Approvals.verify JSON.dump([hash]), :format => :json, :namer => namer
     end
+
+    it "supports the array writer" do
+      Approvals.verify [hash], :format => :array, :namer => namer
+    end
+
+    it "supports the hash writer" do
+      Approvals.verify hash, :format => :array, :namer => namer
+    end
   end
 end

data/spec/{utilities/dotfile_spec.rb → dotfile_spec.rb}

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'approvals/utilities/dotfile'
+require 'approvals/dotfile'
 
 describe Approvals::Dotfile do
   let(:dotfile) { '/tmp/.approvals' }

data/spec/{utilities/executable_spec.rb → executable_spec.rb}

@@ -1,10 +1,12 @@
 require 'spec_helper'
-require 'approvals/utilities/executable'
+require 'approvals/executable'
 
 describe Approvals::Executable do
 
-  subject { Approvals::Executable.new('SELECT 1') }
-  its(:inspect) { should eq('SELECT 1') }
+  it "reflects the its value in inspect" do
+    executable = Approvals::Executable.new('SELECT 1')
+    executable.inspect.should eq 'SELECT 1'
+  end
 
   it "takes a block" do
     executable = Approvals::Executable.new('SELECT 1') do |command|

data/spec/filter_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+
+describe Approvals::Filter do
+  it "When no filters were supplied, it leaves the h_or_a alone" do
+    filter = Approvals::Filter.new({})
+
+    input = {some: 'hash'}
+    output = filter.apply(input)
+
+    expect(input).to equal output
+  end
+
+  it "replaces fields which match a filter" do
+    filter = Approvals::Filter.new({foo: /^_?foo$/})
+    input = {
+      foo: 'bar13',
+      _foo: 'bar27',
+      nonfoo: 'bar',
+    }
+
+    output = filter.apply(input)
+
+    expect(output).to eq({
+      foo: '<foo>',
+      _foo: '<foo>',
+      nonfoo: 'bar',
+    })
+  end
+
+  it "a filter matches, but the value is nil, it does not get replaced" do
+    filter = Approvals::Filter.new({foo: /^foo$/})
+    input = {
+      foo: nil,
+      nonfoo: 'bar',
+    }
+
+    output = filter.apply(input)
+
+    expect(output).to eq({
+      foo: nil,
+      nonfoo: 'bar',
+    })
+  end
+  it "a filter matches, and the value is falsey, but not nil, it gets replaced" do
+    filter = Approvals::Filter.new({foo: /^foo$/})
+    input = {
+      foo: false,
+      nonfoo: 'bar',
+    }
+
+    output = filter.apply(input)
+
+    expect(output).to eq({
+      foo: "<foo>",
+      nonfoo: 'bar',
+    })
+  end
+
+  it "filters recursively in hashes and array" do
+    filter = Approvals::Filter.new({foo: /^foo$/})
+    input = {
+      foo: 'bar124',
+      foolist: [{foo: 'bar 145', bar: 'foo'}, 'foobar'],
+      nonfoo: 'bar',
+    }
+
+    output = filter.apply(input)
+
+    expect(output).to eq({
+      foo: '<foo>',
+      foolist: [{foo: '<foo>', bar: 'foo'}, 'foobar'],
+      nonfoo: 'bar',
+    })
+  end
+
+  it "takes the last applicable filter" do
+    filter = Approvals::Filter.new({foo: /^foo/, bar: /bar$/})
+    input = {
+      foobar: 'baz',
+    }
+
+    output = filter.apply(input)
+
+    expect(output).to eq({
+      foobar: '<bar>',
+    })
+  end
+end

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

@@ -0,0 +1 @@
+[0] {:object=>{:id=>"<id>", :created_at=>"<date>", :name=>"test", :deleted_at=>nil}}

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

@@ -0,0 +1 @@
+[0] [:object, {:id=>"<id>", :created_at=>"<date>", :name=>"test", :deleted_at=>nil}]

data/spec/fixtures/approvals/approvals_verifies_an_array_as_json_when_format_is_set_to_json.approved.json

@@ -0,0 +1,10 @@
+[
+  {
+    "name": "Alice",
+    "age": 28
+  },
+  {
+    "name": "Bob",
+    "age": 22
+  }
+]

data/spec/namers/directory_namer_spec.rb

@@ -3,12 +3,12 @@ require 'approvals/rspec'
 
 describe Approvals::Namers::DirectoryNamer do
 
-  it "uses non-$%^&*funky example description" do
-    Approvals::Namers::DirectoryNamer.new(self.example).name.should eq("approvals_namers_directorynamer/uses_non_funky_example_description")
+  it "uses non-$%^&*funky example description" do |example|
+    Approvals::Namers::DirectoryNamer.new(example).name.should eq("approvals_namers_directorynamer/uses_non_funky_example_description")
   end
 
-  it "has a decent default" do
-    Approvals::Namers::DirectoryNamer.new(self.example).output_dir.should eq('spec/fixtures/approvals/')
+  it "has a decent default" do |example|
+    Approvals::Namers::DirectoryNamer.new(example).output_dir.should eq('spec/fixtures/approvals/')
   end
 
   context "when RSpec is configured" do
@@ -24,8 +24,8 @@ describe Approvals::Namers::DirectoryNamer do
       end
     end
 
-    it "uses the rspec config option" do
-      Approvals::Namers::DirectoryNamer.new(self.example).output_dir.should eq('spec/output/dir/')
+    it "uses the rspec config option" do |example|
+      Approvals::Namers::DirectoryNamer.new(example).output_dir.should eq('spec/output/dir/')
     end
   end
 end

data/spec/namers/rspec_namer_spec.rb

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

data/spec/namers_spec.rb

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

data/spec/reporters/first_working_reporter_spec.rb

@@ -8,14 +8,14 @@ describe Approvals::Reporters::FirstWorkingReporter do
   let(:yes) { double(:working_in_this_environment? => true) }
   let(:yes_too) { double(:working_in_this_environment? => true) }
 
-  context "when at least one reporter works" do
-    subject { Approvals::Reporters::FirstWorkingReporter.new(no, yes) }
-    its(:working_in_this_environment?) { should be_true }
+  it "when at least one reporter works it is working" do
+    reporter = Approvals::Reporters::FirstWorkingReporter.new(no, yes)
+    reporter.should be_working_in_this_environment
   end
 
-  context "when no reporters work" do
-    subject { Approvals::Reporters::FirstWorkingReporter.new(no, no) }
-    its(:working_in_this_environment?) { should be_false }
+  it "when no reporters work it's not working" do
+    reporter = Approvals::Reporters::FirstWorkingReporter.new(no, no)
+    reporter.should_not be_working_in_this_environment
   end
 
   it "calls the first working reporter" do

data/spec/reporters/html_image_reporter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'approvals/reporters'
-require 'approvals/utilities/scrubber'
+require 'approvals/scrubber'
 
 describe Approvals::Reporters::HtmlImageReporter do
 

data/spec/reporters/opendiff_reporter_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Approvals::Reporters::OpendiffReporter do
 
   it "has a nice launcher" do
-    pending "Breaks off execution of the tests. Horrible."
+    skip "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|

data/spec/{utilities/scrubber_spec.rb → scrubber_spec.rb}

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'approvals/utilities/scrubber'
+require 'approvals/scrubber'
 
 describe Approvals::Scrubber do
 
@@ -7,7 +7,9 @@ describe Approvals::Scrubber do
     let(:path) { File.expand_path('.') }
     subject { Approvals::Scrubber.new("I am currently at #{path}") }
 
-    its(:to_s) { should eq("I am currently at {{current_dir}}") }
+    it "has a sensible to_s" do
+      subject.to_s.should eq("I am currently at {{current_dir}}")
+    end
 
     it "unscrubs" do
       subject.unscrub.should eq("I am currently at #{path}")

data/spec/{utilities/system_command_spec.rb → system_command_spec.rb}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approvals
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.99.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.99.0.beta2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -87,10 +87,13 @@ files:
 - lib/approvals.rb
 - lib/approvals/approval.rb
 - lib/approvals/configuration.rb
+- lib/approvals/dotfile.rb
 - lib/approvals/dsl.rb
 - lib/approvals/error.rb
+- lib/approvals/executable.rb
 - lib/approvals/extensions/rspec.rb
 - lib/approvals/extensions/rspec/dsl.rb
+- lib/approvals/filter.rb
 - lib/approvals/namers/default_namer.rb
 - lib/approvals/namers/directory_namer.rb
 - lib/approvals/namers/rspec_namer.rb
@@ -107,12 +110,8 @@ files:
 - lib/approvals/reporters/launcher.rb
 - lib/approvals/reporters/reporter.rb
 - lib/approvals/rspec.rb
-- lib/approvals/utilities.rb
-- lib/approvals/utilities/cli.rb
-- lib/approvals/utilities/dotfile.rb
-- lib/approvals/utilities/executable.rb
-- lib/approvals/utilities/scrubber.rb
-- lib/approvals/utilities/system_command.rb
+- lib/approvals/scrubber.rb
+- lib/approvals/system_command.rb
 - lib/approvals/version.rb
 - lib/approvals/writer.rb
 - lib/approvals/writers/array_writer.rb
@@ -122,16 +121,23 @@ files:
 - lib/approvals/writers/json_writer.rb
 - lib/approvals/writers/text_writer.rb
 - lib/approvals/writers/xml_writer.rb
+- lib/cli.rb
 - spec/approvals_spec.rb
 - spec/configuration_spec.rb
+- spec/dotfile_spec.rb
+- spec/executable_spec.rb
 - spec/extensions/rspec_approvals_spec.rb
+- spec/filter_spec.rb
 - spec/fixtures/approvals/approvals_passes_approved_files_through_erb.approved.txt
-- spec/fixtures/approvals/approvals_supports_excluded_keys_option_for_json_also_supports_an_array_of_hashes.approved.json
-- spec/fixtures/approvals/approvals_supports_excluded_keys_option_for_json_verifies_json_with_excluded_keys.approved.json
+- spec/fixtures/approvals/approvals_supports_excluded_keys_option_also_supports_an_array_of_hashes.approved.json
+- spec/fixtures/approvals/approvals_supports_excluded_keys_option_supports_the_array_writer.approved.txt
+- spec/fixtures/approvals/approvals_supports_excluded_keys_option_supports_the_hash_writer.approved.txt
+- spec/fixtures/approvals/approvals_supports_excluded_keys_option_verifies_json_with_excluded_keys.approved.json
 - 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_array_as_json_when_format_is_set_to_json.approved.json
 - spec/fixtures/approvals/approvals_verifies_an_executable.approved.txt
 - spec/fixtures/approvals/approvals_verifies_html.approved.html
 - spec/fixtures/approvals/approvals_verifies_json.approved.json
@@ -170,11 +176,9 @@ files:
 - spec/reporters/launcher_spec.rb
 - spec/reporters/opendiff_reporter_spec.rb
 - spec/reporters/reporter_spec.rb
+- spec/scrubber_spec.rb
 - spec/spec_helper.rb
-- spec/utilities/dotfile_spec.rb
-- spec/utilities/executable_spec.rb
-- spec/utilities/scrubber_spec.rb
-- spec/utilities/system_command_spec.rb
+- spec/system_command_spec.rb
 homepage: ''
 licenses:
 - MIT

data/lib/approvals/utilities.rb

@@ -1,4 +0,0 @@
-require 'approvals/utilities/system_command'
-require 'approvals/utilities/scrubber'
-require 'approvals/utilities/dotfile'
-require 'approvals/utilities/executable'