samagotchi 0.21.0 → 0.23.0

data/lib/samagotchi/memory_bundle/installer.rb

@@ -80,11 +80,9 @@ module Samagotchi
         rescue SourceNormalizer::UnknownSourceError => e
           raise InstallError, "Source normalization failed: #{e.message}"
         rescue Manifest::ValidationError => e
-          if @strict
-            raise InstallError, e.message
-          else
-            @warnings << "No manifest found — proceeding without strict manifest validation"
-          end
+          raise InstallError, e.message if @strict
+
+          @warnings << "No manifest found — proceeding without strict manifest validation"
         end
 
         # Determine target scope (CLI wins over manifest).
@@ -185,8 +183,9 @@ module Samagotchi
             end
           end
 
-          hook_entries.each do |basename, meta|
+          hook_entries.each do |basename, _meta|
             next unless basename.is_a?(String) && !basename.empty?
+
             all_hooks_in_bundle << basename
             src = File.join(normalized_dir, "hooks", basename)
             next unless File.exist?(src)
@@ -194,11 +193,11 @@ module Samagotchi
             dest = File.join(hooks_target, basename)
 
             if @dry_run
-              if File.exist?(dest) && !@force
-                @results[basename] = { status: "would_skip" }
-              else
-                @results[basename] = { status: "would_install" }
-              end
+              @results[basename] = if File.exist?(dest) && !@force
+                                     { status: "would_skip" }
+                                   else
+                                     { status: "would_install" }
+                                   end
               next
             end
 
@@ -207,10 +206,8 @@ module Samagotchi
               prev_meta = existing_provenance[:hooks] ? (existing_provenance[:hooks][basename.to_sym] || existing_provenance[:hooks][basename]) : nil
               if prev_meta
                 prev_sha = prev_meta[:sha256] || prev_meta["sha256"]
-                if File.exist?(dest)
-                  if !Provenance.recorded_sha(prev_sha).empty? && !Provenance.sha_matches?(dest, prev_sha)
-                    @warnings << "Hook #{basename} was locally modified; overwriting"
-                  end
+                if File.exist?(dest) && !Provenance.recorded_sha(prev_sha).empty? && !Provenance.sha_matches?(dest, prev_sha)
+                  @warnings << "Hook #{basename} was locally modified; overwriting"
                 end
               end
             end
@@ -249,11 +246,12 @@ module Samagotchi
           existing_provenance[:hooks].keys.each do |old_key|
             old_key_str = old_key.to_s
             next if all_hooks_in_bundle.include?(old_key_str)
+
             old_dest = File.join(hooks_target, old_key_str)
             if File.exist?(old_dest) && !@force
               @warnings << "Bundle no longer includes hook #{old_key_str} but local file exists — removing"
             end
-            FileUtils.rm_f(old_dest) if File.exist?(old_dest)
+            FileUtils.rm_f(old_dest)
           end
         end
 
@@ -261,14 +259,16 @@ module Samagotchi
         if manifest && @strict
           all_hooks_in_bundle.each do |basename|
             next if @conflicts.key?(basename)
+
             expected = manifest.checksum_for_hook(basename)
-            if expected
-              dest = File.join(hooks_target, basename)
-              next unless File.exist?(dest)
-              actual = Digest::SHA256.hexdigest(File.read(dest))
-              if actual != expected
-                @warnings << "Checksum mismatch for hook #{basename}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-              end
+            next unless expected
+
+            dest = File.join(hooks_target, basename)
+            next unless File.exist?(dest)
+
+            actual = Digest::SHA256.hexdigest(File.read(dest))
+            if actual != expected
+              @warnings << "Checksum mismatch for hook #{basename}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
             end
           end
         end
@@ -313,18 +313,21 @@ module Samagotchi
         if manifest && @strict
           all_files_in_bundle.each do |file_key|
             next if @conflicts.key?(file_key)
+
             status = @results[file_key] ? @results[file_key][:status].to_s : nil
             # skipped: not copied, so a local edit isn't a bad download.
             next if %w[kept kept_pruned fast_forward updated skipped].include?(status)
+
             # For dry-run, fast_forward would appear as "fast_forward", updated not yet
             target_path = File.join(target_dir, file_key)
             next unless File.exist?(target_path)
+
             expected = manifest.checksum_for(file_key)
-            if expected
-              actual = Digest::SHA256.hexdigest(File.read(target_path))
-              if actual != expected
-                @warnings << "Checksum mismatch for #{file_key}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
-              end
+            next unless expected
+
+            actual = Digest::SHA256.hexdigest(File.read(target_path))
+            if actual != expected
+              @warnings << "Checksum mismatch for #{file_key}: expected #{expected[0..7]}..., got #{actual[0..7]}..."
             end
           end
         end
@@ -342,18 +345,19 @@ module Samagotchi
             owned.each do |file_key|
               target_path = File.join(target_dir, file_key)
               next unless File.exist?(target_path)
+
               status = @results[file_key] ? @results[file_key][:status].to_s : nil
               if %w[kept noop conflict kept_pruned].include?(status)
                 # Keep old base snapshot — do not overwrite with edited current
                 # Use base snapshot as source if it exists to preserve old checksum
                 base_path = provenance.base_path(file_key)
-                if File.exist?(base_path)
-                  # Keep existing provenance entry by re-using base content
-                  # We still need to include it to prevent pruning, but with base content
-                  provenance_files[file_key] = base_path
-                else
-                  provenance_files[file_key] = target_path
-                end
+                provenance_files[file_key] = if File.exist?(base_path)
+                                               # Keep existing provenance entry by re-using base content
+                                               # We still need to include it to prevent pruning, but with base content
+                                               base_path
+                                             else
+                                               target_path
+                                             end
               else
                 # installed, updated, skipped — use current target (which is incoming for updated)
                 provenance_files[file_key] = target_path
@@ -364,14 +368,15 @@ module Samagotchi
               existing_provenance[:files].keys.each do |old_key|
                 old_key_str = old_key.to_s
                 next if all_files_in_bundle.include?(old_key_str)
+
                 # If it was kept_pruned, include it with base content to prevent pruning
-                if @results[old_key_str] && @results[old_key_str][:status].to_s == "kept_pruned"
-                  base_path = provenance.base_path(old_key_str)
-                  target_path = File.join(target_dir, old_key_str)
-                  # Use base if exists to keep old checksum, else target
-                  src = File.exist?(base_path) ? base_path : target_path
-                  provenance_files[old_key_str] = src if File.exist?(src)
-                end
+                next unless @results[old_key_str] && @results[old_key_str][:status].to_s == "kept_pruned"
+
+                base_path = provenance.base_path(old_key_str)
+                target_path = File.join(target_dir, old_key_str)
+                # Use base if exists to keep old checksum, else target
+                src = File.exist?(base_path) ? base_path : target_path
+                provenance_files[old_key_str] = src if File.exist?(src)
               end
             end
           else
@@ -393,6 +398,7 @@ module Samagotchi
           elsif hooks_files_for_provenance.any?
             hooks_files_for_provenance.each do |basename, path|
               next unless File.exist?(path)
+
               sha = Digest::SHA256.hexdigest(File.read(path))
               hooks_for_provenance[basename] = { "sha256" => "sha256:#{sha}", "event" => "", "on_error" => "skip", "priority" => 100 }
             end
@@ -418,6 +424,7 @@ module Samagotchi
         all_files_in_bundle.each do |file_key|
           file_path = File.join(target_dir, file_key)
           next unless File.exist?(file_path)
+
           names = Placeholder.detect_in_file(file_path)
           if names.any?
             @placeholder_warnings << "#{file_key}: {{#{names.join("}}, {{")}}}"
@@ -451,15 +458,15 @@ module Samagotchi
         removed = @results.select { |_, r| r[:status].to_s == "removed" }.keys
         would_remove = @results.select { |_, r| r[:status].to_s == "would_remove" }.keys
 
-        lines << "Installed: #{installed.join(', ')}" unless installed.empty?
-        lines << "Updated: #{updated.join(', ')}" unless updated.empty?
-        lines << "Would install: #{would_install.join(', ')}" unless would_install.empty?
-        lines << "Fast-forward: #{fast_forward.join(', ')}" unless fast_forward.empty?
-        lines << "Removed (no longer in the bundle): #{removed.join(', ')}#{trash_dir ? " (moved to #{trash_dir})" : ""}" unless removed.empty?
-        lines << "Would remove (no longer in the bundle): #{would_remove.join(', ')}" unless would_remove.empty?
-        lines << "Kept (local edits preserved): #{kept.join(', ')}" unless kept.empty?
-        lines << "Skipped: #{skipped.join(', ')}" unless skipped.empty?
-        lines << "Conflicts: #{conflicts.join(', ')}" unless conflicts.empty?
+        lines << "Installed: #{installed.join(", ")}" unless installed.empty?
+        lines << "Updated: #{updated.join(", ")}" unless updated.empty?
+        lines << "Would install: #{would_install.join(", ")}" unless would_install.empty?
+        lines << "Fast-forward: #{fast_forward.join(", ")}" unless fast_forward.empty?
+        lines << "Removed (no longer in the bundle): #{removed.join(", ")}#{" (moved to #{trash_dir})" if trash_dir}" unless removed.empty?
+        lines << "Would remove (no longer in the bundle): #{would_remove.join(", ")}" unless would_remove.empty?
+        lines << "Kept (local edits preserved): #{kept.join(", ")}" unless kept.empty?
+        lines << "Skipped: #{skipped.join(", ")}" unless skipped.empty?
+        lines << "Conflicts: #{conflicts.join(", ")}" unless conflicts.empty?
         lines.concat(@warnings) unless @warnings.empty?
         lines.concat(@placeholder_warnings) unless @placeholder_warnings.empty?
         lines << "#{@name} is already installed; `chi bundle upgrade #{@name}` updates it and keeps local edits" if @reinstall
@@ -494,6 +501,7 @@ module Samagotchi
         previous_files.each do |old_key, meta|
           key = old_key.to_s
           next if bundle_files.include?(key)
+
           target = File.join(target_dir, key)
           next unless File.exist?(target)
 
@@ -504,6 +512,7 @@ module Samagotchi
           elsif @force || installed_unchanged?(target, meta, provenance.base_path(key))
             @results[key] = { status: @dry_run ? "would_remove" : "removed", reason: "no longer in the bundle" }
             next if @dry_run
+
             @trash.move(target)
             remove_target_index(scope, key)
           else
@@ -518,6 +527,7 @@ module Samagotchi
       def installed_unchanged?(target, meta, base_path)
         recorded = meta.is_a?(Hash) ? meta[:checksum] || meta["checksum"] : nil
         return Provenance.sha_matches?(target, recorded) unless Provenance.recorded_sha(recorded).empty?
+
         File.exist?(base_path) && Provenance.file_sha(target) == Provenance.file_sha(base_path)
       end
 
@@ -577,12 +587,12 @@ module Samagotchi
         FileUtils.mkdir_p(provenance.plugin_dir)
         FileUtils.cp(src, dest)
         @results[plugin[:file]] = if unchanged
-                                   { status: "skipped", reason: "already up to date" }
-                                 elsif @upgrade && provenance.read
-                                   { status: "updated" }
-                                 else
-                                   { status: "installed" }
-                                 end
+                                    { status: "skipped", reason: "already up to date" }
+                                  elsif @upgrade && provenance.read
+                                    { status: "updated" }
+                                  else
+                                    { status: "installed" }
+                                  end
         expected = manifest.checksum_for_plugin
         actual = Digest::SHA256.hexdigest(File.binread(dest))
         if @strict && expected && actual != expected

data/lib/samagotchi/memory_bundle/listing.rb

@@ -30,8 +30,10 @@ module Samagotchi
 
         Dir.children(dir).sort.filter_map do |source|
           next unless File.file?(File.join(dir, source, "manifest.yml"))
+
           m = Manifest.read(dir: File.join(dir, source))
           next if m.name == SystemBundle::BUNDLE_NAME
+
           Shipped.new(name: m.name, source: source, version: m.version, description: m.description, includes: m.includes)
         rescue Manifest::ValidationError, Psych::Exception
           nil
@@ -70,8 +72,10 @@ module Samagotchi
       end
 
       def newer?(candidate, current)
-        candidate, current = candidate.to_s, current.to_s
+        candidate = candidate.to_s
+        current = current.to_s
         return false unless Gem::Version.correct?(candidate) && Gem::Version.correct?(current)
+
         Gem::Version.new(candidate) > Gem::Version.new(current)
       end
     end

data/lib/samagotchi/memory_bundle/manifest.rb

@@ -64,6 +64,7 @@ module Samagotchi
       def self.read(dir:)
         manifest_path = File.join(dir, "manifest.yml")
         raise ValidationError, "manifest.yml not found in #{dir}" unless File.exist?(manifest_path)
+
         new(path: manifest_path)
       end
 
@@ -72,6 +73,7 @@ module Samagotchi
       def checksum_for(file_key)
         raw = @files[file_key]
         return nil unless raw
+
         raw.start_with?("sha256:") ? raw[7..] : raw
       end
 
@@ -79,8 +81,10 @@ module Samagotchi
       def checksum_for_hook(basename)
         raw = @hooks[basename]
         return nil unless raw
+
         sha = raw[:sha256] || raw["sha256"]
         return nil unless sha
+
         sha.to_s.start_with?("sha256:") ? sha.to_s[7..] : sha.to_s
       end
 
@@ -99,18 +103,18 @@ module Samagotchi
         return nil if Gem::Requirement.new(*requirement.to_s.split(",").map(&:strip)).satisfied_by?(Gem::Version.new(version.to_s))
 
         "it requires chi #{requirement} (this is chi #{version})"
-      rescue ArgumentError, Gem::Requirement::BadRequirementError => e
+      rescue ArgumentError => e # Gem::Requirement::BadRequirementError is one
         "its requires_chi #{requirement.inspect} is not a version requirement (#{e.message})"
       end
 
       # Writes a fresh manifest.yml from computed checksums at `dir`.
-      def self.write(dir:, name:, version:, scope: nil, description: "", files:, hooks: nil, trust_level: nil,
+      def self.write(dir:, name:, version:, files:, scope: nil, description: "", hooks: nil, trust_level: nil,
                      plugin: nil, requires_chi: nil, needs: nil)
         FileUtils.mkdir_p(dir)
         manifest = {
           "name" => name,
           "version" => version,
-          "description" => description,
+          "description" => description
         }
         manifest["scope"] = scope if scope
         manifest["files"] = files # { "file.md" => "sha256:abc..." }
@@ -167,19 +171,23 @@ module Samagotchi
       def require_str(hash, key)
         val = hash[key]
         return val if val.is_a?(String) && !val.empty?
+
         raise ValidationError, "manifest missing required field: #{key}"
       end
 
       def normalize_scope(val)
         return nil if val.nil?
+
         v = val.to_s.strip.downcase
         %w[project system].include?(v) ? v : nil
       end
 
       def parse_files(raw)
         return {} unless raw.is_a?(Hash)
+
         raw.each_with_object({}) do |(k, v), acc|
           next unless k.is_a?(String) && !k.empty?
+
           str = v.to_s
           acc[k] = if str.start_with?("sha256:")
                      str
@@ -234,11 +242,13 @@ module Samagotchi
 
       def parse_hooks(raw)
         return {} unless raw.is_a?(Hash)
+
         raw.each_with_object({}) do |(k, v), acc|
           next unless k.is_a?(String) && !k.empty?
           next unless v.is_a?(Hash)
+
           sha = (v["sha256"] || v[:sha256] || "").to_s
-          sha = sha.start_with?("sha256:") ? sha : "sha256:#{sha}" unless sha.empty?
+          sha = "sha256:#{sha}" unless sha.empty? || sha.start_with?("sha256:")
           event = (v["event"] || v[:event] || "").to_s.strip
           on_error = (v["on_error"] || v[:on_error] || "skip").to_s.strip
           on_error = "skip" if on_error.empty?

data/lib/samagotchi/memory_bundle/merger.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "digest"
 
 module Samagotchi
@@ -33,18 +34,19 @@ module Samagotchi
         incoming_digest = Digest::SHA256.hexdigest(File.read(incoming_path))
 
         if current_digest == incoming_digest
-          return :noop
+          :noop
         elsif current_digest == base_digest
-          return :fast_forward
+          :fast_forward
         elsif incoming_digest == base_digest
-          return :keep
+          :keep
         else
-          return :conflict
+          :conflict
         end
       end
 
       def self.current_modified?(base_path, current_path)
         return true unless base_path && File.exist?(base_path) && File.exist?(current_path)
+
         Digest::SHA256.hexdigest(File.read(base_path)) != Digest::SHA256.hexdigest(File.read(current_path))
       end
     end

data/lib/samagotchi/memory_bundle/provenance.rb

@@ -154,11 +154,11 @@ module Samagotchi
         if existing && existing[:files]
           existing[:files].keys.each do |old_key|
             old_key_str = old_key.to_s
-            unless files.key?(old_key_str) || files.key?(old_key)
-              old_base = File.join(bases_dir, old_key_str)
-              FileUtils.rm_f(old_base) if File.exist?(old_base)
-              merged_entries.delete(old_key_str)
-            end
+            next if files.key?(old_key_str) || files.key?(old_key)
+
+            old_base = File.join(bases_dir, old_key_str)
+            FileUtils.rm_f(old_base)
+            merged_entries.delete(old_key_str)
           end
         end
 
@@ -172,9 +172,10 @@ module Samagotchi
           hooks.each do |k, v|
             next unless k.is_a?(String) && !k.empty?
             next unless v.is_a?(Hash)
+
             hv = v.transform_keys(&:to_sym)
             sha = (hv[:sha256] || "").to_s
-            sha = sha.start_with?("sha256:") ? sha : "sha256:#{sha}" unless sha.empty?
+            sha = "sha256:#{sha}" unless sha.empty? || sha.start_with?("sha256:")
             normalized_hooks[k] = {
               sha256: sha,
               event: (hv[:event] || "").to_s,
@@ -189,7 +190,7 @@ module Samagotchi
             old_key_str = old_key.to_s
             unless normalized_hooks.key?(old_key_str) || normalized_hooks.key?(old_key_str.to_sym)
               old_base = File.join(bases_dir, old_key_str)
-              FileUtils.rm_f(old_base) if File.exist?(old_base)
+              FileUtils.rm_f(old_base)
             end
           end
         end
@@ -204,12 +205,12 @@ module Samagotchi
             meta = meta.merge(sha256: "sha256:#{Digest::SHA256.hexdigest(File.read(src.to_s))}")
           end
           hooks_map[k] = meta.transform_keys(&:to_s)
-          if src && File.exist?(src.to_s)
-            begin
-              File.write(File.join(bases_dir, k), File.read(src.to_s))
-            rescue StandardError
-              nil
-            end
+          next unless src && File.exist?(src.to_s)
+
+          begin
+            File.write(File.join(bases_dir, k), File.read(src.to_s))
+          rescue StandardError
+            nil
           end
         end
 
@@ -256,6 +257,7 @@ module Samagotchi
         conflicts.each do |file_key, info|
           key = file_key.to_s
           next unless raw["files"].key?(key)
+
           src = [info[:incoming], info[:current]].find { |p| p && File.exist?(p) }
           next unless src
 
@@ -270,6 +272,7 @@ module Samagotchi
       def read
         manifest_path = File.join(@bundle_dir, "manifest.json")
         return nil unless File.exist?(manifest_path)
+
         JSON.parse(File.read(manifest_path), symbolize_names: true)
       end
 

data/lib/samagotchi/memory_bundle/source.rb

@@ -28,7 +28,7 @@ module Samagotchi
         lower = path.downcase
         if lower.end_with?(".zip")
           normalize_zip(path)
-        elsif lower.end_with?(".tar.gz") || lower.end_with?(".tgz") || lower.end_with?(".tar")
+        elsif lower.end_with?(".tar.gz", ".tgz", ".tar")
           normalize_tar(path)
         else
           ext = File.extname(path).downcase
@@ -57,6 +57,7 @@ module Samagotchi
       def self.git_url?(str)
         s = str.to_s.strip
         return false if s.empty?
+
         s.match?(%r{\A(?:https?://|git@|ssh://|git://|file://).+})
       end
 
@@ -78,6 +79,7 @@ module Samagotchi
           args += [url, clone_dir]
           result = system(*args)
           raise UnknownSourceError, "git clone failed for #{git_url}" unless result && File.directory?(clone_dir)
+
           # Capture HEAD commit before stripping .git (audit trail)
           commit = nil
           begin
@@ -103,12 +105,11 @@ module Samagotchi
         end
       end
 
-      private
-
       def self.normalize_zip(zip_path)
         Dir.mktmpdir("samagotchi-zip-") do |extract_dir|
           result = system("unzip", "-o", zip_path, "-d", extract_dir)
           raise UnknownSourceError, "unzip failed for #{zip_path}" unless result
+
           clean_copy_of(extract_dir)
         end
       end
@@ -119,6 +120,7 @@ module Samagotchi
           cmd = is_gz ? ["tar", "-xzf"] : ["tar", "-xf"]
           result = system(*cmd, tar_path, "-C", extract_dir)
           raise UnknownSourceError, "tar extraction failed for #{tar_path}" unless result
+
           clean_copy_of(extract_dir)
         end
       end
@@ -150,6 +152,8 @@ module Samagotchi
         end
         [dst, true]
       end
+
+      private_class_method :normalize_zip, :normalize_tar, :clean_copy_of
     end
   end
 end

data/lib/samagotchi/memory_bundle/status.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "digest"
 require_relative "provenance"
 require_relative "manifest"
@@ -20,7 +21,7 @@ module Samagotchi
         return nil unless data
 
         raw_scope = scope_override || data[:scope]&.to_s
-        scope = (raw_scope.nil? || raw_scope.strip.empty?) ? "system" : raw_scope
+        scope = raw_scope.nil? || raw_scope.strip.empty? ? "system" : raw_scope
         target_dir = MemoryPaths.scope_dir(scope)
         files = data[:files] || {}
         details = {}
@@ -108,6 +109,7 @@ module Samagotchi
       def self.index_has_entry?(scope, file_key)
         path = IndexUpdater.index_path_for(scope)
         return false unless path && File.exist?(path)
+
         content = File.read(path)
         [file_key.delete_suffix(".md"), file_key].uniq.any? { |name| content.match?(IndexUpdater.managed_pattern(name)) }
       end

data/lib/samagotchi/memory_bundle/system_bundle.rb

@@ -110,12 +110,13 @@ module Samagotchi
 
       def skip?
         val = ENV[SKIP_ENV].to_s.strip.downcase
-        val == "1" || val == "true"
+        %w[1 true].include?(val)
       end
 
       # Unparseable versions fall back to the old "any difference upgrades" behaviour.
       def installed_newer?(installed, shipped)
-        installed, shipped = installed.to_s, shipped.to_s
+        installed = installed.to_s
+        shipped = shipped.to_s
         return false unless Gem::Version.correct?(installed) && Gem::Version.correct?(shipped)
 
         Gem::Version.new(installed) > Gem::Version.new(shipped)

data/lib/samagotchi/memory_bundle/trash.rb

@@ -44,7 +44,7 @@ module Samagotchi
       def self.empty!(bundles_dir: MemoryPaths.bundles_dir, older_than_days: nil, now: Time.now, dry_run: false)
         entries = self.entries(bundles_dir: bundles_dir, now: now)
         if older_than_days
-          cutoff = now - older_than_days.to_i * 86_400
+          cutoff = now - (older_than_days.to_i * 86_400)
           entries = entries.select { |e| e.time < cutoff }
         end
         return entries if dry_run
@@ -98,7 +98,7 @@ module Samagotchi
         File.directory?(path) && !File.symlink?(path)
       end
 
-      def self.entry_for(trash_dir, name, now)
+      def self.entry_for(trash_dir, name, _now)
         path = File.join(trash_dir, name)
         time = parse_timestamp(name) || File.mtime(path)
         files, bytes = count_files(path)
@@ -126,11 +126,14 @@ module Samagotchi
         bytes = 0
         Dir.glob(File.join(dir, "**", "*"), File::FNM_DOTMATCH).each do |f|
           next if File.directory?(f)
+
           files += 1
           bytes += File.size(f) rescue 0
         end
         [files, bytes]
       end
+
+      private_class_method :real_dir?, :entry_for, :parse_timestamp, :count_files
     end
   end
 end

data/lib/samagotchi/memory_bundle/uninstaller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "fileutils"
 require "digest"
 require_relative "../memory_paths"
@@ -38,7 +39,7 @@ module Samagotchi
         # Determine scope from flag or provenance
         cli_scope = @scope.to_s.strip.empty? ? nil : @scope
         raw = cli_scope || data[:scope]&.to_s
-        target_scope = (raw.nil? || raw.strip.empty?) ? "system" : raw
+        target_scope = raw.nil? || raw.strip.empty? ? "system" : raw
         target_dir = MemoryPaths.scope_dir(target_scope) or raise UninstallError, "invalid scope: #{target_scope}"
 
         files = data[:files] || {}
@@ -55,19 +56,20 @@ module Samagotchi
         end.reject { |_, others| others.empty? }
 
         blocked = []
-        files.each do |file_key, meta|
+        files.each do |file_key, _meta|
           file_key_str = file_key.to_s
           target_path = File.join(target_dir, file_key_str)
           base_path = provenance.base_path(file_key_str)
           next unless File.exist?(target_path)
           next if shared.key?(file_key_str)
+
           if !@force && File.exist?(base_path) && Merger.current_modified?(base_path, target_path)
             blocked << file_key_str
             @warnings << "Skipped #{file_key_str}: local edits detected (use --force to remove)"
           end
         end
 
-        raise UninstallError, "Uninstall blocked: #{blocked.join(', ')} has local edits (use --force)" if blocked.any?
+        raise UninstallError, "Uninstall blocked: #{blocked.join(", ")} has local edits (use --force)" if blocked.any?
 
         files.each do |file_key, _meta|
           file_key_str = file_key.to_s
@@ -108,10 +110,11 @@ module Samagotchi
             end
           end
           # Remove hooks dir if empty, else rm_rf will clean
-          FileUtils.rm_rf(hooks_dir) if Dir.exist?(hooks_dir)
+          FileUtils.rm_rf(hooks_dir)
         else
-          # Ensure stale hooks dir removed even if provenance has no hooks map but dir exists
-          FileUtils.rm_rf(provenance.hooks_dir) if Dir.exist?(provenance.hooks_dir)
+          # A stale hooks dir goes even when provenance has no hooks map
+          # (rm_rf ignores a missing dir).
+          FileUtils.rm_rf(provenance.hooks_dir)
         end
 
         plugin_path = provenance.plugin_path(data)

data/lib/samagotchi/memory_bundle.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "memory_bundle/manifest"
 require_relative "memory_bundle/source"
 require_relative "memory_bundle/provenance"