xot 0.1.13 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88efd5d3701a109d4d84b73ca708534afd4b241b65e346a7713b7432c4448375
-  data.tar.gz: 7e34ffbf480f514bd89288861adfe607250c370bb6f39a9a6f269ffec1a9fadf
+  metadata.gz: a0941e0c70c8185dbf66fe9c1d40215a942ae42353182246a093bef2644cbcab
+  data.tar.gz: 0f41c5285cc9717f5a48445c0e42e8599d8b2cfe2912576b36224870047d51ad
 SHA512:
-  metadata.gz: 0c966eca380aa4d048f3f97a522e6b26b4b7bcf26b63f35f1a68ed3fa1e6d9fc075360004bbdfe338c7d2f57cf5b6b35be0ac76b7ed27d8beb20c38b6143b9ab
-  data.tar.gz: 2626967aa53d9f1493a132bba2bdb18ae0b7ea67a4991351941c60116e6a27460ad07e8b4be560f32063c546a44ee004e3552ab2a740c6e0e358558951fc3abf
+  metadata.gz: a6866ea9aaea4c6a4daef98bd4841af32fea6c8a8cd7f4a18ac93800e5ac2f2eb7681f34888b53c05eff52091ef3655e5bd11b21ab293a4a589415b0eb91430d
+  data.tar.gz: 41377d969ee09f0b68a12de2203cdc57b7b788a56dc0a44697bcc1288e80a9a9c49768e97258b77f97c8d022fe34fd0ef9a9d28c66865630feb2ddd7093831f9

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 xord.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -6,6 +6,7 @@
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'xot/rake'
+
 require 'xot/module'
 
 
@@ -13,7 +14,7 @@ MODULES = [Xot]
 DLNAME  = 'tester'
 
 build_native_library
-build_ruby_extension dlname: :tester
+build_ruby_extension dlname: DLNAME
 test_ruby_extension
 build_ruby_gem
 

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.20

data/include/xot/defs.h

@@ -54,9 +54,6 @@ namespace Xot
 	}// Types
 
 
-	enum {UNKNOWN = 0};
-
-
 	using namespace Types;
 
 

data/include/xot/exception.h

@@ -46,17 +46,29 @@ namespace Xot
 	namespace ErrorFunctions
 	{
 
-		void xot_error             (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void xot_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void argument_error        (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void argument_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void index_error           (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void index_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void invalid_state_error   (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void invalid_state_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void system_error          (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void system_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void not_implemented_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void not_implemented_error (
+			const char* file, int line, const char* format = NULL, ...);
 
 	}// ErrorFunctions
 

data/lib/xot/rake.rb

@@ -6,7 +6,7 @@ require 'rake/loaders/makefile'
 require 'rake/testtask'
 require 'xot/rake/alias_task'
 require 'xot/rake/util'
-require 'xot/rake/escalation'
+#require 'xot/rake/escalation'
 
 
 module Xot
@@ -127,7 +127,7 @@ module Xot
       libout  = File.join ext_lib_dir, outname
 
       srcs = FileList["#{ext_dir}/**/*.cpp"]
-      libs = modules.map {|m| m.name.downcase}.map {|s| "../#{s}/lib/lib#{s}.a"}
+      libs = modules.map {|m| "#{m.lib_dir}/lib#{m.name.downcase}.a"}
 
       alias_task :ext     => libout
       alias_task :clean   => 'ext:clean'
@@ -175,7 +175,7 @@ module Xot
       namespace :test do
         ::Rake::TestTask.new :full do |t|
           t.libs << lib_dir
-          t.test_files = FileList["#{test_dir}/test_*.rb"] - test_alones - test_excludes
+          t.test_files = FileList["#{test_dir}/**/test_*.rb"] - test_alones - test_excludes
           t.verbose = true
         end
 

data/lib/xot/rake/util.rb

@@ -10,6 +10,7 @@ module Xot
 
   module Rake
 
+    VERSION_NAME = 'VERSION'
 
     def modules ()
       env(:MODULES, []).map {|m| m::Module}
@@ -83,6 +84,60 @@ module Xot
       paths
     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})"
+        sh cmd
+      end
+    end
+
+    def modified_files (dir: '.', hash: '@')
+      `git diff --name-only #{hash} -- #{dir}`.lines.map &:chomp
+    end
+
+    def version_path (dir = nil)
+      dir ? "#{dir}/#{VERSION_NAME}" : VERSION_NAME
+    end
+
+    def get_version (dir = nil)
+      File.readlines(version_path dir).first.chomp
+    end
+
+    def bump_version (index, version = get_version)
+      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.join '.'
+    end
+
+    def bump_version_file (index, dir: nil)
+      newver = bump_version index, get_version(dir)
+      File.write version_path(dir), newver
+      newver
+    end
+
+    def update_and_tag_version (index, dir: nil, &block)
+      raise 'modified files exist' unless modified_files.empty?
+
+      message = ENV['message']
+      raise 'no message' unless message
+
+      newver = bump_version_file index, dir: dir
+      raise 'version is not updated' unless modified_files == [version_path(dir)]
+
+      block.call if block
+
+      sh %( git add -u )
+      sh %( git commit -m "#{message}" )
+      sh %( git tag -a -m "#{message}" v#{newver} )
+    end
+
     def compile_erb (path, out)
       open(path) do |input|
         open(out, 'w') do |output|
@@ -165,8 +220,13 @@ module Xot
     end
 
     def make_cflags (flags = '')
+      warning_opts = %w[
+        no-unknown-pragmas
+        no-deprecated-register
+        no-reserved-user-defined-literal
+      ]
       s  = flags.dup
-      s << ' -Wno-unknown-pragmas -Wno-reserved-user-defined-literal'
+      s << warning_opts.map {|s| " -W#{s}"}.join
       s << ' -std=c++11'                                          if gcc?
       s << ' -std=c++11 -stdlib=libc++ -mmacosx-version-min=10.7' if clang?
       s << ' ' + RbConfig::CONFIG['debugflags']                   if debug?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.20
 platform: ruby
 authors:
 - xordog
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies: []
 description: This library include some useful utility classes and functions for development
   with C++.
@@ -18,6 +18,7 @@ extensions:
 - Rakefile
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -71,7 +72,7 @@ files:
 homepage: https://github.com/xord/xot
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Utility library for C++ developemt.
 test_files: