ori-rb 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03b2c0bd50b0d212d915829d9aab2bac8931cf15610fe450618911a06e6ba34c
-  data.tar.gz: 87e21b3dc2b88cd1b58de05c9f28a956e5a2488191eac190ae9c4fe8972466a0
+  metadata.gz: 958209a6ea858a765a4f3f642d195cdca3e7bfc9c760d3761403d01fdac6ef33
+  data.tar.gz: bf4787b1c567aa2749ca6e72d572218c7e613751122e8d1440ee5102e7c92b7c
 SHA512:
-  metadata.gz: e4735eb0c3bb0850ce368358e152b7f442c4405cb8fe15f6168a3be4e92508697583cde21da979262dd0b848dd8fffb71a47ef4a62e25d9f3021140f74a23616
-  data.tar.gz: 22b75abdb0b5abd387f823aafcbb0e954ed5f791026d1d9c6dacfeb5a558cf9f31df9c320027d68f0887520ea3e006b5c135c9ca6fb50f763102ffac3b5c1f3a
+  metadata.gz: 64a8f68cfdbccd65ab1d7553f92784ca55f46ab74c9ea3b6d3eadae1e3720b75aecec468a412d47a5f8e448946bf4c270280205b2a9368bb77d62d042a7993b7
+  data.tar.gz: 7c95388c4077a57fe10dd8d474c985703ac551e3daf7806afa3e9de28e5c905cc668d826429b84d186686f84917c77801e2ee678776d96ee61bb94fecaca45ac

data/README.md

@@ -432,12 +432,25 @@ Timeout!
 
 The procedure to publish a new release version is as follows:
 
-- Update `lib/ori/version.rb`
-- Run bundle install to bump the version of the gem in `Gemfile.lock`
-- Open a pull request, review, and merge
-- Review commits since the last release to identify user-facing changes that should be included in the release notes
-- [Create a release on GitHub](https://github.com/jahfer/ori/releases/new) with a version number that matches `lib/ori/version.rb`
-- Deploy the gem
+1. Bump the version and commit:
+
+   ```sh
+   mise run version:bump <VERSION>
+   ```
+
+   This updates `lib/ori/version.rb`, runs `bundle install` to update `Gemfile.lock`, commits with message `v<VERSION>`, and creates an annotated tag.
+
+2. Review the commit to confirm the version is correct.
+
+3. Push, build, and publish:
+
+   ```sh
+   mise run release
+   ```
+
+   This pushes the commit and tag to origin, builds the gem, and publishes it to RubyGems.
+
+4. [Create a release on GitHub](https://github.com/jahfer/ori/releases/new) with a version number that matches `lib/ori/version.rb`, including release notes for user-facing changes since the last release.
 
 ## License
 

data/lib/ori/scope.rb

@@ -390,6 +390,21 @@ module Ori
       child_scopes.delete(scope)
     end
 
+    def nearest_timeout_at
+      candidates = [] #: Array[Numeric]
+      candidates.concat(waiting.values.compact) unless waiting.empty?
+      candidates << @deadline_at if @deadline_at
+
+      if child_scopes?
+        child_scopes.each do |scope|
+          child_nearest = scope.nearest_timeout_at
+          candidates << child_nearest if child_nearest
+        end
+      end
+
+      candidates.min
+    end
+
     private
 
     attr_reader :parent_scope
@@ -565,14 +580,10 @@ module Ori
     end
 
     def next_timeout(now = nil)
-      timeouts = [] #: Array[Numeric]
-      timeouts.concat(waiting.values.compact) unless waiting.empty?
-      timeouts << @deadline_at if @deadline_at
-
-      return 0 if timeouts.empty?
+      nearest = nearest_timeout_at
+      return 0 unless nearest
 
       now ||= current_time
-      nearest = timeouts.min #: as !nil
       delay = nearest - now
 
       # Return 0 if the timeout is in the past, otherwise return the delay

data/lib/ori/version.rb

@@ -1,5 +1,5 @@
 # typed: strict
 
 module Ori
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/mise-tasks/release

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+#MISE description="Push, build, and publish the gem (run version:bump first)"
+
+set -euo pipefail
+
+VERSION_FILE="lib/ori/version.rb"
+VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+' "$VERSION_FILE")
+
+echo "Publishing v${VERSION}..."
+
+# Push commit and tag
+git push && git push --tags
+echo "Pushed to origin"
+
+# Build and publish
+mise run gem:build
+mise run gem:publish
+
+echo "Released v${VERSION} successfully!"

data/mise-tasks/version/bump

@@ -0,0 +1,40 @@
+#!/usr/bin/env -S usage bash
+
+#MISE description="Bump the gem version, run bundle install, and commit with a tag"
+#USAGE arg "<version>" help="New version number (e.g. 0.5.0)"
+
+set -euo pipefail
+
+VERSION="$usage_version"
+VERSION_FILE="lib/ori/version.rb"
+
+# Validate version format
+if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+  echo "Error: Version must be in the format X.Y.Z (e.g. 0.5.0)"
+  exit 1
+fi
+
+# Check for uncommitted changes
+if ! git diff --quiet || ! git diff --cached --quiet; then
+  echo "Error: You have uncommitted changes. Please commit or stash them first."
+  exit 1
+fi
+
+echo "Bumping to v${VERSION}..."
+
+# Update version.rb
+sed -i '' "s/VERSION = \".*\"/VERSION = \"${VERSION}\"/" "$VERSION_FILE"
+echo "Updated ${VERSION_FILE} to ${VERSION}"
+
+# Run bundle install to update Gemfile.lock
+bundle install
+echo "Updated Gemfile.lock"
+
+# Commit and tag
+git add "$VERSION_FILE" Gemfile.lock
+git commit -m "v${VERSION}"
+git tag -a "v${VERSION}" -m "v${VERSION}"
+echo "Created commit and tag v${VERSION}"
+
+echo ""
+echo "Version bump complete. Review the commit, then run 'mise run release' to publish."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ori-rb
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Jahfer Husain
@@ -78,7 +78,9 @@ files:
 - lib/ori/timeout.rb
 - lib/ori/tracer.rb
 - lib/ori/version.rb
+- mise-tasks/release
 - mise-tasks/test
+- mise-tasks/version/bump
 - mise.toml
 - sorbet/config
 - sorbet/rbi/gems/.gitattributes