xot 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb1f6146789ec235d8ba43238e68a88be8f5298db1f22f3435db1bf14dd7c2a
-  data.tar.gz: 2853e920d96950fbb338dcee693f5447dc121d0c9c18f0b1ecc291bd13c79f34
+  metadata.gz: 6a7e1bc3f6614364c9e0351687c284d86fb2acdd6e90ed831b176f2f523227d1
+  data.tar.gz: 3be0124301e324255f2ab787140524231c42731af1662b5d4e279abec29efc47
 SHA512:
-  metadata.gz: f241ce0b846f954fc5f06b7bad24981a73b4b22cc8c804e92436855e6cf54631730736476361819105e718b3d0ba341a4f006cc9814361799cdbd79e262cc6c7
-  data.tar.gz: f2c7a9ee50a3e0dfc473632c1eec5834e95c560dc43c86981691aa0d4a98c4cc21e1c7905bf2be53be7682303dfd2564593886a7c0348ec80c9562718c1ee9b5
+  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/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,11 @@
 # xot ChangeLog
 
 
+## [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.32

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
@@ -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
 
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-03-01 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"

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