xot 0.1.31 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb1f6146789ec235d8ba43238e68a88be8f5298db1f22f3435db1bf14dd7c2a
-  data.tar.gz: 2853e920d96950fbb338dcee693f5447dc121d0c9c18f0b1ecc291bd13c79f34
+  metadata.gz: df9a44dc23565fb55b9c815a2d85f0f8b202e58ce096638407c01cfb677186dd
+  data.tar.gz: d7df961d1ae75175d20045e0c17891953288a7f067efea5f87dc2efe0a87c7ad
 SHA512:
-  metadata.gz: f241ce0b846f954fc5f06b7bad24981a73b4b22cc8c804e92436855e6cf54631730736476361819105e718b3d0ba341a4f006cc9814361799cdbd79e262cc6c7
-  data.tar.gz: f2c7a9ee50a3e0dfc473632c1eec5834e95c560dc43c86981691aa0d4a98c4cc21e1c7905bf2be53be7682303dfd2564593886a7c0348ec80c9562718c1ee9b5
+  metadata.gz: 8a3252b83e0c7e61d143452246acbca6e93a8c710575b1a092985e6a238ff45403ab6cb90c98672834f38d421b52c8882c439f04e264d85adf34bbabf9d37450
+  data.tar.gz: 1175c87d9e774d880c9ac3a915012356fc65dccb3df402ea5f0d65015fa929f10db825276a5419bf3bbde54d39136955bab33a668bdabed94950b78c383a269d

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

@@ -0,0 +1,62 @@
+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: install gems
+        run: gem install yard
+
+      - name: test
+        run: rake quiet 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/test.yml

@@ -22,11 +22,5 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
-      - name: lib
-        run: rake lib
-
-      - name: ext
-        run: rake ext
-
       - name: test
         run: rake test

data/.github/workflows/utils.rb

@@ -1,3 +1,5 @@
+RENAMES = {reflex: 'reflexion'}
+
 def sh(cmd)
   puts cmd
   system cmd
@@ -5,8 +7,10 @@ end
 
 def setup_dependencies(build: true, only: nil)
   gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
-  gemspec      = File.read gemspec_path
-  name         = File.basename gemspec_path, '.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]}
@@ -15,9 +19,13 @@ def setup_dependencies(build: true, only: nil)
   exts = exts & [only].flatten.map(&:to_s) if only
 
   exts.each do |ext|
-    ver = gemspec[/add_runtime_dependency.*'#{ext}'.*'\s*~>\s*([\d\.]+)\s*'/, 1]
-    url = "https://github.com/xord/#{ext}.git"
-    sh %( git clone --depth 1 --branch v#{ver} #{url} ../#{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

data/ChangeLog.md

@@ -1,6 +1,20 @@
 # xot ChangeLog
 
 
+## [v0.1.33] - 2023-04-22
+
+- use '-isystem' option for vendor headers
+- disable warnings on compiling vendor sources
+- OSX: add '-Wl,-undefined,dynamic_lookup' to ldflags
+- add VENDOR_NOCOMPILE option
+- Rakefile: add 'quiet' option
+
+
+## [v0.1.32] - 2023-03-01
+
+- fix bugs
+
+
 ## [v0.1.31] - 2023-02-26
 
 - add ChangeLog.md file

data/Rakefile

@@ -13,9 +13,8 @@ require 'xot/extension'
 EXTENSIONS = [Xot]
 DLNAME     = 'tester'
 
+default_tasks :ext
 build_native_library
 build_ruby_extension dlname: DLNAME, liboutput: false
 test_ruby_extension
 build_ruby_gem
-
-task :default => :ext

data/VERSION

@@ -1 +1 @@
-0.1.31
+0.1.33

data/lib/xot/extconf.rb

@@ -28,24 +28,30 @@ module Xot
     def setup()
       yield if block_given?
 
-      extensions.each do |x|
-        name = x.name.downcase
+      extensions.each do |ext|
+        name = ext.name.downcase
         headers << "#{name}.h"
         libs << name
       end
 
+      ldflags = $LDFLAGS.dup
+      if osx?
+        opt = '-Wl,-undefined,dynamic_lookup'
+        ldflags << " #{opt}" unless ($DLDFLAGS || '').include?(opt)
+      end
+
       local_libs << (clang? ? 'c++' : 'stdc++')
 
       $CPPFLAGS = make_cppflags $CPPFLAGS, defs, inc_dirs
       $CFLAGS   = make_cflags   $CFLAGS   + ' -x c++'
       $CXXFLAGS = make_cflags   $CXXFLAGS + ' -x c++' if $CXXFLAGS
-      $LDFLAGS  = make_ldflags  $LDFLAGS, lib_dirs, frameworks
+      $LDFLAGS  = make_ldflags  ldflags, lib_dirs, frameworks
       $LOCAL_LIBS << local_libs.map {|s| " -l#{s}"}.join
     end
 
     def create_makefile(*args)
-      extensions.each do |x|
-        dir_config x.name.downcase, x.inc_dir, x.lib_dir
+      extensions.each do |ext|
+        dir_config ext.name.downcase, ext.inc_dir, ext.lib_dir
       end
 
       exit 1 unless headers.all? {|s| have_header s}

data/lib/xot/rake/util.rb

@@ -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
@@ -148,7 +160,7 @@ module Xot
     end
 
     def compile_erb_str(str)
-      ERB.new(str, nil, '%').result binding
+      ERB.new(str, trim_mode: '%').result binding
     end
 
     def params(max, sep = '', &block)
@@ -190,13 +202,14 @@ module Xot
     end
 
     def append_env(name, *args)
-      ENV[name] = (ENV[name] || '') + " #{args.join ' '}"
+      ENV[name] = (ENV[name] || '') + " #{args.flatten.join ' '}"
     end
 
     def make_cppflags(flags = '', defs = [], incdirs = [])
       s  = flags.dup
-      s += make_cppflags_defs(defs)      .map {|s| " -D#{s}"}.join
-      s += make_cppflags_incdirs(incdirs).map {|s| " -I#{s}"}.join
+      s += make_cppflags_defs(defs)          .map {|s| " -D#{s}"}.join
+      s += make_cppflags_incdirs(incdirs)    .map {|s| " -I#{s}"}.join
+      s += make_cppflags_sys_incdirs(incdirs).map {|s| " -isystem#{s}"}.join
       s
     end
 
@@ -211,7 +224,11 @@ module Xot
     end
 
     def make_cppflags_incdirs(dirs = [])
-      dirs.dup + ruby_inc_dirs
+      dirs.reject {|dir| dir =~ %r|vendor/|}
+    end
+
+    def make_cppflags_sys_incdirs(dirs = [])
+      dirs.select {|dir| dir =~ %r|vendor/|} + ruby_inc_dirs
     end
 
     def ruby_inc_dirs()
@@ -242,14 +259,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
@@ -295,9 +321,10 @@ module Xot
       make_cppflags flags, defs, inc_dirs
     end
 
-    def cxxflags()
+    def cxxflags(warnings = true)
       cflags   = env :CFLAGS,   RbConfig::CONFIG['CFLAGS']
       cxxflags = env :CXXFLAGS, RbConfig::CONFIG['CXXFLAGS']
+      cflags   = cflags.gsub(/-W[\w\-]+/, '') + ' -w' unless warnings
       make_cflags "#{cflags} #{cxxflags}"
     end
 
@@ -305,6 +332,24 @@ module Xot
       env :ARFLAGS, RbConfig::CONFIG['ARFLAGS'] || 'crs'
     end
 
+    def default_tasks(default = nil)
+      verbose? env(:VERBOSE, true)
+
+      if default
+        task :default => default
+      else
+        task :default
+      end
+
+      task :quiet do
+        verbose? false
+      end
+
+      task :debug do
+        debug? true
+      end
+    end
+
 
   end# Rake
 

data/lib/xot/rake.rb

@@ -77,6 +77,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 +96,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 +104,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
 
@@ -142,7 +143,8 @@ module Xot
 
         desc "build #{extout}"
         file extout => [:lib, makefile] do
-          sh %( cd #{ext_dir} && make )
+          opts = ::Rake.verbose ? 'V=1' : ''
+          sh %( cd #{ext_dir} && make #{opts} )
         end
 
         desc "create #{makefile}"
@@ -177,7 +179,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
@@ -259,19 +261,19 @@ module Xot
     end
 
     def use_external_library(
-      repos, branch: nil, tag: nil,
-      incdir: nil, srcdir: nil, excludes: [],
-      submodules: [], post_submodules: nil)
-
+      repos, branch: nil, tag: nil, commit: nil,
+      incdirs: nil, srcdirs: nil, excludes: [],
+      submodules: [], post_submodules: nil,
+      &after_clone_block)
+
+      name     = repos[%r{/([^/]+?)(:?\.git)?$}, 1]
+      dir      = "#{vendor_dir}/#{name}"
+      incdirs  = [incdirs].flatten.map {|s| s ? "#{dir}/#{s}" : dir}
+      srcdirs  = [srcdirs].flatten.map {|s| s ? "#{dir}/#{s}" : dir}
       excludes = [excludes].flatten
 
-      name   = repos[%r{/([^/]+?)(:?\.git)?$}, 1]
-      dir    = "#{vendor_dir}/#{name}"
-      incdir = dir + (incdir ? "/#{incdir}" : '')
-      srcdir = dir + (srcdir ? "/#{srcdir}" : '')
-
-      append_env 'INCDIRS',  incdir
-      append_env 'SRCDIRS',  srcdir
+      append_env 'INCDIRS',  incdirs
+      append_env 'SRCDIRS',  srcdirs
       append_env 'EXCLUDES', excludes unless excludes.empty?
 
       alias_task :vendor  => "vendor:#{name}"
@@ -288,6 +290,10 @@ module Xot
             opts += " --branch=#{branch || tag}" if branch || tag
             opts += " --recursive"               if submodules.empty?
             sh %( git clone #{opts} #{repos} #{dir} )
+            Dir.chdir dir do
+              sh %( git fetch --depth 1 origin #{commit} )
+              sh %( git checkout #{commit} )
+            end if commit
             unless submodules.empty?
               Dir.chdir dir do
                 submodules.each do |path|
@@ -297,8 +303,11 @@ module Xot
                 sh post_submodules if post_submodules
               end
             end
-            vendor_srcs_map(srcdir).each do |src, obj|
-              sh %( #{cxx} -c #{cppflags} #{cxxflags} -o #{obj} #{src} )
+            Dir.chdir(dir) {after_clone_block.call} if after_clone_block
+            unless env :VENDOR_NOCOMPILE, false
+              vendor_srcs_map(*srcdirs).each do |src, obj|
+                sh %( #{cxx} -c #{cppflags} #{cxxflags false} -o #{obj} #{src} )
+              end
             end
           end
 
@@ -318,7 +327,7 @@ module Xot
       use_external_library 'https://github.com/boostorg/boost',
         branch:          branch,
         tag:             tag,
-        srcdir:          'NOSRC',
+        srcdirs:         'NOSRC',
         submodules:      default_modules | modules.map {|mod| "libs/#{mod}"},
         post_submodules: './bootstrap.sh && ./b2 headers'
     end
@@ -347,6 +356,9 @@ module Xot
 
       desc "setup all external libraries"
       alias_task :vendor
+
+      desc "convert erb files"
+      alias_task :erb
     end
 
 

data/test/helper.rb

@@ -5,9 +5,10 @@
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'test/unit'
 require 'xot'
 require 'xot/test'
 require_relative '../ext/xot/tester'
 
+require 'test/unit'
+
 include Xot::Test

data/test/test_setter.rb

@@ -27,7 +27,13 @@ class TestSetter < Test::Unit::TestCase
 
   def test_set_by_hash()
     o = temp
-    o.set :x => 1, :y => 2
+    o.set x: 1, y: 2
+    assert_equal [1, 2], [o.x, o.y]
+  end
+
+  def test_set_by_kwargs()
+    o = temp
+    o.set **{x: 1, y: 2}
     assert_equal [1, 2], [o.x, o.y]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.33
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,7 +46,7 @@ extensions:
 - Rakefile
 extra_rdoc_files: []
 files:
-- ".github/workflows/release.yml"
+- ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A Utility library for C++ developemt.

data/.github/workflows/release.yml

@@ -1,34 +0,0 @@
-name: Release
-
-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: 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