code_manifest 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be523e36c254ee8749c037a2e1c9fa57dd10d2e86d83b49aed3349f56da72bdb
-  data.tar.gz: 6741764dfc73fc92fa87f9c5acfbba1fae8650c617a5aa15efabafec25bb8dd0
+  metadata.gz: 94f0a39e5da9d75029e1834402dd5bda25d18510d7eca6291c67876caf5aad17
+  data.tar.gz: 4b6d063a77093c6fd674964c15525808b6cd22e5d8d9d9770adb7c41421b4c9e
 SHA512:
-  metadata.gz: fc9bd31b43bdc5637de024cb0063f88519c09a3120025f452a5733fff4dfca6d1f4f9c5067866fea82395c846e3a2027388cfe7a74d77f50c13665fde43d6303
-  data.tar.gz: e802a2695b4409eb40fac80e9a79a0f88b1fcac45a4549c4be1a496540b4769d99ebbed2389ccb7deeca4bc5a002b1a8515eedd82930c2881ab6e391dc638bbf
+  metadata.gz: d3d985ad3f694e285c28ce13e3ec2036a939c5767ec8b6c6f6898d78b30eae608d68a680602155b5f866c78797328357ed34c88c0bd1818c22ffd659f9028d27
+  data.tar.gz: 19d20c8fd6756f2b92cb068add7b22e9005ff6c41f75b065bf096251000c75ec7b676a238b26345f934b29f73a0324c36a2d915214dc9116ee2788de61114fae

data/lib/code_manifest/manifest.rb

@@ -1,46 +1,63 @@
 # frozen_string_literal: true
 
-require 'set'
 require 'digest/md5'
 require_relative 'rule'
 
 module CodeManifest
   class Manifest
-    attr_reader :root
+    GLOB_OPTIONS = File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_EXTGLOB
+
+    attr_reader :root, :rules
 
     def initialize(root, patterns)
       @root = root
-      @patterns = patterns.map(&:to_s)
+      @rules ||= patterns.map do |pattern|
+        Rule.new(root, pattern)
+      end
     end
 
     def files
-      @files ||= (inclusion_rules.map(&:files).reduce(Set.new, :merge) - exclusion_rules.map(&:files).reduce(Set.new, :merge)).sort.to_set
+      @files ||= (inclusion_files - exclusion_files).sort!.freeze
     end
 
     def digest
       @digest ||= begin
         digests = files.map { |file| Digest::MD5.file(root.join(file)).hexdigest }
-        Digest::MD5.hexdigest(digests.join)
+        Digest::MD5.hexdigest(digests.join).freeze
       end
     end
 
+    def matches(paths)
+      result_paths = paths.select { |path| inclusion_rules.any? { |rule| rule.match?(path) } }
+      result_paths.reject! { |path| exclusion_files.any? { |rule| rule.match?(path) } }
+
+      result_paths
+    end
+
     private
 
-    def rules
-      @rules ||= @patterns.each_with_object([]) do |pattern, rules|
-        pattern = pattern.strip
-        unless pattern.match?(/\A(#|\z)/)
-          rules << Rule.new(root, pattern)
-        end
-      end
+    def inclusion_files
+      @inclusion_files ||= files_with_relative_path(Dir.glob(inclusion_rules.map(&:glob), GLOB_OPTIONS))
     end
 
     def inclusion_rules
       @inclusion_rules ||= rules.reject(&:exclude)
     end
 
+    def exclusion_files
+      @exclusion_files ||= files_with_relative_path(Dir.glob(exclusion_rules.map(&:glob), GLOB_OPTIONS))
+    end
+
     def exclusion_rules
       @exclusion_rules ||= rules.select(&:exclude)
     end
+
+    def files_with_relative_path(files)
+      files.map do |file|
+        pathname = Pathname.new(file)
+        next if pathname.directory?
+        pathname.relative_path_from(root.expand_path).to_s
+      end.compact
+    end
   end
 end

data/lib/code_manifest/rule.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module CodeManifest
   class Rule
-    GLOB_OPTIONS = File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_EXTGLOB
-
-    attr_reader :exclude
-    attr_reader :glob
+    attr_reader :exclude, :glob
 
     def initialize(root, pattern)
       @root = root
       @exclude = false
       @glob = @root
 
-      if pattern[0] == '!'
+      if pattern.start_with?('!')
         @exclude = true
         pattern = pattern[1..-1]
       end
@@ -26,21 +25,11 @@ module CodeManifest
       @glob = @glob.join(pattern).to_s
     end
 
-    def files
-      @files ||= begin
-        matched = Dir.glob(glob, GLOB_OPTIONS)
-        matched.map! { |file| Pathname.new(file) }
-        matched.reject!(&:directory?)
-        matched.map! { |file| file.relative_path_from(@root.expand_path).to_s }
-        Set.new(matched.sort!)
-      end
-    end
-
     def match?(file)
       file = Pathname.new(file)
       file = @root.join(file) unless file.absolute?
 
-      File.fnmatch?(glob, file.to_s, GLOB_OPTIONS)
+      File.fnmatch?(glob, file.to_s, Manifest::GLOB_OPTIONS)
     end
   end
 end

data/lib/code_manifest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodeManifest
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/code_manifest.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
+require 'pathname'
 require 'yaml'
-require_relative "code_manifest/version"
-require_relative "code_manifest/manifest"
+require_relative 'code_manifest/version'
+require_relative 'code_manifest/manifest'
 
 module CodeManifest
   class Error < StandardError; end
 
-  DOTFILE = '.code_manifest.yml'.freeze
+  DOTFILE = '.code_manifest.yml'
   KEY_PATTERN = /[a-z_0-9]+/.freeze
 
   class << self
@@ -19,18 +20,18 @@ module CodeManifest
 
     def manifests
       @manifests ||= begin
-        config_file = traverse_files(DOTFILE, Dir.pwd)
+        manifest_file = traverse_files(DOTFILE, Dir.pwd)
 
-        raise "#{DOTFILE} was not found in your project directory, please check README for instructions." unless config_file
+        unless manifest_file
+          raise "#{DOTFILE} was not found in your project directory, please check README for instructions."
+        end
 
-        root = Pathname.new(config_file).dirname
+        root = Pathname.new(manifest_file).dirname
 
-        YAML.load_file(config_file).each_with_object({}) do |(name, patterns), collection|
+        load_manifest(manifest_file).each_with_object({}) do |(name, patterns), collection|
           next unless name.match?(KEY_PATTERN)
 
-          if collection.key?(name)
-            raise ArgumentError, "#{name} defined multiple times in #{DOTFILE}"
-          end
+          raise ArgumentError, "#{name} defined multiple times in #{DOTFILE}" if collection.key?(name)
 
           collection[name] = Manifest.new(root, patterns)
         end
@@ -43,5 +44,12 @@ module CodeManifest
         return file.to_s if file.exist?
       end
     end
+
+    # https://stackoverflow.com/a/71192990
+    def load_manifest(file)
+      YAML.load_file(file, aliases: true)
+    rescue ArgumentError
+      YAML.load_file(file)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_manifest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec