minitest-filesystem 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db73e422e4760423081870612b857aaa490430d8
-  data.tar.gz: 77e25a5ca198b8b23706db1c57f182a123446eae
+  metadata.gz: a1f50869c9e1a8567409b58a165057b3e23766bc
+  data.tar.gz: f51c45d5eb02b7efa117ba22ae50086750379e04
 SHA512:
-  metadata.gz: 5e58da2037fbc107914fdfbc7787c7040e203ce0b7081c79e1793050aacbdc20a84471e90f70f49362853e605cedf6e008626ba8979dec746729f662978a20cc
-  data.tar.gz: d829f92388c3762ddadbf0e82342b72f8e21ab8ada64ca7f9f81334f4fb2cda0e3c1961b958c52bc34b6528ba1c7d6d85f845329f5fb6dca80a10b508d692341
+  metadata.gz: e482bc5bfe18c51fcc4288d57462f5927b9c6378b84e291d99eadd425731332beddaa6674ad66ecc021ba7f522d4e1c91e3922fe0f01a99b8c875da763e13de3
+  data.tar.gz: 5f4e68d4dc3563af02e74348e69c2fbb2c2c9ab647d3ccc8e338c54c6d69a95beea86209de2abeb3bf71492b950c847edd783a86ffd1d2f66849055a315a87c7

data/README.md

@@ -86,6 +86,10 @@ directories inside `root_dir` that the matcher won't care about).
 
 ## Changelog
 
+### 1.1.1
+
+* Minor refactorings and project infrastructure updates.
+
 ### 1.1.0
 
 * Add support for testing symbolic links

data/Rakefile

@@ -9,4 +9,14 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+desc "Analyze code duplication"
+task :flay do
+  system "flay lib/**/*.rb"
+end
+
+desc "Analyze code complexity"
+task :flog do
+  system "find lib -name \*.rb | xargs flog"
+end
+
 task :default => :test

data/lib/minitest/filesystem/matcher.rb

@@ -10,17 +10,17 @@ module Minitest
       end
 
       def file(file)
-        entry(file, :file) && is_a?(file, :file)
+        exists?(file, :file)
       end
 
       def link(link, target=nil)
-        entry(link, :symlink) && is_a?(link, :symlink) && is_target_correct?(link, target)
+        exists?(link, :symlink) && is_target_correct?(link, target)
       end
 
       def dir(dir, &block)
         matcher = self.class.new(@actual_tree.expand_path(dir), &block) if block_given?
 
-        entry(dir, :directory) && is_a?(dir, :directory) && subtree(matcher)
+        exists?(dir, :directory) && subtree(matcher)
       end
 
       def match_found?
@@ -34,17 +34,33 @@ module Minitest
 
       private
 
+      # Checks existance of specified entry.
+      # Existance is defined both in terms of presence and of being of the
+      # right type (e.g. a file being a file and not a directory)
+      def exists?(entry, kind=:entry)
+        entry(entry, kind) && is_a?(entry, kind)
+      end
+
+      # Checks if an entry with given name exists.
       def entry(entry, kind=:entry)
         update_matching_status(
           @actual_tree.include?(entry),
           not_found_msg_for(entry, kind))
       end
 
+      # Checks if a specific entry (supposed to exist) is of a given kind.
+      def is_a?(entry, kind)
+        update_matching_status(
+          @actual_tree.is_a?(entry, kind),
+          mismatch_msg_for(entry, kind))
+      end
+
+      # Checks the target of a symbolic link.
       def is_target_correct?(link, target)
         return true unless target
 
         update_matching_status(
-          @actual_tree.expand_path(target) == follow_link(@actual_tree.expand_path(link)),
+          @actual_tree.has_target?(link, target),
           link_target_mismatch_msg_for(link, target))
       end
 
@@ -52,16 +68,6 @@ module Minitest
         update_matching_status(matcher.match_found?, matcher.message) if matcher
       end
 
-      def follow_link(link)
-        Pathname.new(File.readlink(link))
-      end
-
-      def is_a?(entry, kind)
-        update_matching_status(
-          @actual_tree.is_a?(entry, kind),
-          mismatch_msg_for(entry, kind))
-      end
-
       def update_matching_status(check, msg)
         @is_matching = @is_matching && check
         set_failure_msg(msg) unless @is_matching
@@ -78,7 +84,7 @@ module Minitest
       end
 
       def link_target_mismatch_msg_for(link, target)
-        "Expected `#{link}` to point to `#{target}`, but it pointed to #{File.readlink(@actual_tree.expand_path(link))}"
+        "Expected `#{link}` to point to `#{target}`, but it pointed to #{@actual_tree.follow_link(link)}"
       end
 
       def set_failure_msg(msg)
@@ -100,11 +106,19 @@ module Minitest
         def is_a?(entry, kind)
           (expand_path entry).send("#{kind}?")
         end
+        
+        def has_target?(entry, target)
+          expand_path(target) == follow_link(entry)
+        end
 
         def expand_path(file)
           @root + Pathname.new(file)
         end
 
+        def follow_link(link)
+          Pathname.new(File.readlink(expand_path(link)))
+        end
+
         private
         
         def expand_tree_under(dir)

data/lib/minitest/filesystem/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Filesystem
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/minitest-filesystem.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "flog"
+  gem.add_development_dependency "flay"
 
   gem.signing_key = Pathname.new(signing_key_file).expand_path if signing_key_file
   gem.cert_chain  = ["rubygems-stefanozanella.crt"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-filesystem
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Stefano Zanella
@@ -29,7 +29,7 @@ cert_chain:
   RigBD0E3/t/ABjCXkmqwp5gnAZmP8JiVUkn8rp5E0FXvC8T7nsPs2TW/TAmUV6rN
   hK25FX8YWgT9fD9y3PpWjiYcrCo=
   -----END CERTIFICATE-----
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: flay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Minitest exstension to check filesystem contents
 email:
 - zanella.stefano@gmail.com