xot 0.1.30 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e7f0edc34d19659cd23f51014e958a166bb09f74704541b274b0bb8f7356ca
-  data.tar.gz: 52dd65dc0c32a9b20200acad292534a4a036916acd9ef060fb86bb45d6884c00
+  metadata.gz: 6a7e1bc3f6614364c9e0351687c284d86fb2acdd6e90ed831b176f2f523227d1
+  data.tar.gz: 3be0124301e324255f2ab787140524231c42731af1662b5d4e279abec29efc47
 SHA512:
-  metadata.gz: 639c3598521d2b5e530af39a63e87adb45bec0e8c144b726c8d1af8fd265d55ec82570a3bae456b9758570fcc781330d2b42ee5ee897c31f5b056a0d11e754e5
-  data.tar.gz: c4afb22813aa9ee74a90e86deef756730db8e7171fdbf02708808b3ad98477c522f717edeeefa8f9bb6f67dd83eb8d0b6d1efd841ccab5c09d8ea2c974d75e07
+  metadata.gz: 7ea1f3a95375e0de9722cce59ba6ce229948c42c4bac5de353e737a52d8407985eace63de4559843d8bb9ed2cc0f65838cdcd70c0a8abc39e1f955b045d600c0
+  data.tar.gz: 3eec5192e6db769cb4b89bd4f7029f4489adaa74ce905802e4d338decd5e38cc7a3e6901f551303fc2f4a603049f80a78cfaf04b92f64851d422604661037ce8

data/.github/workflows/release-gem.yml

@@ -0,0 +1,59 @@
+name: Release Gem
+
+on:
+  push:
+    tags: ['v[0-9]*']
+
+jobs:
+  release:
+    runs-on: macos-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
+      - name: test
+        run: rake test
+
+      - name: create gem
+        id: gem
+        run: |
+          rake gem
+          echo path=$(ruby -e 'print Dir.glob("*.gem").first') >> $GITHUB_OUTPUT
+
+      - name: create github release
+        id: release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+
+      - name: upload to github release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: ./${{ steps.gem.outputs.path }}
+          asset_name:   ${{ steps.gem.outputs.path }}
+          asset_content_type: application/zip
+
+      - name: upload to rubygems
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          rake upload

data/.github/workflows/tag.yml

@@ -0,0 +1,35 @@
+name: Tag
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies only: :xot'"
+
+      - name: setup user name and email
+        run: |
+          git config --global user.email "xordog@gmail.com"
+          git config --global user.name "xord"
+
+      - name: tag versions
+        run: "ruby -I.github/workflows -rutils -e 'tag_versions'"
+
+      - name: push tags
+        run: git push origin --tags

data/.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: Test
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: macos-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
+      - name: test
+        run: rake test

data/.github/workflows/utils.rb

@@ -0,0 +1,55 @@
+RENAMES = {reflex: 'reflexion'}
+
+def sh(cmd)
+  puts cmd
+  system cmd
+end
+
+def setup_dependencies(build: true, 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
+
+  exts.each do |ext|
+    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
+    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
+    ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+
+    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
+    # often fails before tagging each new tag
+    sh %( #{clone} --branch v#{ver} || #{clone} )
+    sh %( cd ../#{ext} && rake ext )
+  end
+end
+
+def tag_versions()
+  tags = `git tag`.lines chomp: true
+  vers = `git log --oneline ./VERSION`
+    .lines(chomp: true)
+    .map {|line| line.split.first[/^\w+$/]}
+    .map {|hash| [`git cat-file -p #{hash}:./VERSION 2>/dev/null`[/[\d\.]+/], hash]}
+    .select {|ver, hash| ver && hash}
+    .reverse
+    .to_h
+
+  changes = File.read('ChangeLog.md')
+    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
+    .slice(1..-1)
+    .each_slice(2)
+    .to_h
+    .transform_values(&:strip!)
+
+  vers.to_a.reverse.each do |ver, hash|
+    tag = "v#{ver}"
+    break if tags.include?(tag)
+    sh %( git tag -a -m \"#{changes[ver]&.gsub '"', '\\"'}\" #{tag} #{hash} )
+  end
+end

data/ChangeLog.md

@@ -0,0 +1,18 @@
+# xot ChangeLog
+
+
+## [v0.1.32] - 2023-03-01
+
+- fix bugs
+
+
+## [v0.1.31] - 2023-02-26
+
+- add ChangeLog.md file
+- add test.yml, tag.yaml, and release.yml
+- requires ruby 2.7.0 or later
+
+
+## [v0.1.30] - 2023-02-09
+
+- refactoring

data/Rakefile

@@ -7,15 +7,14 @@
 
 require 'xot/rake'
 
-require 'xot/module'
+require 'xot/extension'
 
 
-MODULES = [Xot]
-DLNAME  = 'tester'
+EXTENSIONS = [Xot]
+DLNAME     = 'tester'
 
+default_tasks :ext
 build_native_library
-build_ruby_extension dlname: DLNAME
+build_ruby_extension dlname: DLNAME, liboutput: false
 test_ruby_extension
 build_ruby_gem
-
-task :default => :ext

data/VERSION

@@ -1 +1 @@
-0.1.30
+0.1.32

data/ext/xot/extconf.rb

@@ -7,7 +7,7 @@
 
 require 'mkmf'
 require 'xot/extconf'
-require 'xot/module'
+require 'xot/extension'
 
 
 Xot::ExtConf.new Xot do

data/lib/xot/extconf.rb

@@ -12,10 +12,10 @@ module Xot
 
     include Xot::Rake
 
-    attr_reader :modules, :defs, :inc_dirs, :lib_dirs, :headers, :libs, :local_libs, :frameworks
+    attr_reader :extensions, :defs, :inc_dirs, :lib_dirs, :headers, :libs, :local_libs, :frameworks
 
-    def initialize(*modules, &block)
-      @modules = modules.map {|m| m.const_get :Module}
+    def initialize(*extensions, &block)
+      @extensions = extensions.map {|x| x.const_get :Extension}
       @defs, @inc_dirs, @lib_dirs, @headers, @libs, @local_libs, @frameworks =
         ([[]] * 7).map(&:dup)
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
@@ -28,8 +28,8 @@ module Xot
     def setup()
       yield if block_given?
 
-      modules.each do |m|
-        name = m.name.downcase
+      extensions.each do |x|
+        name = x.name.downcase
         headers << "#{name}.h"
         libs << name
       end
@@ -44,8 +44,8 @@ module Xot
     end
 
     def create_makefile(*args)
-      modules.each do |m|
-        dir_config m.name.downcase, m.inc_dir, m.lib_dir
+      extensions.each do |x|
+        dir_config x.name.downcase, x.inc_dir, x.lib_dir
       end
 
       exit 1 unless headers.all? {|s| have_header s}

data/lib/xot/{module.rb → extension.rb}

@@ -4,7 +4,7 @@
 module Xot
 
 
-  module Module
+  module Extension
 
     module_function
 
@@ -13,7 +13,7 @@ module Xot
     end
 
     def version()
-      open(root_dir 'VERSION') {|f| f.readline.chomp}
+      File.read(root_dir 'VERSION')[/[\d\.]+/]
     end
 
     def root_dir(path = '')
@@ -28,7 +28,7 @@ module Xot
       root_dir 'lib'
     end
 
-  end# Module
+  end# Extension
 
 
 end# Xot

data/lib/xot/rake/util.rb

@@ -12,16 +12,16 @@ module Xot
 
     VERSION_NAME = 'VERSION'
 
-    def modules()
-      env(:MODULES, []).map {|m| m::Module}
+    def extensions()
+      env(:EXTENSIONS, []).map {|m| m::Extension}
     end
 
     def target()
-      modules.last
+      extensions.last
     end
 
     def target_name()
-      env :MODNAME, target.name.downcase
+      env :EXTNAME, target.name.downcase
     end
 
     def inc_dir()
@@ -57,7 +57,7 @@ module Xot
     end
 
     def inc_dirs()
-      env_array(:INCDIRS, []) + modules.reverse.map {|m| m.inc_dir}.flatten
+      env_array(:INCDIRS, []) + extensions.reverse.map {|m| m.inc_dir}.flatten
     end
 
     def src_dirs()
@@ -84,13 +84,25 @@ module Xot
       paths
     end
 
+    def rake_puts(*args)
+      $stderr.puts(*args)
+    end
+
+    def verbose_puts(*args)
+      rake_puts(*args) if ::Rake.verbose
+    end
+
+    def noverbose_puts(*args)
+      rake_puts(*args) unless ::Rake.verbose
+    end
+
     def filter_file(path, &block)
       File.write path, block.call(File.read path)
     end
 
     def cd_sh(dir, cmd)
       Dir.chdir dir do
-        $stderr.puts "(in #{Dir.pwd})"
+        rake_puts "(in #{Dir.pwd})"
         sh cmd
       end
     end
@@ -107,12 +119,12 @@ module Xot
       File.readlines(version_path dir).first.chomp
     end
 
-    def bump_version(index, version = get_version)
+    def bump_version(index, version = get_version, min_digits: 3)
       nums         = version.split('.').map &:to_i
       nums        << 0 until nums.size > index
       nums[index] += 1
       nums.map!.with_index {|num, i| i > index ? 0 : num}
-      nums.pop while nums.last == 0 && nums.size >= 3
+      nums.pop while nums.last == 0 && nums.size > min_digits
       nums.join '.'
     end
 
@@ -242,14 +254,23 @@ module Xot
       s
     end
 
-    def debug(state)
-      ENV['DEBUG'] = state.to_s
+    def verbose?(state = nil)
+      if state != nil
+        ::Rake.verbose state
+        ENV['VERBOSE'] = (!!state).to_s
+      end
+      ::Rake.verbose
     end
 
-    def debug?()
+    def debug?(state = nil)
+      ENV['DEBUG'] = (!!state).to_s if state != nil
       env :DEBUG, false
     end
 
+    def actions?()
+      env :GITHUB_ACTIONS, false
+    end
+
     def win32?()
       RUBY_PLATFORM =~ /mswin|ming|cygwin/
     end

data/lib/xot/rake.rb

@@ -55,6 +55,24 @@ module Xot
       env :TESTS_EXCLUDE, []
     end
 
+    def default_tasks(default = nil)
+      verbose? env(:VERBOSE, false)
+
+      if default
+        task :default => default
+      else
+        task :default
+      end
+
+      task :verbose do
+        verbose? true
+      end
+
+      task :debug do
+        debug? true
+      end
+    end
+
     def build_native_library()
       outname = "lib#{target_name}.a"
       out     = File.join lib_dir, outname
@@ -77,6 +95,7 @@ module Xot
         file out => srcs.values do
           next if srcs.values.empty?
           objs = srcs.values + vendor_srcs_map.values
+          noverbose_puts "linking #{out}"
           sh %( rm -f #{out} )
           sh %( #{ar} #{arflags} #{out} #{objs.join " "} )
         end
@@ -95,6 +114,7 @@ module Xot
         srcs.each do |src, obj|
           desc "compile #{src}"
           file obj => [:vendor, depend, src] + erbs.values do
+            noverbose_puts "compiling #{src}"
             sh %( #{cxx} -c #{cppflags} #{cxxflags} -o #{obj} #{src} )
           end
         end
@@ -102,9 +122,8 @@ module Xot
         erbs.each do |erb, to|
           desc "compile #{erb}"
           file to => erb do
-            print "#{erb}: compiling to #{to} ..."
+            rake_puts "compiling #{erb} to #{to}"
             compile_erb erb, to
-            puts "ok"
           end
         end
 
@@ -115,9 +134,9 @@ module Xot
       end
     end
 
-    def build_ruby_extension(dlname: 'native', dlext: 'so')
+    def build_ruby_extension(dlname: 'native', dlext: nil, liboutput: true)
       dlname = env :DLNAME, dlname
-      dlext  = env :DLEXT,  RbConfig::CONFIG['DLEXT'] || dlext
+      dlext  = env :DLEXT,  dlext || RbConfig::CONFIG['DLEXT'] || 'so'
 
       extconf  = File.join ext_dir, 'extconf.rb'
       makefile = File.join ext_dir, 'Makefile'
@@ -128,9 +147,9 @@ module Xot
       libout  = File.join ext_lib_dir, outname
 
       srcs = FileList["#{ext_dir}/**/*.cpp"]
-      libs = modules.map {|m| "#{m.lib_dir}/lib#{m.name.downcase}.a"}
+      libs = extensions.map {|x| "#{x.lib_dir}/lib#{x.name.downcase}.a"}
 
-      alias_task :ext     => libout
+      alias_task :ext     => (liboutput ? libout : extout)
       alias_task :clean   => 'ext:clean'
       alias_task :clobber => 'ext:clobber'
 
@@ -177,7 +196,7 @@ module Xot
         ::Rake::TestTask.new :full do |t|
           t.libs << lib_dir
           t.test_files = FileList["#{test_dir}/**/test_*.rb"] - test_alones - test_excludes
-          t.verbose = true
+          t.verbose = ::Rake.verbose
         end
 
         task :alones do
@@ -220,7 +239,7 @@ module Xot
         end
 
         desc "upload gem"
-        task :upload => :install do
+        task :upload => gemfile do
           sh %( gem push #{gemfile} )
         end
 

data/lib/xot.rb

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
 
-require 'xot/module'
+require 'xot/extension'
+
 require 'xot/bit_flag'
 require 'xot/bit_flag_accessor'
 require 'xot/bit_util'

data/test/helper.rb

@@ -8,6 +8,6 @@
 require 'test/unit'
 require 'xot'
 require 'xot/test'
-require 'xot/tester'
+require_relative '../ext/xot/tester'
 
 include Xot::Test

data/xot.gemspec

@@ -4,7 +4,7 @@
 File.expand_path('lib', __dir__)
   .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'xot/module'
+require 'xot/extension'
 
 
 Gem::Specification.new do |s|
@@ -12,22 +12,23 @@ Gem::Specification.new do |s|
     patterns.map {|pat| Dir.glob(pat).to_a}.flatten
   end
 
-  mod   = Xot::Module
-  name  = mod.name.downcase
+  ext   = Xot::Extension
+  name  = ext.name.downcase
   rdocs = glob.call *%w[README]
 
   s.name        = name
   s.summary     = 'A Utility library for C++ developemt.'
   s.description = 'This library include some useful utility classes and functions for development with C++.'
-  s.version     = mod.version
+  s.version     = ext.version
 
   s.authors  = %w[xordog]
   s.email    = 'xordog@gmail.com'
   s.homepage = "https://github.com/xord/xot"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
 
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'
 
   s.files            = `git ls-files`.split $/

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.32
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-03-01 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: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -32,6 +46,11 @@ extensions:
 - Rakefile
 extra_rdoc_files: []
 files:
+- ".github/workflows/release-gem.yml"
+- ".github/workflows/tag.yml"
+- ".github/workflows/test.yml"
+- ".github/workflows/utils.rb"
+- ChangeLog.md
 - LICENSE
 - README.md
 - Rakefile
@@ -55,9 +74,9 @@ files:
 - lib/xot/block_util.rb
 - lib/xot/const_symbol_accessor.rb
 - lib/xot/extconf.rb
+- lib/xot/extension.rb
 - lib/xot/hookable.rb
 - lib/xot/invoker.rb
-- lib/xot/module.rb
 - lib/xot/rake.rb
 - lib/xot/rake/alias_task.rb
 - lib/xot/rake/escalation.rb
@@ -94,14 +113,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A Utility library for C++ developemt.