moonshard 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f6a34f5d9df3e406dc7deb5abe08c9b3286d73f5a252096a22f717cb691539
-  data.tar.gz: 48376f7947cadd24a7066e23575c449fea4977662a3ba337f0c5ff05f1bda040
+  metadata.gz: d18c56c8d60d654600cf9681405d9abf4420e430c98eaff816861c7eadece4ae
+  data.tar.gz: 3da4545e60a4fdefd3a2be759eadacae9d9fa6e415eba6f899ed69472709bf1e
 SHA512:
-  metadata.gz: a5047124bee729f517f154d913281e551bc4b15bbf7e024a35de3c83c748c38bcec2f2e2391c4a58cee1d3fb2bf7ad35c9bee3c2ee34fc4e18e9c9bd10285983
-  data.tar.gz: c5af09fde7932cd6d6f2e838741f1f8f07117fe56f5e0eb294eb8889ea04b080ddb544be59f4fc1bfe29ff23b4a9984198c567b0c11721ffd2b34e66fff2266f
+  metadata.gz: 8eafa7bd31a734ba77b4a5b1d3fe46c268c3eef1b188c23f0b748ca3e9da923b57e4e721869b31b46b25ce79628ec8faa15532d2938621819324dcff29185be9
+  data.tar.gz: 949cde414a606d182d34955bf719621684f4e00b44cb066e343a23d9d48d63d7870b5aa071a696adcb5dbe76378ebcb220450cc7c52c0679ef16425de114cfeb

data/lib/moonshard.rb

@@ -2,7 +2,6 @@ require "json"
 
 module Moonshard
   DEFAULT_BACKUP_FILE = "original_files.json"
-  PLACEHOLDER = '##{'
 
   class Error < StandardError
   end
@@ -30,7 +29,7 @@ module Moonshard
 
     original_files.each do |file, content|
       begin
-        File.binwrite(file, content)
+        File.write(file, content)
         puts "Restored: #{file}"
       rescue => e
         warn "Warning: cannot restore #{file}: #{e.message}"
@@ -51,90 +50,55 @@ module Moonshard
     Dir.glob(File.join(root_dir, "**", "*")).each do |file|
       next unless File.file?(file)
 
-      # Don't process the backup JSON itself.
+      # Don't process the backup JSON itself
       next if File.expand_path(file) == backup_file
 
       begin
-        # Read as raw bytes so binary files don't cause UTF-8 errors.
-        content = File.binread(file)
+        content = File.read(file)
       rescue => e
         warn "Warning: cannot read #{file}: #{e.message}"
         next
       end
 
-      # Only consider files containing the ##{ marker.
-      next unless content.include?(PLACEHOLDER)
+      # Only process files containing ##{...}
+      next unless content.match?(/##\{[^}]+\}/)
 
-      begin
-        text = content.dup.force_encoding(Encoding::UTF_8)
-
-        # Skip binary / invalid UTF-8 files.
-        unless text.valid_encoding?
-          warn "Skipping binary/non-UTF-8 file: #{file}"
-          next
-        end
-
-        file_dir = File.dirname(file)
-
-        replaced = text.gsub(/^([ \t]*)##\{([^}]+)\}[ \t]*$/) do
-          indentation = Regexp.last_match(1)
-          referenced_file = Regexp.last_match(2)
-
-          referenced_path = File.expand_path(
-            referenced_file,
-            file_dir
-          )
-
-          unless File.file?(referenced_path)
-            warn "Warning: file not found: #{referenced_path} " \
-                 "(referenced from #{file})"
+      # Save original content before replacement
+      original_files[file] = content
 
-            next Regexp.last_match(0)
-          end
-
-          begin
-            inserted_content = File.binread(referenced_path)
-            inserted_content.force_encoding(Encoding::UTF_8)
+      file_dir = File.dirname(file)
 
-            unless inserted_content.valid_encoding?
-              warn "Warning: referenced file is not valid UTF-8: " \
-                   "#{referenced_path}"
+      replaced = content.gsub(/^([ \t]*)##\{([^}]+)\}[ \t]*$/) do
+        indentation = Regexp.last_match(1)
+        referenced_file = Regexp.last_match(2)
 
-              next Regexp.last_match(0)
-            end
-          rescue => e
-            warn "Warning: cannot read #{referenced_path}: #{e.message}"
-            next Regexp.last_match(0)
-          end
+        referenced_path = File.expand_path(
+          referenced_file,
+          file_dir
+        )
 
-          # Remove the final newline because the placeholder line
-          # already provides the newline.
-          inserted_content = inserted_content.chomp
-
-          # Apply the indentation from the ##{...} line to
-          # every non-empty line of the referenced file.
-          inserted_content.lines.map do |line|
-            if line.strip.empty?
-              line
-            else
-              indentation + line
-            end
-          end.join
+        unless File.file?(referenced_path)
+          warn "Warning: file not found: #{referenced_path} (referenced from #{file})"
+          next Regexp.last_match(0)
         end
 
-        next if replaced == text
+        inserted_content = File.read(referenced_path).chomp
 
-        # Save the original content before writing.
-        original_files[file] = text
+        # Apply the indentation of ##{...}
+        # to every non-empty line.
+        inserted_content.lines.map do |line|
+          if line.strip.empty?
+            line
+          else
+            indentation + line
+          end
+        end.join
+      end
 
-        File.binwrite(file, replaced)
+      next if replaced == content
 
-        puts "Updated: #{file}"
-      rescue ArgumentError => e
-        warn "Warning: cannot process #{file}: #{e.message}"
-      rescue => e
-        warn "Warning: cannot process #{file}: #{e.message}"
-      end
+      File.write(file, replaced)
+      puts "Updated: #{file}"
     end
 
     File.write(

data/moonshard.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "moonshard"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["Tommy Jeff"]
   spec.email         = ["threcius@gmail.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moonshard
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tommy Jeff