semmy 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9c4378a310880351973ba7495052ba8732629137915052be599823e74436c5
-  data.tar.gz: f3225ce6b30493cd39ca8b53a1751367874bb4cc195944eaeefd9c8b3881f31d
+  metadata.gz: ce09082714dcb3d35eb9667425bf29167c3d3a768138b272a7b09af7ff592343
+  data.tar.gz: 819dd6a572482aced62c3a3b80ab28d4af69a09276401cca60f0536df602194d
 SHA512:
-  metadata.gz: bdc2c3cb16604b4204a69de93c0b6d362487d743943e7d8da4bb40073fc4efcdef4d00b1fabf75a5311966edcd884607fcaf310545842a38f76a3517592fcfd4
-  data.tar.gz: 3ca48dbd6d46c1ef27c493f0d45404344ee13bbb6a2258029ecf6dea8eed8bc7d462f7a7051380ccf59f3bff041038c7b4b6c75ae32819ad7b6b08cb649cd1bb
+  metadata.gz: f4e4fb1222c83d1e94ccf400719c36d21501fb1f4219cae6a314ce389fce167bbeb2f5a881fc0cf2bf7fe42c72ee63e2fbaec43a7e5a89cf83528bd589884925
+  data.tar.gz: 6bbcad0f49ab3726535dde84915a57f139708ebefd97fe1879dc8e1a97c22a6c051162c0ee4279bdb76df4bd4c793fc0805e56886776dc85db09963aedf6368f

data/CHANGELOG.md

@@ -1,13 +1,13 @@
 # CHANGELOG
 
-### Version 1.2.0
+### Version 1.3.0
 
-2019-01-24
+2026-09-11
 
-[Compare changes](https://github.com/tf/semmy/compare/1-1-stable...v1.2.0)
+[Compare changes](https://github.com/tf/semmy/compare/1-2-stable...v1.3.0)
 
-- Add config option to automatically push branches after release.
+- Support releasing from Jujutsu repositories.
 
 See
-[1-1-stable branch](https://github.com/tf/semmy/blob/1-1-stable/CHANGELOG.md)
+[1-2-stable branch](https://github.com/tf/semmy/blob/1-2-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -21,6 +21,28 @@ tags.
 Patch level versions are released via backports to the stable
 branches.
 
+### Jujutsu Repositories
+
+Semmy detects a `.jj` directory and drives
+[Jujutsu](https://jj-vcs.github.io/jj/) instead of Git. Bookmarks take
+the place of branches: since jj has no checked out branch, the
+bookmark of the closest ancestor commit is used and the commit tasks
+move it forward explicitly. The release branch is resolved once per
+rake run, before `branches:create_stable` places a second bookmark on
+the same commit.
+
+Bundler's `release` task shells out to Git, and colocated jj
+repositories leave `HEAD` detached, which would make its push step
+fail with `src refspec refs/heads/HEAD does not match any`. Semmy
+attaches `HEAD` to the release branch in a prerequisite of Bundler's
+`release:source_control_push` task. Only the ref is moved, never the
+working copy, and jj detaches `HEAD` again on its next working copy
+update.
+
+This requires the working copy commit to sit directly on top of the
+release branch. Otherwise the release aborts with a hint to run
+`jj new master`.
+
 ### Version Suffix
 
 The version in the gem's version file is increased in a separate

data/lib/semmy/scm/git.rb

@@ -0,0 +1,34 @@
+require 'git'
+
+module Semmy
+  module Scm
+    module Git
+      extend self
+
+      def current_branch
+        repository.current_branch
+      end
+
+      def commit_all(message, _branch)
+        repository.commit_all(message)
+      end
+
+      def create_branch(name, _base)
+        repository.branch(name).create
+      end
+
+      def push(remote, name)
+        repository.push(remote, name)
+      end
+
+      def attach_git_head(_branch)
+      end
+
+      private
+
+      def repository
+        ::Git.open('.')
+      end
+    end
+  end
+end

data/lib/semmy/scm/jj.rb

@@ -0,0 +1,85 @@
+require 'open3'
+
+module Semmy
+  module Scm
+    module Jj
+      extend self
+
+      class CommandFailed < Error; end
+      class BookmarkNotFound < Error; end
+      class GitHeadMismatch < Error; end
+
+      def current_branch
+        jj('log', '--no-graph',
+           '--revisions', 'heads(::@ & bookmarks())',
+           '--template', 'local_bookmarks.map(|bookmark| bookmark.name()).join("\n")')
+          .split("\n").first
+      end
+
+      def commit_all(message, branch)
+        bookmark = required_bookmark(branch)
+
+        jj('commit', '--message', message)
+        jj('bookmark', 'set', bookmark, '--revision', '@-')
+      end
+
+      def create_branch(name, base)
+        jj('bookmark', 'create', name, '--revision', required_bookmark(base))
+      end
+
+      def push(remote, name)
+        unless bookmark?(name)
+          fail(BookmarkNotFound, "Bookmark #{name} does not exist.")
+        end
+
+        jj('git', 'push', '--remote', remote, '--bookmark', name)
+      end
+
+      def attach_git_head(branch)
+        bookmark = required_bookmark(branch)
+        reference = "refs/heads/#{bookmark}"
+
+        unless git('rev-parse', 'HEAD') == git('rev-parse', reference)
+          fail(GitHeadMismatch,
+               "Git HEAD is not at #{bookmark}. " \
+               "Run `jj new #{bookmark}` before releasing.")
+        end
+
+        Shell.info("Attaching git HEAD to #{bookmark}.")
+        git('symbolic-ref', 'HEAD', reference)
+      end
+
+      private
+
+      def required_bookmark(name)
+        name ||
+          fail(BookmarkNotFound,
+               'No bookmark found in ancestors of working copy commit.')
+      end
+
+      def bookmark?(name)
+        !jj('bookmark', 'list', '--template', 'name ++ "\n"', name).strip.empty?
+      end
+
+      def jj(*args)
+        run('jj', *args)
+      end
+
+      def git(*args)
+        run('git', *args)
+      end
+
+      def run(command, *args)
+        stdout, stderr, status = Open3.capture3(command, *args)
+
+        unless status.success?
+          fail(CommandFailed,
+               "Command `#{command} #{args.join(' ')}` failed:\n#{stderr}")
+        end
+
+        Shell.sub_process_output(stderr.chomp) unless stderr.empty?
+        stdout
+      end
+    end
+  end
+end

data/lib/semmy/scm.rb

@@ -1,17 +1,46 @@
+require 'pathname'
+
+require 'semmy/scm/git'
+require 'semmy/scm/jj'
+
 module Semmy
   module Scm
     extend self
 
     def on_master?
-      git.current_branch == 'master'
+      release_branch == 'master'
     end
 
     def on_minor_version_stable?(stable_branch_name)
-      !!git.current_branch.match(stable_branch_matcher(stable_branch_name))
+      !!release_branch.to_s.match(stable_branch_matcher(stable_branch_name))
     end
 
     def on_major_version_stable?(stable_branch_name)
-      !!git.current_branch.match(major_version_stable_branch_matcher(stable_branch_name))
+      !!release_branch.to_s.match(major_version_stable_branch_matcher(stable_branch_name))
+    end
+
+    def commit_all(message)
+      repository.commit_all(message, release_branch)
+    end
+
+    def create_branch(name)
+      repository.create_branch(name, release_branch)
+    end
+
+    def push(remote, name)
+      repository.push(remote, name)
+    end
+
+    def attach_git_head
+      repository.attach_git_head(release_branch)
+    end
+
+    def release_branch
+      @release_branch ||= repository.current_branch
+    end
+
+    def reset
+      @release_branch = nil
     end
 
     private
@@ -24,8 +53,13 @@ module Semmy
       Regexp.new(stable_branch_name.gsub(/%\{\w+\}/, '[0-9]+'))
     end
 
-    def git
-      Git.open('.')
+    def repository
+      Pathname.pwd.ascend do |directory|
+        return Jj if directory.join('.jj').directory?
+        return Git if directory.join('.git').exist?
+      end
+
+      Git
     end
   end
 end

data/lib/semmy/tasks/branches.rb

@@ -1,5 +1,3 @@
-require 'git'
-
 module Semmy
   module Tasks
     class Branches < Base
@@ -8,7 +6,7 @@ module Semmy
           task 'create_stable' do
             Shell.info("Creating stable branch #{stable_branch_name}.")
 
-            git.branch(stable_branch_name).create
+            Scm.create_branch(stable_branch_name)
           end
 
           task 'push_master', [:remote] do |_, args|
@@ -18,6 +16,10 @@ module Semmy
           task 'push_previous_stable', [:remote] do |_, args|
             push_branch(args[:remote], previous_stable_branch_name)
           end
+
+          task 'attach_git_head' do
+            Scm.attach_git_head
+          end
         end
       end
 
@@ -38,15 +40,11 @@ module Semmy
 
         if config.push_branches_after_release
           Shell.info("Pushing #{name} to #{remote}.")
-          git.push(remote, name)
+          Scm.push(remote, name)
         else
           Shell.info("NOTE: Remember to push #{name} to #{remote}.")
         end
       end
-
-      def git
-        Git.open('.')
-      end
     end
   end
 end

data/lib/semmy/tasks/commit.rb

@@ -1,5 +1,3 @@
-require 'git'
-
 module Semmy
   module Tasks
     class Commit < Base
@@ -8,7 +6,7 @@ module Semmy
           task 'prepare' do
             Shell.info('Creating prepare commit.')
 
-            git.commit_all(config.prepare_commit_message % {
+            Scm.commit_all(config.prepare_commit_message % {
                              version: Project.version
                            })
           end
@@ -16,15 +14,11 @@ module Semmy
           task 'bump' do
             Shell.info('Creating bump commit.')
 
-            git.commit_all(config.bump_commit_message % {
+            Scm.commit_all(config.bump_commit_message % {
                              version: Project.version
                            })
           end
         end
-
-        def git
-          Git.open('.')
-        end
       end
     end
   end

data/lib/semmy/tasks.rb

@@ -26,6 +26,8 @@ module Semmy
         Branches.new(config)
       end
 
+      task 'release:source_control_push' => 'semmy:branches:attach_git_head'
+
       desc 'Prepare minor or major release'
       task 'release:prepare:master' => [
         'semmy:versioning:remove_development_version_suffix',

data/lib/semmy/version.rb

@@ -1,3 +1,3 @@
 module Semmy
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/semmy.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'unindent', '~> 1.0'
   spec.add_dependency 'rainbow', '~> 2.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.42.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semmy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tim Fischbach
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2026-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -52,34 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.42.0
-description: 
+description:
 email:
 - mail@timfischbach.de
 executables: []
@@ -140,6 +126,8 @@ files:
 - lib/semmy/project.rb
 - lib/semmy/ruby_gems.rb
 - lib/semmy/scm.rb
+- lib/semmy/scm/git.rb
+- lib/semmy/scm/jj.rb
 - lib/semmy/shell.rb
 - lib/semmy/tasks.rb
 - lib/semmy/tasks/base.rb
@@ -157,7 +145,7 @@ homepage: https://github.com/tf/semmy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,9 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Rake tasks for a semantic versioning of gems
 test_files: []