check_please 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c12644a3f83d1d263374a88b825a9f705f55d68582e90a50a3065ec2b0105e
-  data.tar.gz: 3f5ddc8b0d9e5c02bc4845e5a4ac21d07b358f75639146f32c71143bc1e6d605
+  metadata.gz: 2bd44bf6bcc771bf5d0179fa562f5ddff80f0ed4bb2420ede197d60007d8057d
+  data.tar.gz: 7c0725d4b8cf3d03d7c8ffd2e8df51a8e5a1616e86c4cad02695dca73921340f
 SHA512:
-  metadata.gz: c95071934105bc8c8876287bf460a0466ecc996eab6356c64a994566824c95d2f24d6d446bc8bcc6d4d66b0a224023a4347839e75f5d8204860e9e2210e7e07d
-  data.tar.gz: ebdbe6bdeafd3f71bf9461f5eccd73f20772043d9e84ab01fa91c0a1dcff054a21c74d718aa40cf0c89bed3219d36d1f46e89ce37ea6d27483bb268518bb7d59
+  metadata.gz: 0add2fc010b651ae30a1309c3df9b26c1280e40fc7c45b5214ad22922fb3103c533f0f0ebbf26d46c3dbfb97b09d36ded3c9a419818039437aed2d198ced4669
+  data.tar.gz: 88611e7acca8a803f69e48ddefddfbc208faeae359fc3417b0f0faa0aae11e853a45891919290abd062f503558f0caedc3b05fa037397f3b4142b11a3905245c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    check_please (0.5.3)
+    check_please (0.5.4)
       table_print
 
 GEM

data/lib/check_please.rb

@@ -7,17 +7,18 @@ require "check_please/error"
 require "check_please/version"
 
 module CheckPlease
-  autoload :Reification, "check_please/reification"
-  autoload :CLI,         "check_please/cli"
-  autoload :Comparison,  "check_please/comparison"
-  autoload :Diff,        "check_please/diff"
-  autoload :Diffs,       "check_please/diffs"
-  autoload :Flag,        "check_please/flag"
-  autoload :Flags,       "check_please/flags"
-  autoload :Path,        "check_please/path"
-  autoload :PathSegment, "check_please/path_segment"
-  autoload :Printers,    "check_please/printers"
-  autoload :Refinements, "check_please/refinements"
+  autoload :Reification,        "check_please/reification"
+  autoload :CLI,                "check_please/cli"
+  autoload :Comparison,         "check_please/comparison"
+  autoload :Diff,               "check_please/diff"
+  autoload :Diffs,              "check_please/diffs"
+  autoload :Flag,               "check_please/flag"
+  autoload :Flags,              "check_please/flags"
+  autoload :Path,               "check_please/path"
+  autoload :PathSegment,        "check_please/path_segment"
+  autoload :PathSegmentMatcher, "check_please/path_segment_matcher"
+  autoload :Printers,           "check_please/printers"
+  autoload :Refinements,        "check_please/refinements"
 end
 
 

data/lib/check_please/comparison.rb

@@ -13,7 +13,7 @@ module CheckPlease
       catch(:max_diffs_reached) do
         compare reference, candidate, CheckPlease::Path.root
       end
-      diffs
+      diffs.filter_by_flags(@flags)
     end
 
     private

data/lib/check_please/diffs.rb

@@ -47,6 +47,11 @@ module CheckPlease
       @list.map(&:attributes)
     end
 
+    def filter_by_flags(flags)
+      new_list = @list.reject { |diff| Path.new(diff.path).excluded?(flags) }
+      self.class.new(new_list, flags: flags)
+    end
+
     def to_s(flags = {})
       CheckPlease::Printers.render(self, flags)
     end

data/lib/check_please/path.rb

@@ -17,7 +17,12 @@ module CheckPlease
     def initialize(name_or_segments = [])
       case name_or_segments
       when String, Symbol, Numeric, nil
-        names = name_or_segments.to_s.split(SEPARATOR)
+        string = name_or_segments.to_s
+        if string =~ %r(//)
+          raise InvalidPath, "paths cannot have empty segments"
+        end
+
+        names = string.split(SEPARATOR)
         names.shift until names.empty? || names.first =~ /\S/
         segments = PathSegment.reify(names)
       when Array
@@ -26,10 +31,6 @@ module CheckPlease
         raise InvalidPath, "not sure what to do with #{name_or_segments.inspect}"
       end
 
-      if segments.any?(&:empty?)
-        raise InvalidPath, "#{self.class.name} cannot contain empty segments"
-      end
-
       @segments = Array(segments)
 
       @to_s = SEPARATOR + @segments.join(SEPARATOR)
@@ -124,7 +125,7 @@ module CheckPlease
     # (as of this writing, this should never actually happen, but I'm being thorough)
     def ancestor_on_list?(paths)
       paths.any? { |path|
-        ancestors.any? { |ancestor| ancestor == path }
+        ancestors.any? { |ancestor| ancestor.match?(path) }
       }
     end
 
@@ -153,7 +154,7 @@ module CheckPlease
 
     # O(n) check to see if the path itself is on a list
     def self_on_list?(paths)
-      paths.any? { |path| self == path }
+      paths.any? { |path| self.match?(path) }
     end
 
     def too_deep?(flags)

data/lib/check_please/path_segment.rb

@@ -30,19 +30,16 @@ module CheckPlease
 
     def initialize(name = nil)
       @name = name.to_s.strip
-      if @name =~ %r(\s) # has any whitespace
-        raise InvalidPathSegment, <<~EOF
-          #{name.inspect} is not a valid #{self.class} name
-        EOF
+
+      case @name
+      when "", /\s/ # blank or has any whitespace
+        raise InvalidPathSegment, "#{name.inspect} is not a valid #{self.class} name"
       end
+
       parse_key_and_value
       freeze
     end
 
-    def empty?
-      name.empty?
-    end
-
     def key_expr?
       name.match?(KEY_EXPR)
     end
@@ -52,23 +49,12 @@ module CheckPlease
     end
 
     def match?(other_segment_or_string)
-      other = self.class.reify(other_segment_or_string)
-
-      match_types = [ self.match_type, other.match_type ]
-      case match_types
-      when [ :plain,     :plain     ] ; self.name == other.name
-      when [ :key,       :key_value ] ; self.key  == other.key
-      when [ :key_value, :key       ] ; self.key  == other.key
-      else                            ; false
-      end
+      other = reify(other_segment_or_string)
+      PathSegmentMatcher.call(self, other)
     end
 
-    protected
-
-    def match_type
-      return :key       if key_expr?
-      return :key_value if key_val_expr?
-      :plain
+    def splat?
+      name == '*'
     end
 
     private

data/lib/check_please/path_segment_matcher.rb

@@ -0,0 +1,44 @@
+module CheckPlease
+
+  class PathSegmentMatcher
+    def self.call(a,b)
+      new(a,b).call
+    end
+
+    attr_reader :a, :b, :types
+    def initialize(a, b)
+      @a, @b = a, b
+      @types = [ _type(a), _type(b) ].sort
+    end
+
+    def call
+      return true             if either?(:splat)
+      return a.name == b.name if both?(:plain)
+      return a.key  == b.key  if key_and_key_value?
+
+      false
+    end
+
+    private
+
+    def _type(x)
+      return :splat     if x.splat?
+      return :key       if x.key_expr?
+      return :key_value if x.key_val_expr?
+      :plain
+    end
+
+    def both?(type)
+      types.uniq == [type]
+    end
+
+    def either?(type)
+      types.include?(type)
+    end
+
+    def key_and_key_value?
+      types == [ :key, :key_value ]
+    end
+  end
+
+end

data/lib/check_please/version.rb

@@ -1,5 +1,5 @@
 module CheckPlease
   # NOTE: 'check_please_rspec_matcher' depends on this,
   #       so try to keep them roughly in sync
-  VERSION = "0.5.3" # about to release? rerun `bundle lock` to update Gemfile.lock
+  VERSION = "0.5.4" # about to release? rerun `bundle lock` to update Gemfile.lock
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: check_please
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Sam Livingston-Gray
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: table_print
@@ -87,6 +87,7 @@ files:
 - lib/check_please/flags.rb
 - lib/check_please/path.rb
 - lib/check_please/path_segment.rb
+- lib/check_please/path_segment_matcher.rb
 - lib/check_please/printers.rb
 - lib/check_please/printers/base.rb
 - lib/check_please/printers/json.rb