approvals 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df7476eb9432577895df3170adc9653d7f7615f
-  data.tar.gz: 1ea30b6816e7282509c98524394ba9e76d787a27
+  metadata.gz: 289acfccac3d619495b776d467d8bf86096d25c6
+  data.tar.gz: 2f4e4d24848514429cab566fb9339f2b5f270fb2
 SHA512:
-  metadata.gz: 2945a8151ca583748a19ea37448723a63fb0f9cb6eefc427cf2fa8a368b4d7372199231de86a7614e3e3746f9d9a1881b2f1e2bff23e6f2a1a16b55931446953
-  data.tar.gz: 478fbaf9846755cedb47216ccbec95f879faeee7ad1728b794992e9ae39b7653bfdb40dd0979f73c6c5a779dab63f1f4cedf91958f8bc4a20e7058ba16fe515a
+  metadata.gz: 79fb265fe4c37fa45b3417c655384e21f6e180895657dc95687d8cd7215fc00e5b1fc456258aa690a418a2d3c33ca21ee5238ba3fd3e3fa5b0826b4d894852c5
+  data.tar.gz: 6e3e274b370d0893f4c54a4ca2b5e32ddd3870f1f94bcc7bdffd7ecbf08373b1a5713e2b9820095b3c59618462025ae0a089d6c6e6088885764f3eeb1ce485fb

data/CHANGELOG.md

@@ -0,0 +1,54 @@
+# Changelog
+
+### Next Release
+
+* Your contribution here
+
+### v0.0.18 (2015-04-18)
+
+- Greatly improve output on failure (Show the diff even if approved file is missing, don't complain if there's no .approvals file, print diff command before showing each diff for better context, and reverse the order of the arguments to the diff so that the additions/removals make sense). - [@randycoulman](https://github.com/randycoulman)
+- General improvements (fix typos, replace PNG badges with SVG ones) - [@jamonholmgren](https://github.com/jamonholmgren), [@olivierlacan](https://github.com/olivierlacan)
+
+### v0.0.17 (2014-10-10)
+
+- [#55](https://github.com/kytrinyx/approvals/pull/55) Upgrade to RSpec 3.1 - [@Willianvdv](https://github.com/Willianvdv)
+
+### v0.0.16 (2014-05-19)
+
+- General improvements (refactoring, simplify travis build, fix whitespace issues) - [@zph](https://github.com/zph), [@markijbema](https://github.com/markijbema)
+- Ignore trailing whitespace when making assertions. - [@kytrinyx](https://github.com/kytrinyx)
+
+### v0.0.15 (2014-04-05)
+
+- [#46](https://github.com/kytrinyx/approvals/pull/46) Improve handling of malformed HTML. - [@hotgazpacho](https://github.com/hotgazpacho)
+
+### v0.0.14 (2014-04-05)
+
+- [#48](https://github.com/kytrinyx/approvals/pull/48) Fix CLI namespace clash. - [@zph](https://github.com/zph)
+
+### v0.0.13 (2014-03-10)
+
+- Allow verifying hashes and arrays as json. - [@markijbema](https://github.com/markijbema)
+- Add support for RSpec 3.0. - [@markijbema](https://github.com/markijbema)
+- General improvements (documentation, README, refactoring). - [@markijbema](https://github.com/markijbema), [@kytrinyx](https://github.com/kytrinyx)
+
+### v0.0.12 (2014-02-16)
+
+- [#34](https://github.com/kytrinyx/approvals/pull/34) Make default formatter configurable. - [@markijbema](https://github.com/markijbema)
+- Update dependencies, and lock them to major releases.
+- Add a license to the gemspec.
+- Add a default rake task.
+
+### v0.0.11 (2014-02-16)
+
+- [#33](https://github.com/kytrinyx/approvals/pull/33) Append a trailing newline to all approval files. - [@markijbema](https://github.com/markijbema)
+
+### v0.0.10 (2014-01-30)
+
+- [#9](https://github.com/kytrinyx/approvals/pull/9) Add option to let RSpec handle diffing when approval fails. - [@jeremyruppel](https://github.com/jeremyruppel)
+- [#19](https://github.com/kytrinyx/approvals/pull/19) Switch rspec fail_with args so diff is correct. - [@bmarini](https://github.com/bmarini)
+- Fix build, clean up specs, add badges, add CHANGELOG, fix warnings. - [@markijbema](https://github.com/markijbema)
+
+### v0.0.9 (2013-10-08)
+
+Before this version, no changelog was maintained

data/README.md

@@ -1,9 +1,9 @@
 # Approvals
 
-[![Build Status](https://secure.travis-ci.org/kytrinyx/approvals.png?branch=master)](http://travis-ci.org/kytrinyx/approvals)
-[![Gem Version](https://badge.fury.io/rb/approvals.png)](http://badge.fury.io/rb/approvals)
-[![Code Climate](https://codeclimate.com/github/kytrinyx/approvals.png)](https://codeclimate.com/github/kytrinyx/approvals)
-[![Gemnasium](https://gemnasium.com/kytrinyx/approvals.png)](https://gemnasium.com/kytrinyx/approvals)
+[![Build Status](https://secure.travis-ci.org/kytrinyx/approvals.svg?branch=master)](http://travis-ci.org/kytrinyx/approvals)
+[![Gem Version](https://badge.fury.io/rb/approvals.svg)](http://badge.fury.io/rb/approvals)
+[![Code Climate](https://codeclimate.com/github/kytrinyx/approvals.svg)](https://codeclimate.com/github/kytrinyx/approvals)
+[![Gemnasium](https://gemnasium.com/kytrinyx/approvals.svg)](https://gemnasium.com/kytrinyx/approvals)
 
 
 Approvals are based on the idea of the *_golden master_*.
@@ -150,7 +150,7 @@ page = "<html><head></head><body><h1>ZOMG</h1></body></html>"
 Approvals.verify page, :format => :html
 
 data = "{\"beverage\":\"coffee\"}"
-Approvals.verify data, :format => :html
+Approvals.verify data, :format => :json
 ```
 
 In RSpec, it looks like this:

data/lib/approvals/approval.rb

@@ -86,7 +86,7 @@ module Approvals
     end
 
     def diff_path
-      "#{received_path} #{approved_path}"
+      "#{approved_path} #{received_path}"
     end
 
     def full_path(state)

data/lib/approvals/cli.rb

@@ -4,17 +4,20 @@ module Approvals
   class CLI < Thor
 
     desc "verify", "Go through all failing approvals with a diff tool"
-    method_option :diff, :type => :string, :default => 'diff', :aliases => '-d', :desc => 'The difftool to use. e.g. opendiff, vimdiff, etc.'
+    method_option :diff, :type => :string, :default => 'diff -N', :aliases => '-d', :desc => 'The difftool to use. e.g. opendiff, vimdiff, etc.'
     method_option :ask, :type => :boolean, :default => true, :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}")
+        diff_command = "#{options[:diff]} #{approval}"
+        puts diff_command
+        system(diff_command)
 
         if options[:ask] && yes?("Approve? [y/N] ")
-          system("mv #{approval}")
+          approved, received = *approval.split
+          system("mv #{received} #{approved}")
         else
           rejected << approval
         end

data/lib/approvals/dotfile.rb

@@ -20,7 +20,7 @@ module Approvals
       end
 
       def includes?(text)
-        system("cat #{path} | grep -q \"^#{text}$\"")
+        system("cat #{path} 2> /dev/null | grep -q \"^#{text}$\"")
       end
 
       def write(text)

data/lib/approvals/version.rb

@@ -1,3 +1,3 @@
 module Approvals
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approvals
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -76,7 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Changelog.md
+- CHANGELOG.md
 - Gemfile
 - License.txt
 - README.md

data/Changelog.md

@@ -1,27 +0,0 @@
-# Changelog
-
-### HEAD
-
-- Allow to verify hashes and arrays as json
-
-- Added support for RSpec 3.0
-
-### 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