sigils.rb in spoom-1.1.12

- old
+ new
@@ -25,73 +25,78 @@
         STRICTNESS_INTERNAL,
       ].freeze, T::Array[String])
 
       SIGIL_REGEXP = T.let(/^#[\ t]*typed[\ t]*:[ \t]*(\w*)[ \t]*/.freeze, Regexp)
 
-      # returns the full sigil comment string for the passed strictness
-      sig { params(strictness: String).returns(String) }
-      def self.sigil_string(strictness)
-        "# typed: #{strictness}"
-      end
+      class << self
+        extend T::Sig
 
-      # returns true if the passed string is a valid strictness (else false)
-      sig { params(strictness: String).returns(T::Boolean) }
-      def self.valid_strictness?(strictness)
-        VALID_STRICTNESS.include?(strictness.strip)
-      end
+        # returns the full sigil comment string for the passed strictness
+        sig { params(strictness: String).returns(String) }
+        def sigil_string(strictness)
+          "# typed: #{strictness}"
+        end
 
-      # returns the strictness of a sigil in the passed file content string (nil if no sigil)
-      sig { params(content: String).returns(T.nilable(String)) }
-      def self.strictness_in_content(content)
-        SIGIL_REGEXP.match(content)&.[](1)
-      end
+        # returns true if the passed string is a valid strictness (else false)
+        sig { params(strictness: String).returns(T::Boolean) }
+        def valid_strictness?(strictness)
+          VALID_STRICTNESS.include?(strictness.strip)
+        end
 
-      # returns a string which is the passed content but with the sigil updated to a new strictness
-      sig { params(content: String, new_strictness: String).returns(String) }
-      def self.update_sigil(content, new_strictness)
-        content.sub(SIGIL_REGEXP, sigil_string(new_strictness))
-      end
+        # returns the strictness of a sigil in the passed file content string (nil if no sigil)
+        sig { params(content: String).returns(T.nilable(String)) }
+        def strictness_in_content(content)
+          SIGIL_REGEXP.match(content)&.[](1)
+        end
 
-      # returns a string containing the strictness of a sigil in a file at the passed path
-      # * returns nil if no sigil
-      sig { params(path: T.any(String, Pathname)).returns(T.nilable(String)) }
-      def self.file_strictness(path)
-        return nil unless File.file?(path)
-        content = File.read(path, encoding: Encoding::ASCII_8BIT)
-        strictness_in_content(content)
-      end
+        # returns a string which is the passed content but with the sigil updated to a new strictness
+        sig { params(content: String, new_strictness: String).returns(String) }
+        def update_sigil(content, new_strictness)
+          content.sub(SIGIL_REGEXP, sigil_string(new_strictness))
+        end
 
-      # changes the sigil in the file at the passed path to the specified new strictness
-      sig { params(path: T.any(String, Pathname), new_strictness: String).returns(T::Boolean) }
-      def self.change_sigil_in_file(path, new_strictness)
-        content = File.read(path, encoding: Encoding::ASCII_8BIT)
-        new_content = update_sigil(content, new_strictness)
+        # returns a string containing the strictness of a sigil in a file at the passed path
+        # * returns nil if no sigil
+        sig { params(path: T.any(String, Pathname)).returns(T.nilable(String)) }
+        def file_strictness(path)
+          return nil unless File.file?(path)
 
-        File.write(path, new_content, encoding: Encoding::ASCII_8BIT)
+          content = File.read(path, encoding: Encoding::ASCII_8BIT)
+          strictness_in_content(content)
+        end
 
-        strictness_in_content(new_content) == new_strictness
-      end
+        # changes the sigil in the file at the passed path to the specified new strictness
+        sig { params(path: T.any(String, Pathname), new_strictness: String).returns(T::Boolean) }
+        def change_sigil_in_file(path, new_strictness)
+          content = File.read(path, encoding: Encoding::ASCII_8BIT)
+          new_content = update_sigil(content, new_strictness)
 
-      # changes the sigil to have a new strictness in a list of files
-      sig { params(path_list: T::Array[String], new_strictness: String).returns(T::Array[String]) }
-      def self.change_sigil_in_files(path_list, new_strictness)
-        path_list.filter do |path|
-          change_sigil_in_file(path, new_strictness)
+          File.write(path, new_content, encoding: Encoding::ASCII_8BIT)
+
+          strictness_in_content(new_content) == new_strictness
         end
-      end
 
-      # finds all files in the specified directory with the passed strictness
-      sig do
-        params(
-          directory: T.any(String, Pathname),
-          strictness: String,
-          extension: String
-        ).returns(T::Array[String])
-      end
-      def self.files_with_sigil_strictness(directory, strictness, extension: ".rb")
-        paths = Dir.glob("#{File.expand_path(directory)}/**/*#{extension}").sort.uniq
-        paths.filter do |path|
-          file_strictness(path) == strictness
+        # changes the sigil to have a new strictness in a list of files
+        sig { params(path_list: T::Array[String], new_strictness: String).returns(T::Array[String]) }
+        def change_sigil_in_files(path_list, new_strictness)
+          path_list.filter do |path|
+            change_sigil_in_file(path, new_strictness)
+          end
+        end
+
+        # finds all files in the specified directory with the passed strictness
+        sig do
+          params(
+            directory: T.any(String, Pathname),
+            strictness: String,
+            extension: String
+          ).returns(T::Array[String])
+        end
+        def files_with_sigil_strictness(directory, strictness, extension: ".rb")
+          paths = Dir.glob("#{File.expand_path(directory)}/**/*#{extension}").sort.uniq
+          paths.filter do |path|
+            file_strictness(path) == strictness
+          end
         end
       end
     end
   end
 end