all_in_ruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6930c270ee263f4f0479be9854cf03b7af4db01e88e6ffa3ee585a2dad0f152b
-  data.tar.gz: f0491de4a159d7e327d6e6f270146ec5546213b82d6ed68dc5cbd1e3f1cd610a
+  metadata.gz: 55c6359657b51756cdaf08ac451944c082a262648baacffd13b29149b232869e
+  data.tar.gz: b91ef1b9f442d440b060d4e3bdbcc59dbdcb4bfe63219dc8ce78f5cb9c33e629
 SHA512:
-  metadata.gz: d771a3ce9f1669f73d1bb441dfaaae80b180570ddcce09d6ea38f1c709fee3d9a8df778b6a8e72aa7b213591777066e51f06f5f016c892a1f3a4ab8b46993311
-  data.tar.gz: 66e7bffbd34e3f45f1bd8366e8cbd12f068f93de6f89e3ea6cf5424772e8cdd0224b360174d8b617cd4e09a48334fe1b123b6f84f051432b32d5a1179463de73
+  metadata.gz: 1c09f7d78f6481e65f229894d95f378c77283493facc7d970e3b0323eb8ef48bb84a4d7409e1e8884c86d7cc6442d5cd95a7633505d43787d552e86c94660758
+  data.tar.gz: 40030931d424fc53f95edc456afcfc1a56fd3a27b0e82029d51b2c8b6a2603791f8d3a5626083664f9f25eccba8789c9f895d0f63628703e5dcfb589a15bb30b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.1 (2026-08-04)
+
+- Require a complete instruction block when checking installation status, and preserve malformed or unrelated content when removing a later valid block
+- Simplify the CLI and installer internals so command execution, reporting, dry runs, and result construction read more explicitly without changing their behavior
+
 ## 0.2.0 (2026-08-03)
 
 - `install` and `uninstall` now back up any existing file before modifying it, writing a timestamped copy (`CLAUDE.md.20260802-153000.bak`) next to the original and listing the backups created at the end of the run. New files are not backed up. Pass `--no-backup` to skip, or `--dry-run` to preview which backups would be made

data/lib/all_in_ruby/cli.rb

@@ -41,39 +41,17 @@ module AllInRuby
         return 1
       end
 
-      agents = options[:agents].empty? ? Installer::AGENTS.dup : options[:agents]
+      agents = options[:agents].empty? ? Installer::AGENTS : options[:agents]
       scopes = scopes_for(command, options[:scopes])
       dry_run = options[:dry_run] && command != "status"
 
-      scope_results = scopes.map do |scope|
-        results =
-          if command == "status"
-            @installer.status(agents: agents, scope: scope)
-          else
-            @installer.public_send(command, agents: agents, scope: scope, dry_run: dry_run, backup: options[:backup])
-          end
-        [scope, results]
-      end
-
+      scope_results = results_by_scope(command, agents:, scopes:, dry_run:, backup: options[:backup])
       print_statuses(scope_results, dry_run ? DRY_RUN_LABELS : STATUS_LABELS)
 
       results = scope_results.flat_map { |_scope, scope_result| scope_result }
-      results.each do |result|
-        next unless result.diff
-
-        @stdout.puts
-        @stdout.puts result.diff
-      end
-
+      print_diffs(results)
       print_backups(results, dry_run)
-
-      if command == "install" && results.any? { |result| result.status == :manual }
-        @stdout.puts
-        @stdout.puts "Cursor has no global rules file. To apply the instruction globally,"
-        @stdout.puts "paste this into Cursor Settings > Rules:"
-        @stdout.puts
-        @stdout.puts Instruction.body
-      end
+      print_manual_instruction(command, results)
       0
     rescue OptionParser::ParseError => e
       @stderr.puts e.message
@@ -87,16 +65,19 @@ module AllInRuby
     def scopes_for(command, requested)
       return requested.uniq unless requested.empty?
 
-      command == "status" ? Installer::SCOPES.dup : ["local"]
+      command == "status" ? Installer::SCOPES : ["local"]
     end
 
-    def print_backups(results, dry_run)
-      backups = results.filter_map(&:backup)
-      return if backups.empty?
-
-      @stdout.puts
-      @stdout.puts(dry_run ? "Backups that would be created:" : "Backups created:")
-      backups.each { |backup| @stdout.puts "  #{backup}" }
+    def results_by_scope(command, agents:, scopes:, dry_run:, backup:)
+      scopes.map do |scope|
+        results =
+          if command == "status"
+            @installer.status(agents: agents, scope: scope)
+          else
+            @installer.public_send(command, agents: agents, scope: scope, dry_run: dry_run, backup: backup)
+          end
+        [scope, results]
+      end
     end
 
     def print_statuses(scope_results, labels)
@@ -111,6 +92,34 @@ module AllInRuby
       end
     end
 
+    def print_diffs(results)
+      results.each do |result|
+        next unless result.diff
+
+        @stdout.puts
+        @stdout.puts result.diff
+      end
+    end
+
+    def print_backups(results, dry_run)
+      backups = results.filter_map(&:backup)
+      return if backups.empty?
+
+      @stdout.puts
+      @stdout.puts(dry_run ? "Backups that would be created:" : "Backups created:")
+      backups.each { |backup| @stdout.puts "  #{backup}" }
+    end
+
+    def print_manual_instruction(command, results)
+      return unless command == "install" && results.any? { |result| result.status == :manual }
+
+      @stdout.puts
+      @stdout.puts "Cursor has no global rules file. To apply the instruction globally,"
+      @stdout.puts "paste this into Cursor Settings > Rules:"
+      @stdout.puts
+      @stdout.puts Instruction.body
+    end
+
     def build_parser(options)
       OptionParser.new do |opts|
         opts.banner = <<~BANNER

data/lib/all_in_ruby/installer.rb

@@ -7,7 +7,7 @@ module AllInRuby
     AGENTS = %w[claude codex opencode cursor].freeze
     SCOPES = %w[local global].freeze
 
-    Result = Struct.new(:agent, :path, :status, :diff, :backup)
+    Result = Struct.new(:agent, :path, :status, :diff, :backup, keyword_init: true)
 
     def initialize(root: Dir.pwd, home: Dir.home, env: ENV, clock: -> { Time.now })
       @root = root
@@ -41,9 +41,9 @@ module AllInRuby
           :already_installed
         elsif content
           new_content = content + separator_for(content) + Instruction.block
-          apply(path, content, new_content, :updated, dry_run, backup, planned)
+          apply(path, content, new_content, :updated, dry_run:, backup:, planned:)
         else
-          apply(path, nil, Instruction.block, :created, dry_run, backup, planned)
+          apply(path, nil, Instruction.block, :created, dry_run:, backup:, planned:)
         end
       end
     end
@@ -54,7 +54,7 @@ module AllInRuby
         content = current_content(path, planned)
 
         if content && Instruction.installed?(content)
-          apply(path, content, Instruction.remove(content), :removed, dry_run, backup, planned)
+          apply(path, content, Instruction.remove(content), :removed, dry_run:, backup:, planned:)
         else
           :not_installed
         end
@@ -92,17 +92,18 @@ module AllInRuby
     # Returns [status, diff, backup]. A backup is made only when an existing
     # file is modified (never on create); a dry run computes the name it would
     # use so the preview can report it, but writes nothing.
-    def apply(path, old_content, new_content, status, dry_run, backup, planned)
+    def apply(path, old_content, new_content, status, dry_run:, backup:, planned:)
       backup_path = backup && old_content ? backup_path_for(path) : nil
+
       if dry_run
         planned[path] = new_content
-        [status, Diff.unified(old_content, new_content, path), backup_path]
-      else
-        FileUtils.cp(path, backup_path) if backup_path
-        FileUtils.mkdir_p(File.dirname(path)) unless old_content
-        File.write(path, new_content)
-        [status, nil, backup_path]
+        return [status, Diff.unified(old_content, new_content, path), backup_path]
       end
+
+      FileUtils.cp(path, backup_path) if backup_path
+      FileUtils.mkdir_p(File.dirname(path)) unless old_content
+      File.write(path, new_content)
+      [status, nil, backup_path]
     end
 
     def backup_path_for(path)
@@ -112,8 +113,10 @@ module AllInRuby
     def each_target(agents, scope)
       agents.map do |agent|
         path = path_for(agent, scope)
-        status, diff, backup = path ? yield(path) : :manual
-        Result.new(agent, path, status, diff, backup)
+        next Result.new(agent:, path:, status: :manual) unless path
+
+        status, diff, backup = yield(path)
+        Result.new(agent:, path:, status:, diff:, backup:)
       end
     end
   end

data/lib/all_in_ruby/instruction.rb

@@ -22,6 +22,11 @@ module AllInRuby
     MARKDOWN
 
     BLOCK = "#{BEGIN_MARKER}\n#{BODY}#{END_MARKER}\n".freeze
+    BLOCK_PATTERN = /
+      #{Regexp.escape(BEGIN_MARKER)}
+      (?:(?!#{Regexp.escape(BEGIN_MARKER)}).)*?
+      #{Regexp.escape(END_MARKER)}\n?
+    /mx
 
     def self.block
       BLOCK
@@ -32,11 +37,11 @@ module AllInRuby
     end
 
     def self.installed?(content)
-      content.include?(BEGIN_MARKER)
+      content.match?(BLOCK_PATTERN)
     end
 
     def self.remove(content)
-      content.gsub(/\n?#{Regexp.escape(BEGIN_MARKER)}.*?#{Regexp.escape(END_MARKER)}\n?/m, "\n")
+      content.gsub(BLOCK_PATTERN, "")
     end
   end
 end

data/lib/all_in_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AllInRuby
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/all_in_ruby.rb

@@ -5,7 +5,3 @@ require_relative "all_in_ruby/instruction"
 require_relative "all_in_ruby/diff"
 require_relative "all_in_ruby/installer"
 require_relative "all_in_ruby/cli"
-
-module AllInRuby
-  class Error < StandardError; end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: all_in_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lucian Ghinda