assert_dirs_equal 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf396e81ffce0b83fd79a9218cf036385b0c695
-  data.tar.gz: 000fafee50178f01fd58bc5da8cb01948091f592
+  metadata.gz: aa4cdc7043d5798e78745e4a6fa8e03659516168
+  data.tar.gz: 54334a10d86c433bafa573757102dbd0a915a906
 SHA512:
-  metadata.gz: 5396b72a55da522376094401f159b0ef3bc46e96503532c8e3d766132e4ac44bb5e7935903e19d7c4777e722e955a132a2e19388f81e08b47bc512d7045a0737
-  data.tar.gz: caff9934d55bb2000b8b4059ab0e339b86491ad91db47f5a27934a17539c4bf951411dd8eee3852e47730fbe03eb55cdc64996f6b62bd1d203968c838f681cd2
+  metadata.gz: b61f753c46796ed63928ee2f0ab1fe06b1ed0be71f6f6cb6cb180d0e31b9eb8667d993131070938833b247b71d3ed77b31096a14d3dc9d0a2fda6eb2acc3dbaf
+  data.tar.gz: 606d3e449e37a2050a84834363513cb6dfdb576a8e9c02ac73574b800b460136f1bb02b6bdf5c6a4d455ca4a53058645485708100c7e7fc6dc3a894c8f6ecf10

data/CHANGELOG.md

@@ -1 +1,7 @@
 ## Unreleased
+
+## 0.1.1
+
+### Bug fixes
+
+* Binary files are compared by content, not by size

data/README.md

@@ -12,7 +12,7 @@ Production ready.
 
 ## Documentation
 
-[Released version](http://rubydoc.info/gems/assert_dirs_equal/0.1.0)
+[Released version](http://rubydoc.info/gems/assert_dirs_equal/0.1.1)
 
 ## Why
 
@@ -58,6 +58,12 @@ end
 
 TODO
 
+## Known issues
+
+Due that Rubinius String#strip doesn't fail on binary data (undocumented behaviour), the library will
+try to actually diff binary files. Depending on your test framework's diffing tool, it may or may not
+be a problem. For example, Minitest is not affected, since it uses shell `diff` under the hood.
+
 ## Origin
 
 Extracted from [Torba][torba-github] library since it looks more like a standalone component.

data/assert_dirs_equal.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "assert_dirs_equal"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Andrii Malyshko"]
   spec.email         = ["mail@nashbridges.me"]
   spec.description   = "Test assertion for directories equality by tree and content comparison"

data/lib/assert_dirs_equal/matcher.rb

@@ -46,18 +46,18 @@ module AssertDirsEqual
     def assert_equal_content(expected, target)
       return true if File.directory?(expected) && File.directory?(target)
 
-      expected_content = File.read(expected).strip
-      target_content = File.read(target).strip
+      expected_content = File.read(expected)
+      target_content = File.read(target)
+
+      expected_content = expected_content.strip
+      target_content = target_content.strip
 
       expected_content == target_content || fail_with(
         "expected #{target.inspect} to have same content as #{expected.inspect}:\n#{Diff.perform(expected_content, target_content)}"
       )
     rescue ArgumentError # strip on binary file
-      expected_size = File.size(expected)
-      target_size = File.size(target)
-
-      expected_size == target_size || fail_with(
-        "expected #{target.inspect} to be the same size as #{expected.inspect}"
+      expected_content == target_content || fail_with(
+        "expected #{target.inspect} to be the same as #{expected.inspect}"
       )
     end
 

data/test/cases/same_text_files_with_trailing_newline/expected/file

@@ -0,0 +1 @@
+hello

data/test/cases/same_text_files_with_trailing_newline/target/file

@@ -0,0 +1,2 @@
+hello
+

data/test/matcher_test.rb

@@ -31,23 +31,12 @@ module AssertDirsEqual
       assert_equal "expected \"#{target_dir}\" to be a directory", matcher.failure_message
     end
 
-    def test_empty_dirs_are_equal
-      @case_directory = "test/cases/empty_dirs_are_equal"
-      assert matcher.matches?(target_dir), matcher.failure_message
-    end
-
     def test_missing_file_in_target
       @case_directory = "test/cases/missing_file_in_target"
       refute matcher.matches?(target_dir)
       assert_equal "expected \"#{target_dir}/file\" to exist since \"#{expected_dir}/file\" exists", matcher.failure_message
     end
 
-    def test_missing_directory_in_target
-      @case_directory = "test/cases/missing_directory_in_target"
-      refute matcher.matches?(target_dir)
-      assert_equal "expected \"#{target_dir}/directory\" to exist since \"#{expected_dir}/directory\" exists", matcher.failure_message
-    end
-
     def test_missing_nested_file_in_target
       @case_directory = "test/cases/missing_nested_file_in_target"
       refute matcher.matches?(target_dir)
@@ -74,21 +63,29 @@ MSG
       assert matcher.matches?(target_dir), matcher.failure_message
     end
 
+    def test_same_text_files_with_trailing_newline
+      @case_directory = "test/cases/same_text_files_with_trailing_newline"
+      assert matcher.matches?(target_dir), matcher.failure_message
+    end
+
     def test_different_binary_files
+      skip_rubinius_string_strip
       @case_directory = "test/cases/different_binary_files"
       refute matcher.matches?(target_dir)
-      assert_equal "expected \"#{target_dir}/file.png\" to be the same size as \"#{expected_dir}/file.png\"", matcher.failure_message
+      assert_equal "expected \"#{target_dir}/file.png\" to be the same as \"#{expected_dir}/file.png\"", matcher.failure_message
     end
 
     def test_same_binary_files
+      skip_rubinius_string_strip
       @case_directory = "test/cases/same_binary_files"
       assert matcher.matches?(target_dir), matcher.failure_message
     end
 
     def test_binary_and_text_files
+      skip_rubinius_string_strip
       @case_directory = "test/cases/binary_and_text_files"
       refute matcher.matches?(target_dir)
-      assert_equal "expected \"#{target_dir}/file.txt\" to be the same size as \"#{expected_dir}/file.txt\"", matcher.failure_message
+      assert_equal "expected \"#{target_dir}/file.txt\" to be the same as \"#{expected_dir}/file.txt\"", matcher.failure_message
     end
 
     def test_extra_file_in_target

data/test/minitest_integration_test.rb

@@ -4,7 +4,7 @@ require "minitest/assert_dirs_equal"
 module AssertDirsEqual
   class MinitestIntegrationTest < Minitest::Test
     def test_successful_assert
-      @case_directory = "test/cases/empty_dirs_are_equal"
+      @case_directory = "test/cases/empty_files_are_equal"
       assert_dirs_equal expected_dir, target_dir
     end
 
@@ -24,7 +24,7 @@ module AssertDirsEqual
     end
 
     def test_failed_refute
-      @case_directory = "test/cases/empty_dirs_are_equal"
+      @case_directory = "test/cases/empty_files_are_equal"
 
       error = assert_raises(Minitest::Assertion) do
         refute_dirs_equal expected_dir, target_dir

data/test/test_helper.rb

@@ -9,4 +9,10 @@ class Minitest::Test
   def target_dir
     File.join(@case_directory, "target")
   end
+
+  def skip_rubinius_string_strip
+    if RUBY_ENGINE == "rbx"
+      skip "Rubinius doesn't fail on binary data with String#strip"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assert_dirs_equal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrii Malyshko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,15 +80,25 @@ files:
 - test/cases/empty_files_are_equal/expected/file
 - test/cases/empty_files_are_equal/target/file
 - test/cases/expected_is_not_a_dir/expected
+- test/cases/expected_is_not_a_dir/target/.keep
+- test/cases/extra_file_in_target/expected/.keep
+- test/cases/extra_file_in_target/target/.keep
 - test/cases/extra_file_in_target/target/file
 - test/cases/large_different_text_files/expected/file
 - test/cases/large_different_text_files/target/file
+- test/cases/missing_expected/.keep
 - test/cases/missing_file_in_target/expected/file
+- test/cases/missing_file_in_target/target/.keep
 - test/cases/missing_nested_file_in_target/expected/nested/file
+- test/cases/missing_nested_file_in_target/target/nested/.keep
+- test/cases/missing_target/expected/.keep
 - test/cases/same_binary_files/expected/file.png
 - test/cases/same_binary_files/target/file.png
 - test/cases/same_text_files/expected/file
 - test/cases/same_text_files/target/file
+- test/cases/same_text_files_with_trailing_newline/expected/file
+- test/cases/same_text_files_with_trailing_newline/target/file
+- test/cases/target_is_not_a_dir/expected/.keep
 - test/cases/target_is_not_a_dir/target
 - test/matcher_test.rb
 - test/minitest_integration_test.rb
@@ -127,15 +137,25 @@ test_files:
 - test/cases/empty_files_are_equal/expected/file
 - test/cases/empty_files_are_equal/target/file
 - test/cases/expected_is_not_a_dir/expected
+- test/cases/expected_is_not_a_dir/target/.keep
+- test/cases/extra_file_in_target/expected/.keep
+- test/cases/extra_file_in_target/target/.keep
 - test/cases/extra_file_in_target/target/file
 - test/cases/large_different_text_files/expected/file
 - test/cases/large_different_text_files/target/file
+- test/cases/missing_expected/.keep
 - test/cases/missing_file_in_target/expected/file
+- test/cases/missing_file_in_target/target/.keep
 - test/cases/missing_nested_file_in_target/expected/nested/file
+- test/cases/missing_nested_file_in_target/target/nested/.keep
+- test/cases/missing_target/expected/.keep
 - test/cases/same_binary_files/expected/file.png
 - test/cases/same_binary_files/target/file.png
 - test/cases/same_text_files/expected/file
 - test/cases/same_text_files/target/file
+- test/cases/same_text_files_with_trailing_newline/expected/file
+- test/cases/same_text_files_with_trailing_newline/target/file
+- test/cases/target_is_not_a_dir/expected/.keep
 - test/cases/target_is_not_a_dir/target
 - test/matcher_test.rb
 - test/minitest_integration_test.rb