xot 0.1.32 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7e1bc3f6614364c9e0351687c284d86fb2acdd6e90ed831b176f2f523227d1
-  data.tar.gz: 3be0124301e324255f2ab787140524231c42731af1662b5d4e279abec29efc47
+  metadata.gz: e9b5197cb38389ca854063207be401c6f07760fca67dadae435addcf6e1d3ea1
+  data.tar.gz: fb6537b39bd5bfa38fb2fd7386bedcc6f67bf0c3b5acaabc580bca047da0a5f6
 SHA512:
-  metadata.gz: 7ea1f3a95375e0de9722cce59ba6ce229948c42c4bac5de353e737a52d8407985eace63de4559843d8bb9ed2cc0f65838cdcd70c0a8abc39e1f955b045d600c0
-  data.tar.gz: 3eec5192e6db769cb4b89bd4f7029f4489adaa74ce905802e4d338decd5e38cc7a3e6901f551303fc2f4a603049f80a78cfaf04b92f64851d422604661037ce8
+  metadata.gz: 03e7a551c41ba1ce1f40301362fcef7da04618dfff0f2be912ecef8efe6307107283eba58ac1027036404689ffe178b98e32a27a833d9ec034bb07dd6562fbc1
+  data.tar.gz: 831b5f8c7ffdf155134850f160e20606f2969b535fcad9b6da649ca1c60fa2e67b27052a319b0714b53b95d57dfbdf0d239aa9023c8e941eab8baf90ef5b41c6

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

@@ -20,8 +20,11 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: install gems
+        run: gem install yard
+
       - name: test
-        run: rake test
+        run: rake quiet test
 
       - name: create gem
         id: gem

data/.github/workflows/utils.rb

@@ -20,8 +20,9 @@ def setup_dependencies(build: true, only: nil)
 
   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]
+    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

data/ChangeLog.md

@@ -1,6 +1,20 @@
 # xot ChangeLog
 
 
+## [v0.1.34] - 2023-04-30
+
+- Fix bugs
+
+
+## [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

data/VERSION

@@ -1 +1 @@
-0.1.32
+0.1.34

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

@@ -160,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)
@@ -202,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
 
@@ -223,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()
@@ -316,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
 
@@ -326,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

@@ -55,24 +55,6 @@ 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
@@ -161,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}"
@@ -278,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}"
@@ -303,10 +286,14 @@ module Xot
         namespace name do
           desc "clone #{name}"
           file dir do
-            opts  = '--depth=1'
-            opts += " --branch=#{branch || tag}" if branch || tag
+            opts  = '-c advice.detachedHead=false --depth 1'
+            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|
@@ -316,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
 
@@ -337,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
@@ -366,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.32
+  version: 0.1.34
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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.