fun_ci 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c32c8feba3da028e17991565e2221423f97cab25535eb940667306b8f21205b
-  data.tar.gz: 83ec5dc09376e04feb8d08e7d863c6a574c2814754e9e57f3745d8719d4fb01e
+  metadata.gz: 1ec70009244a286fd23264c7cd99becf5a5a437ee8fb2a636652d1050f2b4d78
+  data.tar.gz: c354caa2011c5d7d8d39d2637f9c3423cae3c7e8a8c6fcce83232aa83d169cd5
 SHA512:
-  metadata.gz: 352c02313f711498642a148a7639e559ab4c1dbbd92c12f3c83f6a1cefd78263545c617428c0293ab5c2da4e6f2b70984f6bbe8db402538c84bb3d243cce6314
-  data.tar.gz: 6d873b080a2d5417b046aab0516cb116a92ae705b72207ab634b14196d8d18856540411f864bd424c1eb995d34018b89a07e7059eef47f1eeacdf4a5851b2088
+  metadata.gz: aa78fbd513340af9d0cb8cd1c0d071a6eb2c487f4fb2216a7108acdc3b71f1ba19682cb7746f5fdb024a1a0a7ea8f32d15c76f41f64a900f16ab6fc8594beaec
+  data.tar.gz: efb2b61788bd0e2ba361646a2391976c4fd29de3b91f1256d9425a5efc0687b6b731ccc6bbeeca22f52e12a091d705f10035298e2a622be63ef714a8f55f59d9

data/CHANGELOG.md

@@ -7,6 +7,56 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.2] - 2026-09-29
+
+### Fixed
+- In a Gradle project set up by `fun-ci init`, the fast suite could fail
+  before running a test, with Gradle unable to hash a file in its own build
+  directory (`build/kotlin/compileTestKotlin/...`). The fast and slow suites
+  run side by side in one worktree, and both compiled the test code into the
+  same place, each deleting what the other was reading. The build script now
+  compiles the test code (`./gradlew assemble testClasses`), so neither suite
+  has to. Maven, .NET, Elixir, Dart and Swift projects could clash the same
+  way, and their scripts change too: Maven builds with `mvn test-compile` and
+  runs `mvn surefire:test` and `mvn failsafe:integration-test
+  failsafe:verify`, so its slow suite now runs only the integration tests
+  failsafe finds (the classes named `*IT`) rather than every test again;
+  Elixir compiles its test environment in the build; Dart precompiles its test
+  runner and runs the slow suite from source; the .NET and Swift suites run
+  with `--no-build` and `--skip-build`.
+- Lint runs side by side with the build, and the lint `fun-ci init` wrote for
+  Maven (`mvn verify -DskipTests`) and .NET (`dotnet format`) compiled into
+  the same directories as the build. Lint now works on the source code alone.
+  Maven's runs the linter the POM configures (detekt, ktlint, checkstyle or
+  PMD) or else `mvn validate`, and no longer picks spotbugs, which reads
+  compiled classes. .NET's checks whitespace with `dotnet format whitespace
+  --folder`. Gradle's runs ktlint, spotless or detekt when the build applies
+  one, and otherwise says there is none, where it ran `check`, which compiles.
+  A linter that needs compiled code goes in `build.sh` or `fast.sh`.
+- Which stages run side by side, and so what each may read and write, is now
+  spelled out: in a new section of `docs/design.md`, in the README, in what
+  `fun-ci init` prints, and in a comment at the top of each script it writes.
+  Scripts already in `.fun-ci/` are left as they are, so an existing project
+  picks up these fixes by editing them to match `docs/stacks.md`.
+
+## [2.0.1] - 2026-09-29
+
+### Fixed
+- `fun-ci console` could show a blank screen and stay that way. When a new
+  commit cancelled a run in the same second one of its stages started, the
+  stage was recorded as ending before it began. The renderer rejected the
+  negative duration and, with it, every board Ruby sent, so nothing was drawn
+  while that run was listed; the only sign was a line per second in
+  `.fun-ci/console.log`. Ends are now recorded to the millisecond, and a stage
+  already recorded that way reads as taking no time, so an existing database
+  needs no repair. `fun-ci status`, `why` and `events` no longer report a
+  negative time for such a stage either.
+- A commit made on a detached HEAD, as every commit a rebase replays is, was
+  recorded with no branch name, so `fun-ci status` ended in "on" and the
+  console showed a gap where the branch goes. Such runs are now on the branch
+  `detached`, whether a hook or `fun-ci wait` started them, and runs already
+  recorded without a name are renamed when fun-ci next opens its database.
+
 ## [2.0.0] - 2026-09-29
 
 fun-ci 2.0 has two ways in. People watch a new console, drawn by a Rust

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/fun_ci.svg)](https://badge.fury.io/rb/fun_ci)
+
 # Fun-CI
 
 Opinionated local CI that checks your code before it leaves your machine. Every commit runs lint, build, a fast suite and a slow suite on your own computer, each held to a strict time budget, so the feedback stays fast.
@@ -41,6 +43,8 @@ Upgrading from 1.x? Read [Upgrading to 2.0](#upgrading-to-20) first.
 | Fast  | 10 s   | after lint and build pass | the push |
 | Slow  | 5 min  | in the background, beside the fast suite | nothing |
 
+Lint and build run side by side on the commit's checkout, and then the fast and slow suites run side by side on what the build left, all in one worktree. Two stages running at once must not write the same files, so `lint.sh` works on the source code only and `build.sh` compiles everything the suites need, test code included. A linter that needs compiled code belongs in `build.sh` or `fast.sh`. The scripts `fun-ci init` writes keep to this; [Stages side by side](docs/design.md#stages-side-by-side) has the details.
+
 A stage that overruns its budget is killed and reported as over budget, in yellow rather than red: a fast suite that takes 12 seconds has grown too heavy, which is a different problem from a failing test.
 
 After each commit, the `post-commit` hook starts the pipeline in the background and returns at once, so a commit is never held up. The `pre-push` hook waits for the verdict of each commit you push and stops the push if lint, build or the fast suite failed. A commit whose run has already finished goes straight through. If fun-ci isn't installed, both hooks say so and let git carry on.

data/lib/fun_ci/agent/git.rb

@@ -16,8 +16,9 @@ module FunCi
       def subject(sha) = git("log", "-1", "--format=%s", sha).to_s
       def toplevel = File.realpath(git("rev-parse", "--show-toplevel"))
 
-      # The branch checked out, as the git hooks name it; "unknown" when HEAD is detached.
-      def branch = git("branch", "--show-current").to_s.then { |name| name.empty? ? "unknown" : name }
+      # The branch checked out, as the git hooks name it: "" when HEAD is
+      # detached, which trigger names (Pipeline::Commit).
+      def branch = git("branch", "--show-current").to_s
 
       private
 

data/lib/fun_ci/agent/report_stage.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "json"
-require "time"
 require_relative "../evidence/document"
+require_relative "../persistence/stage_job"
 
 module FunCi
   module Agent
@@ -62,9 +62,7 @@ module FunCi
         end
 
         def self.seconds(job)
-          return nil unless job[:started_at] && job[:completed_at]
-
-          (Time.parse(job[:completed_at]) - Time.parse(job[:started_at])).round(1)
+          Persistence::StageJob.elapsed_duration(job)&.round(1)
         end
         private_class_method :kept, :seconds
       end

data/lib/fun_ci/persistence/active_runs.rb

@@ -42,12 +42,12 @@ module FunCi
       # Records the slow stage failed, unless its result was recorded meanwhile.
       def self.slow_suite_died(db, job_id)
         db.execute("UPDATE stage_jobs SET status = 'failed', completed_at = ? WHERE id = ? AND status = 'running'",
-                   [Time.now.utc.iso8601, job_id])
+                   [Time.now.utc.iso8601(3), job_id])
       end
 
       def self.cancelled(db, run)
         db.execute("UPDATE stage_jobs SET status = 'cancelled', completed_at = ? " \
-                   "WHERE pipeline_run_id = ? AND #{ACTIVE}", [Time.now.utc.iso8601, run.id])
+                   "WHERE pipeline_run_id = ? AND #{ACTIVE}", [Time.now.utc.iso8601(3), run.id])
         PipelineRun.update_status(db, run.id, "cancelled")
       end
 

data/lib/fun_ci/persistence/database.rb

@@ -50,9 +50,13 @@ module FunCi
         with_setup_lock(db.filename("main")) do
           [PIPELINE_RUNS_TABLE, STAGE_JOBS_TABLE].each { |table| db.execute(table) }
           ADDED_COLUMNS.each { |table, column, type| add_column_if_missing(db, table, column, type) }
+          db.execute(NAME_DETACHED)
         end
       end
 
+      # Runs started on a detached HEAD before 2.0.1 were kept with no branch name.
+      NAME_DETACHED = "UPDATE pipeline_runs SET branch = 'detached' WHERE branch = ''"
+
       def self.with_setup_lock(db_path)
         File.open("#{db_path}.setup-lock", File::RDWR | File::CREAT, 0o644) do |lock|
           lock.flock(File::LOCK_EX)

data/lib/fun_ci/persistence/stage_job.rb

@@ -76,10 +76,12 @@ module FunCi
                    [new_status, Time.now.utc.iso8601(3), id])
       end
 
+      # Never less than nothing: rows kept before ends were recorded to the
+      # millisecond can end in the second they started, before their start.
       def self.elapsed_duration(job)
         return nil unless job[:started_at] && job[:completed_at]
 
-        Time.parse(job[:completed_at]) - Time.parse(job[:started_at])
+        [Time.parse(job[:completed_at]) - Time.parse(job[:started_at]), 0].max
       end
 
       def self.row_to_hash(row)

data/lib/fun_ci/pipeline/trigger_params.rb

@@ -14,6 +14,14 @@ module FunCi
 
     Commit = Data.define(:sha, :branch)
 
+    # On a detached HEAD git names no branch, and the hooks pass "": the run
+    # is kept, shown and cancelled by others on the branch "detached".
+    class Commit
+      DETACHED = "detached"
+
+      def initialize(sha:, branch:) = super(sha: sha, branch: branch.empty? ? DETACHED : branch)
+    end
+
     Io = Data.define(:stdout, :stderr) do
       def initialize(stdout: $stdout, stderr: $stderr) = super
     end

data/lib/fun_ci/setup/gradle_linter_detector.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module FunCi
+  module Setup
+    # The source linter a Gradle build applies, whose task lint.sh runs. Lint
+    # runs beside the build on the source alone (design.md, Stages side by
+    # side), so only linters that compile nothing are named here.
+    class GradleLinterDetector
+      LINTERS = [
+        { plugin: "org.jlleitschuh.gradle.ktlint", command: "./gradlew ktlintCheck" },
+        { plugin: "com.diffplug.spotless", command: "./gradlew spotlessCheck" },
+        { plugin: "io.gitlab.arturbosch.detekt", command: "./gradlew detekt" }
+      ].freeze
+
+      def initialize(build_file)
+        @build_file = build_file
+      end
+
+      # The linter's command, or nil for a build that applies none.
+      def lint_command = LINTERS.find { |linter| @build_file.include?(linter[:plugin]) }&.fetch(:command)
+    end
+  end
+end

data/lib/fun_ci/setup/installer.rb

@@ -2,12 +2,18 @@
 
 require_relative "project_detector"
 require_relative "template_writer"
-require_relative "maven_linter_detector"
+require_relative "lint_detection"
 require_relative "agent_instructions"
 
 module FunCi
   module Setup
     class Installer
+      # Which stages run side by side, and so what each may touch (design.md,
+      # Stages side by side).
+      SIDE_BY_SIDE = ["lint.sh runs beside build.sh, so it reads the source alone.",
+                      "Then fast.sh runs beside slow.sh, both on what build.sh built: have build.sh " \
+                      "compile everything they need, test code included."].freeze
+
       def self.run(project_root:, stdout: $stdout)
         new(project_root: project_root, stdout: stdout).run
       end
@@ -51,21 +57,15 @@ module FunCi
 
       def write_templates(detected)
         @stdout.puts "Detected: #{detected.to_s.tr("_", " ")}"
-        TemplateWriter.new(detected, @project_root, lint_override: detect_maven_linter(detected)).write
-        report("Created .fun-ci/ with template scripts.", 0)
+        TemplateWriter.new(detected, @project_root, lint_override: LintDetection.command(detected, @project_root)).write
+        @stdout.puts "Created .fun-ci/ with template scripts.", *SIDE_BY_SIDE
+        0
       end
 
       def report(message, exit_code)
         @stdout.puts message
         exit_code
       end
-
-      def detect_maven_linter(detected)
-        return nil unless detected == :jvm_maven
-
-        command = MavenLinterDetector.new(File.read(File.join(@project_root, "pom.xml"))).lint_command
-        command == MavenLinterDetector::DEFAULT_COMMAND ? nil : command
-      end
     end
   end
 end

data/lib/fun_ci/setup/lint_detection.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "maven_linter_detector"
+require_relative "gradle_linter_detector"
+
+module FunCi
+  module Setup
+    # The lint command init writes in place of the template's, from the source
+    # linter the project's build configures; nil keeps the template's.
+    module LintDetection
+      GRADLE_FILES = %w[build.gradle.kts build.gradle].freeze
+
+      def self.command(detected, project_root)
+        case detected
+        when :jvm_maven then maven(project_root)
+        when :jvm_gradle_kotlin, :jvm_gradle_groovy then gradle(project_root)
+        end
+      end
+
+      def self.maven(project_root)
+        command = MavenLinterDetector.new(File.read(File.join(project_root, "pom.xml"))).lint_command
+        command == MavenLinterDetector::DEFAULT_COMMAND ? nil : command
+      end
+
+      def self.gradle(project_root)
+        file = GRADLE_FILES.map { File.join(project_root, _1) }.find { File.exist?(_1) }
+        file && GradleLinterDetector.new(File.read(file)).lint_command
+      end
+      private_class_method :maven, :gradle
+    end
+  end
+end

data/lib/fun_ci/setup/maven_linter_detector.rb

@@ -2,16 +2,18 @@
 
 module FunCi
   module Setup
+    # The linter a POM configures, whose goal lint.sh runs. Lint runs beside the
+    # build on the source alone (design.md, Stages side by side), so linters that
+    # read compiled classes, such as spotbugs, are left to build.sh or fast.sh.
     class MavenLinterDetector
       LINTERS = [
         { artifact_id: "detekt-maven-plugin", command: "mvn detekt:check" },
         { artifact_id: "ktlint-maven-plugin", command: "mvn ktlint:check" },
         { artifact_id: "maven-checkstyle-plugin", command: "mvn checkstyle:check" },
-        { artifact_id: "spotbugs-maven-plugin", command: "mvn spotbugs:check" },
         { artifact_id: "maven-pmd-plugin", command: "mvn pmd:check" }
       ].freeze
 
-      DEFAULT_COMMAND = "mvn verify -DskipTests"
+      DEFAULT_COMMAND = "mvn validate"
 
       def initialize(pom_content)
         @pom_content = pom_content

data/lib/fun_ci/setup/stage_templates/managed.rb

@@ -6,18 +6,23 @@ module FunCi
   module Setup
     # Stacks that run on a virtual machine: the JVM, .NET, the BEAM and Dart's.
     module StageTemplates
-      GRADLE = stages("./gradlew check -x test", "./gradlew assemble", "./gradlew test", "./gradlew integrationTest")
-               .freeze
+      NO_GRADLE_LINTER = 'echo "No source linter in the build: put ktlint, spotless or detekt in .fun-ci/lint.sh"'
+
+      GRADLE = stages(NO_GRADLE_LINTER, "./gradlew assemble testClasses",
+                      "./gradlew test", "./gradlew integrationTest").freeze
 
       MANAGED = {
         jvm_gradle_kotlin: GRADLE,
         jvm_gradle_groovy: GRADLE,
-        jvm_maven: stages("mvn verify -DskipTests", "mvn compile", "mvn test", "mvn verify"),
-        dotnet: stages("dotnet format --verify-no-changes", "dotnet build",
-                       'dotnet test --filter "Category!=Slow"', 'dotnet test --filter "Category=Slow"'),
-        elixir_mix: stages("mix format --check-formatted", "mix deps.get && mix compile",
+        jvm_maven: stages("mvn validate", "mvn test-compile", "mvn surefire:test",
+                          "mvn failsafe:integration-test failsafe:verify"),
+        dotnet: stages("dotnet format whitespace --folder --verify-no-changes", "dotnet build",
+                       'dotnet test --no-build --filter "Category!=Slow"',
+                       'dotnet test --no-build --filter "Category=Slow"'),
+        elixir_mix: stages("mix format --check-formatted", "mix deps.get && MIX_ENV=test mix compile",
                            "mix test --exclude slow", "mix test --only slow"),
-        dart: stages("dart analyze", "dart pub get", "dart test --exclude-tags slow", "dart test --tags slow")
+        dart: stages("dart analyze", "dart pub get --precompile", "dart test --exclude-tags slow",
+                     "dart test --compiler source --tags slow")
       }.freeze
     end
   end

data/lib/fun_ci/setup/stage_templates/native.rb

@@ -15,7 +15,7 @@ module FunCi
                            "cargo test", "cargo test -- --ignored"),
         go: stages("go vet ./...", "go build ./...", "go test -short ./...", "go test ./..."),
         swift: stages("swift format lint --recursive --strict .", "swift build --build-tests",
-                      "swift test --skip Slow", "swift test --filter Slow"),
+                      "swift test --skip-build --skip Slow", "swift test --skip-build --filter Slow"),
         cmake: stages(CLANG_FORMAT, "cmake -S . -B build && cmake --build build",
                       "#{CTEST} -LE slow", "#{CTEST} -L slow"),
         make: stages("make lint", "make", "make test", "make test-slow")

data/lib/fun_ci/setup/stage_templates/shell.rb

@@ -4,11 +4,20 @@ module FunCi
   module Setup
     # What every stack's stage scripts are made of.
     module StageTemplates
-      def self.script(body) = "#!/bin/sh\n#{body}\n"
+      # What each stage runs beside, said where its script is edited (design.md,
+      # Stages side by side).
+      SIDE_BY_SIDE = {
+        "lint.sh" => "Runs beside build.sh, so it reads the source alone.",
+        "build.sh" => "Runs beside lint.sh; then fast.sh and slow.sh run side by side on what it builds.",
+        "fast.sh" => "Runs beside slow.sh, on what build.sh built.",
+        "slow.sh" => "Runs beside fast.sh, on what build.sh built."
+      }.freeze
+
+      def self.script(name, body) = "#!/bin/sh\n# #{SIDE_BY_SIDE.fetch(name)}\n#{body}\n"
 
       def self.stages(lint, build, fast, slow)
-        { "lint.sh" => lint, "build.sh" => build, "fast.sh" => fast, "slow.sh" => slow }.transform_values do |body|
-          script(body)
+        { "lint.sh" => lint, "build.sh" => build, "fast.sh" => fast, "slow.sh" => slow }.to_h do |name, body|
+          [name, script(name, body)]
         end
       end
     end

data/lib/fun_ci/setup/stage_templates.rb

@@ -18,7 +18,7 @@ module FunCi
       # { "lint.sh" => script, ... }; +lint_override+ replaces the lint command.
       def self.scripts(template_id, lint_override: nil)
         scripts = TEMPLATES.fetch(template_id)
-        lint_override ? scripts.merge("lint.sh" => script(lint_override)) : scripts
+        lint_override ? scripts.merge("lint.sh" => script("lint.sh", lint_override)) : scripts
       end
     end
   end

data/lib/fun_ci/version.rb

@@ -2,5 +2,5 @@
 
 # Loaded on its own by the gemspec, so it must not require anything.
 module FunCi
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fun_ci
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Erik Thyge Madsen
@@ -237,10 +237,12 @@ files:
 - lib/fun_ci/setup/agent_instructions.rb
 - lib/fun_ci/setup/commands.rb
 - lib/fun_ci/setup/git_hooks.rb
+- lib/fun_ci/setup/gradle_linter_detector.rb
 - lib/fun_ci/setup/hook_script.rb
 - lib/fun_ci/setup/hook_writer.rb
 - lib/fun_ci/setup/installer.rb
 - lib/fun_ci/setup/legacy_hooks.rb
+- lib/fun_ci/setup/lint_detection.rb
 - lib/fun_ci/setup/maven_linter_detector.rb
 - lib/fun_ci/setup/project_config.rb
 - lib/fun_ci/setup/project_detector.rb