local_ci_plus 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f82722f9217011683b155e6ac979418a9b78392cd0e045a34af00e0c263f98
-  data.tar.gz: d987f1334cab11e82de0727352411366c5736ca75a085bec4641dc3b15402af3
+  metadata.gz: c5e469a0e3234d66985a729cb66222e4f57ea4f627804a7ff4d96f39dcafc2c0
+  data.tar.gz: 0ae35f6c3627d2fdf6fd68b27278563d346a560d419259f115b685c41d1693c0
 SHA512:
-  metadata.gz: 3f01f9168e6861420e52191d50b96c38391196426b2082e046fbb78ffe50bbb30e141a1bb280c4158c59c557758a9bc1e5541134054ae2371676f3bef030648b
-  data.tar.gz: 9399e4a82bc56f565015f9bdfafd031b008ec1c121c35a1b52a22ca5781993050388f5a328354b742ec7bf42367187e1dd9ec50a61e469764295384900f55746
+  metadata.gz: 02d9a9b3b8af2921728c5e3c7625247e72ceee8d43e2512d7f8de851a956ae1c24a2cace9691655db01600e505e834d37d0792161b4a401a4b2cad3e629b2b12
+  data.tar.gz: '08442d855fa89ee0739d90e62145a19720ea6c44f961c1ba3af33dee3289928650e9fc32987699f0bec2a28187a81a235ef98ab0ef79ef7bb6f11d435a467d51'

data/README.md

@@ -3,6 +3,8 @@
 local_ci_plus improves Rails local CI for both developers and agents with parallel execution, fail-fast,
 resume, and plain output.
 
+https://github.com/user-attachments/assets/cf8d8c01-ddee-4154-bdb3-0a77cb5c1f53
+
 ## Installation
 
 Add to your Gemfile:
@@ -20,7 +22,7 @@ bundle install
 ## Usage
 
 `local_ci_plus` overrides `ActiveSupport::ContinuousIntegration` when it is loaded, so the default Rails `bin/ci`
-continues to work without changes.
+continues to work without changes. In plain/non-TTY mode, output is ASCII-only.
 
 ```bash
 bin/ci
@@ -61,6 +63,10 @@ Compatibility:
   --parallel cannot be combined with --fail-fast or --continue
 ```
 
+### State file
+
+By default, the first failing step is stored in `tmp/ci_state`. Set `CI_STATE_FILE` to override the path. To reset the resume point, delete the file.
+
 ## Development
 
 Run tests:
@@ -75,35 +81,13 @@ Run linting:
 bundle exec standardrb
 ```
 
-## Publishing
-
-### One-time setup (RubyGems)
-
-1. Create a RubyGems account if you do not have one.
-2. Add your API key:
-
-```bash
-mkdir -p ~/.gem
-printf "---\n:rubygems_api_key: YOUR_KEY\n" > ~/.gem/credentials
-chmod 0600 ~/.gem/credentials
-```
-
-### Initial release
-
-1. Update `local_ci_plus.gemspec` with the real `authors`, `email`, `homepage`, and `license`.
-2. Build the gem:
-
-```bash
-gem build local_ci_plus.gemspec
-```
-
-3. Push to RubyGems:
+Or run them both:
 
-```bash
-gem push local_ci_plus-0.1.0.gem
+```base
+bin/ci --parallel
 ```
 
-### Updates
+### Publishing Updates
 
 1. Bump the version in `lib/local_ci_plus/version.rb`.
 2. Build and push:

data/lib/local_ci_plus/continuous_integration.rb

@@ -6,6 +6,7 @@
 # - bin/ci -fc: Both options combined
 # - bin/ci -p (--parallel): Run all steps concurrently
 
+require "fileutils"
 require "tempfile"
 
 module LocalCiPlus
@@ -20,7 +21,8 @@ module LocalCiPlus
       pending: "\033[1;34m"   # Blue
     }
 
-    STATE_FILE = ".ci_state"
+    STATE_FILE = File.join("tmp", "ci_state")
+    STATE_FILE_ENV = "CI_STATE_FILE"
 
     attr_reader :results
 
@@ -49,10 +51,10 @@ module LocalCiPlus
 
     def validate_mode_compatibility!
       if parallel? && fail_fast?
-        abort colorize("❌ Cannot combine --parallel with --fail-fast", :error)
+        abort colorize("#{status_marker(:error)} Cannot combine --parallel with --fail-fast", :error)
       end
       if parallel? && continue_mode?
-        abort colorize("❌ Cannot combine --parallel with --continue", :error)
+        abort colorize("#{status_marker(:error)} Cannot combine --parallel with --continue", :error)
       end
     end
 
@@ -83,7 +85,6 @@ module LocalCiPlus
       if @skipping
         if title == @skip_until
           @skipping = false
-          clear_state
         else
           heading title, "skipped (resuming from: #{@skip_until})", type: :skip
           results << [true, title]
@@ -101,9 +102,13 @@ module LocalCiPlus
         success = system(*command)
         results << [success, title]
 
-        if !success && fail_fast?
-          save_failed_step(title)
-          abort colorize("\n❌ #{title} failed (fail-fast enabled)", :error)
+        if success
+          clear_state if recorded_failed_step == title
+        else
+          record_failed_step(title)
+          if fail_fast?
+            abort colorize("\n#{status_marker(:error)} #{title} failed (fail-fast enabled)", :error)
+          end
         end
       end
     end
@@ -134,19 +139,19 @@ module LocalCiPlus
     end
 
     def report(title, &block)
+      ci = self.class.new
+      ci.instance_variable_set(:@skip_until, @skip_until)
+      ci.instance_variable_set(:@skipping, @skipping)
+
       prev_int = Signal.trap("INT") {
-        interrupt_parallel! if parallel?
-        abort colorize("\n❌ #{title} interrupted", :error)
+        ci.interrupt_parallel! if ci.parallel?
+        abort colorize("\n#{status_marker(:error)} #{title} interrupted", :error)
       }
       prev_term = Signal.trap("TERM") {
-        interrupt_parallel! if parallel?
-        abort colorize("\n❌ #{title} terminated", :error)
+        ci.interrupt_parallel! if ci.parallel?
+        abort colorize("\n#{status_marker(:error)} #{title} terminated", :error)
       }
 
-      ci = self.class.new
-      ci.instance_variable_set(:@skip_until, @skip_until)
-      ci.instance_variable_set(:@skipping, @skipping)
-
       elapsed = timing do
         ci.instance_eval(&block)
         ci.run_parallel_steps! if ci.parallel? && ci.parallel_steps.any?
@@ -156,14 +161,14 @@ module LocalCiPlus
       @skipping = ci.instance_variable_get(:@skipping)
 
       if ci.success?
-        echo "\n✅ #{title} passed in #{elapsed}", type: :success
+        echo "\n#{status_marker(:success)} #{title} passed in #{elapsed}", type: :success
         clear_state
       else
-        echo "\n❌ #{title} failed in #{elapsed}", type: :error
+        echo "\n#{status_marker(:error)} #{title} failed in #{elapsed}", type: :error
 
         if ci.multiple_results?
           ci.failures.each do |success, step_title|
-            echo "   ↳ #{step_title} failed", type: :error
+            echo "   #{failure_bullet} #{step_title} failed", type: :error
           end
         end
       end
@@ -216,7 +221,7 @@ module LocalCiPlus
       completed = []
       completed_by_index = {}
 
-      echo "\n⏳ Running #{total} steps in parallel:", type: :subtitle
+      echo "\n#{status_marker(:pending)} Running #{total} steps in parallel:", type: :subtitle
       unless plain?
         @parallel_steps.each do |step|
           echo format_parallel_line(step[:title], :pending), type: :pending
@@ -339,6 +344,41 @@ module LocalCiPlus
       failed_jobs = completed.reject { |j| j[:success] }
       return if failed_jobs.empty?
 
+      if plain?
+        separator = "-" * 60
+        echo "\n#{separator}", type: :error
+        echo "Failed step output:", type: :error
+        echo separator, type: :error
+
+        failed_jobs.each do |job|
+          echo "\n-- #{job[:title]} (exit #{job[:exit_code]})", type: :error
+          echo "   Command: #{job[:command].join(" ")}", type: :subtitle
+
+          stdout_content = truncated_file_content(job[:stdout_file])
+          stderr_content = truncated_file_content(job[:stderr_file])
+
+          if stdout_content.empty? && stderr_content.empty?
+            echo "   (no output)", type: :subtitle
+          else
+            unless stdout_content.empty?
+              echo "   -- stdout --", type: :subtitle
+              stdout_content.each_line { |line| echo "   #{line.chomp}", type: :subtitle }
+            end
+
+            unless stderr_content.empty?
+              echo "   -- stderr --", type: :error
+              stderr_content.each_line { |line| echo "   #{line.chomp}", type: :error }
+            end
+          end
+
+          echo "-- end", type: :error
+
+          cleanup_job_files!(job)
+        end
+
+        return
+      end
+
       echo "\n" + ("─" * 60), type: :error
       echo "Failed step output:", type: :error
       echo ("─" * 60), type: :error
@@ -392,8 +432,22 @@ module LocalCiPlus
       {pending: "•", success: "✅", error: "❌"}[status]
     end
 
+    def status_marker(type)
+      return {pending: "WAIT", success: "OK", error: "FAIL"}[type] if plain?
+
+      {pending: "⏳", success: "✅", error: "❌"}[type]
+    end
+
+    def failure_bullet
+      plain? ? "->" : "↳"
+    end
+
     def update_parallel_line(index, text, type)
-      return echo(text, type: type) if plain?
+      if plain?
+        echo(text, type: type)
+        $stdout.flush
+        return
+      end
 
       lines_up = @parallel_steps.size - index
       print "\033[s"
@@ -401,19 +455,36 @@ module LocalCiPlus
       print "\r\033[2K"
       print colorize(text, type)
       print "\033[u"
+      $stdout.flush
     end
 
     def state_file_path
+      custom_path = ENV[STATE_FILE_ENV]
+      return File.expand_path(custom_path, Dir.pwd) if custom_path && !custom_path.empty?
+
       File.join(Dir.pwd, STATE_FILE)
     end
 
     def save_failed_step(title)
+      FileUtils.mkdir_p(File.dirname(state_file_path))
       File.write(state_file_path, title)
     end
 
-    def load_failed_step
+    def record_failed_step(title)
+      return if recorded_failed_step
+
+      save_failed_step(title)
+    end
+
+    def recorded_failed_step
       return nil unless File.exist?(state_file_path)
-      File.read(state_file_path).strip
+
+      content = File.read(state_file_path).strip
+      content.empty? ? nil : content
+    end
+
+    def load_failed_step
+      recorded_failed_step
     end
 
     def clear_state

data/lib/local_ci_plus/generators/update_generator.rb

@@ -6,19 +6,35 @@ module LocalCiPlus
   module Generators
     class UpdateGenerator < Rails::Generators::Base
       def update_ci_runner
-        if File.exist?(File.join(destination_root, "bin/ci"))
-          unless ci_requires_local_ci_plus?
-            inject_into_file "bin/ci", "require \"local_ci_plus\"\n", after: "require_relative \"../config/boot\"\n"
-          end
-        else
+        ci_path = File.join(destination_root, "bin/ci")
+
+        unless File.exist?(ci_path)
           say_status :skipped, "bin/ci does not exist", :yellow
+          return
+        end
+
+        return if ci_requires_local_ci_plus?
+
+        lines = File.read(ci_path).lines
+        boot_index = lines.find_index { |line| line.match?(boot_require_regex) }
+
+        unless boot_index
+          say_status :skipped, "bin/ci does not require config/boot", :yellow
+          return
         end
+
+        lines.insert(boot_index + 1, "require \"local_ci_plus\"\n")
+        File.write(ci_path, lines.join)
       end
 
       private
 
       def ci_requires_local_ci_plus?
-        File.read(File.join(destination_root, "bin/ci")).include?("require \"local_ci_plus\"")
+        File.read(File.join(destination_root, "bin/ci")).match?(/require\s+["']local_ci_plus["']/)
+      end
+
+      def boot_require_regex
+        /^\s*require_relative\s+\(?\s*["']\.\.\/config\/boot["']/
       end
     end
   end

data/lib/local_ci_plus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LocalCiPlus
-  VERSION = "0.1.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_ci_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Scott Watermasysk