xot 0.4.0 → 0.5.0

data/test/test_rake_changelog.rb

@@ -0,0 +1,86 @@
+require_relative 'helper'
+require 'tmpdir'
+require 'xot/rake/changelog'
+
+
+class TestRakeChangeLog < Test::Unit::TestCase
+
+  TEXT = <<~END
+    # app ChangeLog
+
+
+    ## [v1.2.3] - 2026-10-12
+
+    - Add a "quoted" thing
+    - Fix another
+
+
+    ## [ v1.2 ] - 2026-10-01
+
+    - First
+  END
+
+  def changelog(text = TEXT, &block)
+    Dir.mktmpdir do |dir|
+      path = File.join dir, 'ChangeLog.md'
+      File.write path, text
+      block.call Xot::ChangeLog.new(path)
+    end
+  end
+
+  def test_add()
+    changelog do |log|
+      log.add '1.2.4', ['Add more', 'Fix it'], date: Time.new(2026, 10, 13)
+      assert_equal <<~END, File.read(log.path)
+        # app ChangeLog
+
+
+        ## [v1.2.4] - 2026-10-13
+
+        - Add more
+        - Fix it
+
+
+        ## [v1.2.3] - 2026-10-12
+
+        - Add a "quoted" thing
+        - Fix another
+
+
+        ## [ v1.2 ] - 2026-10-01
+
+        - First
+      END
+      assert_equal %w[1.2.4 1.2.3 1.2], log.versions
+    end
+
+    changelog "# app ChangeLog\n" do |log|
+      log.add 'v0.1.0', ['First'], date: Time.new(2026, 10, 13)
+      assert_equal(
+        "# app ChangeLog\n\n\n## [v0.1.0] - 2026-10-13\n\n- First\n",
+        File.read(log.path))
+      assert_equal %w[0.1.0], log.versions
+    end
+
+    # before the section of a version, below one of none
+    changelog "# app ChangeLog\n\n\n## Unreleased\n\n- Next\n\n\n## [v0.1.0] - 2026-10-01\n\n- First\n" do |log|
+      log.add '0.1.1', ['Add a'], date: Time.new(2026, 10, 13)
+      assert_equal(
+        "# app ChangeLog\n\n\n## Unreleased\n\n- Next\n\n\n" +
+        "## [v0.1.1] - 2026-10-13\n\n- Add a\n\n\n## [v0.1.0] - 2026-10-01\n\n- First\n",
+        File.read(log.path))
+    end
+  end
+
+  def test_sections()
+    changelog do |log|
+      assert_equal %w[1.2.3 1.2],                             log.versions
+      assert_equal "- Add a \"quoted\" thing\n- Fix another", log.changes('1.2.3')
+      assert_equal "- Add a \"quoted\" thing\n- Fix another", log.changes('v1.2.3')
+      assert_equal '- First',                                 log.changes('1.2')
+      assert_nil                                              log.changes('9.9')
+    end
+    changelog("# app ChangeLog\n") {|log| assert_empty log.versions}
+  end
+
+end# TestRakeChangeLog

data/test/test_rake_github.rb

@@ -0,0 +1,79 @@
+require_relative 'helper'
+require 'xot/rake'
+
+
+class TestRakeGitHub < Test::Unit::TestCase
+
+  include Rake::DSL
+  include Xot::Rake
+
+  def test_dependency_names()
+    Dir.mktmpdir do |dir|
+      Dir.chdir dir do
+        File.write 'Rakefile', <<~END
+          require 'xot/rake'
+
+          require 'xot/extension'
+          require "rucy/extension"
+          require 'reflex/extension'
+          # require 'rays/extension'
+        END
+        FileUtils.mkdir_p 'lib/reflex'
+        FileUtils.touch   'lib/reflex/extension.rb'
+        assert_equal %w[xot rucy], dependency_names # but the one of this
+      end
+    end
+  end
+
+  def test_setup_monorepo()
+    Dir.mktmpdir do |dir|
+      FileUtils.mkdir_p %W[#{dir}/app #{dir}/all]
+      Dir.chdir "#{dir}/app" do
+        commands = []
+        win32    = false
+        define_singleton_method(:sh)     {|*args| commands << args}
+        define_singleton_method(:rm_rf)  {|*args| commands << [:rm_rf, *args]}
+        define_singleton_method(:cp_r)   {|*args| commands << [:cp_r,  *args]}
+        define_singleton_method(:win32?) {win32} # whatever the platform running this
+
+        setup_monorepo 'v1', 'xot', 'rays'
+        assert_include commands,
+          ['git', 'fetch', '-q', '--depth', '1', 'https://github.com/xord/all.git', 'v1']
+        assert_include commands, ['ln', '-snf', 'all/rays', '../rays']
+        assert_equal   ['cd ../all/xot && rake ext', 'cd ../all/rays && rake ext'],
+          commands.map {_1.first.strip}.grep(/rake ext$/)
+
+        commands.clear
+        win32 = true
+        setup_monorepo 'v1', 'rays'
+        assert_equal [
+          'cd ../all/rays && rake ext',
+          [:rm_rf, '../rays'],
+          [:cp_r,  '../all/rays', '../rays']
+        ], commands.last(3).map {_1.first.is_a?(String) ? _1.first.strip : _1}
+
+        assert_raise(RuntimeError) {setup_monorepo 'master'}
+      end
+    end
+  end
+
+  def test_setup_mesa()
+    Dir.mktmpdir do |dir|
+      commands = []
+      define_singleton_method(:sh) {|*args| commands << args}
+      env, ENV['GITHUB_ENV'] = ENV['GITHUB_ENV'], File.join(dir, 'env')
+
+      setup_mesa '1.2.3'
+      assert_equal [
+        ['curl', '-sSfL', '-o', 'mesa.7z',
+          'https://github.com/pal1000/mesa-dist-win/releases/download/1.2.3/mesa3d-1.2.3-release-msvc.7z'],
+        ['7z', 'x', 'mesa.7z'],
+        ['powershell.exe', '.\\systemwidedeploy.cmd', '1']
+      ], commands
+      assert_equal "GALLIUM_DRIVER=llvmpipe\n", File.read(ENV['GITHUB_ENV'])
+    ensure
+      ENV['GITHUB_ENV'] = env
+    end
+  end
+
+end# TestRakeGitHub

data/test/test_rake_util.rb

@@ -0,0 +1,119 @@
+require_relative 'helper'
+require 'xot/rake'
+
+
+class TestRakeUtil < Test::Unit::TestCase
+
+  include Rake::DSL
+  include Xot::Rake
+  include GitRepo
+
+  ChangeLog = Xot::ChangeLog
+
+  def test_install_hooks()
+    repo do
+      install_hooks
+      assert File.file?(      '.git/hooks/pre-commit')
+      assert File.executable?('.git/hooks/pre-commit') unless win32?
+
+      log = ChangeLog.new
+      log.add '0.2.0', ['Add a'], date: Time.new(2026, 10, 12)
+      git! 'add', 'ChangeLog.md'
+      git! 'commit', '-q', '-m', 'Update ChangeLog'
+      assert_equal '0.2.0', File.read('VERSION')
+      assert_equal '0.2.0', IO.popen(%w[git show HEAD:VERSION], &:read)
+      assert_empty IO.popen(%w[git status --porcelain], &:read)
+
+      log.add '1', ['Add c'], date: Time.new(2026, 10, 12)
+      git! 'add', 'ChangeLog.md'
+      git! 'commit', '-q', '-m', 'Update ChangeLog'
+      assert_equal '1', File.read('VERSION')
+
+      log.add '0.3.0', ['Add b'], date: Time.new(2026, 10, 13)
+      File.write 'VERSION', '9.9.9'
+      git! 'add', 'ChangeLog.md'
+      assert !system('git', 'commit', '-q', '-m', 'Update ChangeLog', out: File::NULL, err: File::NULL)
+      assert_equal '9.9.9', File.read('VERSION')
+    end
+  end
+
+  def test_version_changes()
+    repo do
+      assert_empty version_changes
+
+      commit "Add a\n\nwith the body", 'a.rb' => ''
+      commit 'Fix b',                  'sub/b.rb' => ''
+      assert_equal ['Add a', 'Fix b'], version_changes
+      assert_equal ['Fix b'],          version_changes('sub')
+
+      commit 'Bump the version', 'VERSION' => '0.2.9'
+      assert_empty version_changes
+
+      # a branch merged, by the merge commit only, the line after 'Merge
+      # branch ...' of which tells the changes of the branch
+      git! 'checkout', '-q', '-b', 'topic'
+      commit 'Add c', 'c.rb' => ''
+      commit 'Add d', 'sub/d.rb' => ''
+      git! 'checkout', '-q', '-'
+      commit 'Fix e', 'e.rb' => ''
+      git! 'merge', '-q', '--no-ff',
+        '-m', "Merge branch 'topic'\n\nAdd c and d\n\nwith the body",
+        'topic'
+      assert_equal ['Fix e', 'Add c and d'], version_changes
+      assert_equal ['Fix b', 'Add c and d'], version_changes('sub') # with no VERSION
+
+      # the title of one with nothing after 'Merge branch ...', or of another
+      git! 'checkout', '-q', '-b', 'topic2'
+      commit 'Add f', 'f.rb' => ''
+      git! 'checkout', '-q', '-'
+      git! 'merge', '-q', '--no-ff', '-m', "Merge branch 'topic2'", 'topic2'
+      git! 'checkout', '-q', '-b', 'topic3'
+      commit 'Add g', 'g.rb' => ''
+      git! 'checkout', '-q', '-'
+      git! 'merge', '-q', '--no-ff', '-m', "Add g\n\nwith the body", 'topic3'
+      assert_equal ["Merge branch 'topic2'", 'Add g'], version_changes.last(2)
+    end
+  end
+
+  def test_next_version()
+    repo do
+      # the third number, of three numbers
+      {
+        '0.1.0'   => '0.1.1',
+        '0.2.9'   => '0.2.10',
+        '1.2'     => '1.2.1',
+        '1'       => '1.0.1',
+        '1.2.3.4' => '1.2.4'
+      }.each do |version, next_|
+        File.write 'VERSION', version
+        assert_equal next_, next_version, version
+      end
+    end
+  end
+
+  def test_tag_versions()
+    repo do
+      commit 'Add a', 'a.rb' => ''
+      ChangeLog.new.add '0.1.1', ['Add a'], date: Time.new(2026, 10, 12)
+      commit 'Version 0.1.1', 'VERSION' => '0.1.1'
+      commit 'Add b', 'b.rb' => ''
+
+      verbose(false) {tag_versions}
+      assert_equal %w[v0.1.0 v0.1.1], IO.popen(%w[git tag], &:read).lines(chomp: true)
+      assert_equal(
+        "- Add a\n",
+        IO.popen(%w[git tag -l --format=%(contents) v0.1.1], &:read).sub(/\n+\z/, "\n"))
+      assert_equal(
+        IO.popen(%w[git rev-parse HEAD~1], &:read),
+        IO.popen(%w[git rev-list -n 1 v0.1.1], &:read))
+
+      # the versions back to the one tagged already, which is not tagged again
+      commit 'Version 0.1.2', 'VERSION' => '0.1.2'
+      verbose(false) {tag_versions}
+      assert_equal(
+        %w[v0.1.0 v0.1.1 v0.1.2],
+        IO.popen(%w[git tag], &:read).lines(chomp: true))
+    end
+  end
+
+end# TestRakeUtil

data/xot.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   ext   = Xot::Extension
   name  = ext.name true
-  rdocs = glob.call *%w[README]
+  rdocs = glob.call(*%w[README])
 
   s.name        = name
   s.version     = ext.version
@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
+  s.add_dependency 'rake'
+  s.add_dependency 'ostruct'
+
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-04 00:00:00.000000000 Z
-dependencies: []
+date: 2026-11-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library include some useful utility classes and functions for development
   with C++.
 email: xordog@gmail.com
@@ -19,10 +47,10 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/actions/setup-monorepo/action.yml"
 - ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
-- ".github/workflows/utils.rb"
 - CONTRIBUTING.md
 - ChangeLog.md
 - Gemfile
@@ -57,7 +85,10 @@ files:
 - lib/xot/invoker.rb
 - lib/xot/rake.rb
 - lib/xot/rake/alias_task.rb
+- lib/xot/rake/changelog.rb
 - lib/xot/rake/escalation.rb
+- lib/xot/rake/github.rb
+- lib/xot/rake/hooks/pre-commit
 - lib/xot/rake/util.rb
 - lib/xot/setter.rb
 - lib/xot/test.rb
@@ -78,6 +109,9 @@ files:
 - test/test_inspectable.rb
 - test/test_invoker.rb
 - test/test_rake.rb
+- test/test_rake_changelog.rb
+- test/test_rake_github.rb
+- test/test_rake_util.rb
 - test/test_setter.rb
 - test/test_tester.rb
 - test/test_universal_accessor.rb
@@ -102,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A Utility library for C++ developemt.
@@ -117,6 +151,9 @@ test_files:
 - test/test_inspectable.rb
 - test/test_invoker.rb
 - test/test_rake.rb
+- test/test_rake_changelog.rb
+- test/test_rake_github.rb
+- test/test_rake_util.rb
 - test/test_setter.rb
 - test/test_tester.rb
 - test/test_universal_accessor.rb

data/.github/workflows/utils.rb

@@ -1,127 +0,0 @@
-require 'shellwords'
-
-ALL_REPO        = 'xord/all'
-ALL_DIR         = '../all'
-ALL_FETCH_DEPTH = 100
-
-RENAMES = {reflex: 'reflexion'}
-
-def sh(cmd)
-  puts cmd
-  system cmd
-end
-
-def setup_dependencies(only: nil)
-  gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
-  return unless gemspec_path
-
-  gemspec = File.read gemspec_path
-  name    = File.basename gemspec_path, '.gemspec'
-
-  exts = File.readlines('Rakefile')
-    .map {|l| l[%r|^\s*require\W+([\w\-\_]+)/extension\W+$|, 1]}
-    .compact
-    .reject {|ext| ext == name}
-  exts = exts & [only].flatten.map(&:to_s) if only
-  return if exts.empty?
-
-  unless setup_dependencies_via_monorepo(exts)
-    setup_dependencies_via_each_repo_by_version(gemspec, exts)
-  end
-
-  exts.each {|ext| sh %( cd ../#{ext} && rake ext )}
-end
-
-def setup_dependencies_via_monorepo(exts)
-  return false unless checkout_monorepo
-  exts.each {|ext| sh %( ln -snf all/#{ext} ../#{ext} )}
-  true
-end
-
-def checkout_monorepo()
-  uuid = `git log -1 --format=%B`[/^\[\[([0-9a-fA-F-]+)\]\]$/, 1]
-  return false unless uuid
-
-  commit = setup_monorepo uuid
-  return false unless commit
-
-  Dir.chdir(ALL_DIR) {sh %( git checkout -q #{commit} )}
-  true
-end
-
-def setup_monorepo(uuid)
-  unless File.directory? ALL_DIR
-    url = "https://github.com/#{ALL_REPO}.git"
-    sh %( git clone --no-tags --depth #{ALL_FETCH_DEPTH} #{url} #{ALL_DIR} )
-  end
-  loop do
-    commit = find_monorepo_commit uuid
-    return commit if commit
-
-    deepened = Dir.chdir ALL_DIR do
-      before = `git rev-list --count HEAD`.to_i
-      sh %( git fetch --deepen #{ALL_FETCH_DEPTH} )
-      `git rev-list --count HEAD`.to_i > before
-    end
-    return nil unless deepened
-  end
-end
-
-def find_monorepo_commit(uuid)
-  Dir.chdir ALL_DIR do
-    out = `git log origin/HEAD -F --grep="[[#{uuid}]]" --format=%H -1`.strip
-    out.empty? ? nil : out
-  end
-end
-
-def setup_dependencies_via_each_repo_by_version(gemspec, exts)
-  exts.each do |ext|
-    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    ver   = gemspec[/add_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
-    opts  = '-c advice.detachedHead=false --depth 1'
-    clone = "git clone #{opts} https://github.com/xord/#{ext}.git ../#{ext}"
-
-    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
-    # often fails before tagging each new tag
-    sh %( #{clone} --branch v#{ver} || #{clone} )
-  end
-end
-
-def tag_versions()
-  changes = changelogs
-  tags    = `git tag`.lines chomp: true
-  vers    = `git log --oneline ./VERSION`
-    .lines(chomp: true)
-    .map {|line| line.split.first[/^\w+$/]}
-    .map {|sha| [`git cat-file -p #{sha}:./VERSION 2>/dev/null`[/[\d\.]+/], sha]}
-    .select {|ver, sha| ver && sha}
-    .reverse
-    .to_h
-
-  vers.to_a.reverse.each do |ver, sha|
-    tag = "v#{ver}"
-    break if tags.include?(tag)
-    sh %( git tag -a -m \"#{changes[tag]&.gsub '"', '\\"'}\" #{tag} #{sha} )
-  end
-end
-
-def release(*paths)
-  tag   = ENV['GITHUB_REF']&.sub(%r|^refs/tags/|, '') || raise('GITHUB_REF tag not set')
-  notes = (changelogs[tag] || '').shellescape
-  paths = paths.flatten.join ' '
-
-  sh(%( gh release create #{tag} #{paths} --notes #{notes} )) ||
-    sh(%( gh release upload #{tag} #{paths} --clobber )) ||
-    raise('failed to upload to releases')
-end
-
-def changelogs()
-  File.read('ChangeLog.md')
-    .split(/^\s*##\s*\[\s*(v[\d\.]+)\s*\].*$/)
-    .slice(1..)
-    .each_slice(2)
-    .to_h
-    .transform_values(&:strip!)
-rescue Errno::ENOENT
-  raise 'failed to get changelogs'
-end