xot 0.1.12 → 0.1.13

data/src/time.cpp

@@ -1,9 +1,11 @@
 #include "xot/time.h"
 
 
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <chrono>
+#include <thread>
 
-namespace pt = boost::posix_time;
+
+namespace Ch = std::chrono;
 
 
 namespace Xot
@@ -11,13 +13,19 @@ namespace Xot
 
 
 	double
-	time (bool local)
+	time ()
 	{
-		static pt::ptime zero = pt::from_time_t(0);
-		pt::ptime now = local ?
-			pt::microsec_clock::local_time() :
-			pt::microsec_clock::universal_time();
-		return (now - zero).total_milliseconds() / 1000.0;
+		auto now = Ch::system_clock::now().time_since_epoch();
+		return Ch::duration_cast<Ch::milliseconds>(now).count() / 1000.0;
+	}
+
+	void
+	sleep (double seconds)
+	{
+		if (seconds <= 0) return;
+
+		long long millisecs = seconds * 1000;
+		std::this_thread::sleep_for(Ch::milliseconds(millisecs));
 	}
 
 

data/test/test_bit_flag.rb

@@ -6,9 +6,7 @@ require_relative 'helper'
 
 class TestBitFlag < Test::Unit::TestCase
 
-  def bit (*args)
-    Xot::BitFlag.bit *args
-  end
+  include Xot::BitUtil
 
   def flag (*args, &block)
     bf = Xot::BitFlag.new *args, &block
@@ -20,13 +18,6 @@ class TestBitFlag < Test::Unit::TestCase
     bf
   end
 
-  def test_bit ()
-    assert_equal 0b1,    bit(0)
-    assert_equal 0b10,   bit(1)
-    assert_equal 0b1000, bit(3)
-    assert_equal 0b1010, bit(1, 3)
-  end
-
   def test_bits2symbols ()
     assert_equal [], flag.bits2symbols(0)
     assert_equal [:bit1], flag.bits2symbols(bit 1)

data/test/test_bit_flag_accessor.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestBitFlagAccessor < Test::Unit::TestCase
+
+  include Xot::BitUtil
+
+  class IntAccessor
+    attr_accessor :bits
+    alias set bits=
+    alias get bits
+    def initialize (&block)
+      @bits = 0
+      block.call self if block
+    end
+  end
+
+  class SymbolAccessor < IntAccessor
+    bit_flag_accessor :bits do
+      flag :bit0, bit: 0
+      flag :bit1, bit: 1
+    end
+  end
+
+  def int (&block)
+    IntAccessor.new &block
+  end
+
+  def symbol (&block)
+    SymbolAccessor.new &block
+  end
+
+  def flag ()
+    SymbolAccessor.bits_flag
+  end
+
+  def test_int_accessor ()
+    assert_equal 0b0,  int.get
+    assert_equal 0b1,  int{|o| o.bits = bit 0}.get
+    assert_equal 0b10, int{|o| o.bits = bit 1}.get
+  end
+
+  def test_symbol_writer ()
+    assert_equal 0b0,  symbol.get
+    assert_equal 0b1,  symbol{|o| o.bits = :bit0}.get
+    assert_equal 0b10, symbol{|o| o.bits = :bit1}.get
+  end
+
+  def test_symbol_reader ()
+    assert_equal [],             symbol.bits
+    assert_equal [:bit0],        symbol{|o| o.set bit 0}.bits
+    assert_equal [:bit1],        symbol{|o| o.set bit 1}.bits
+    assert_equal [:bit0, :bit1], symbol{|o| o.set bit 0, 1}.bits
+  end
+
+  def test_singleton_flag_reader ()
+    assert_equal 0b11,           flag.symbols2bits(:bit0, :bit1)
+    assert_equal [:bit0, :bit1], flag.bits2symbols(0b11)
+  end
+
+end# TestBitFlagAccessor

data/test/test_bit_util.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestBitUtil < Test::Unit::TestCase
+
+  include Xot::BitUtil
+
+  def test_bit ()
+    assert_equal 0b1,    bit(0)
+    assert_equal 0b10,   bit(1)
+    assert_equal 0b1000, bit(3)
+    assert_equal 0b1010, bit(1, 3)
+  end
+
+end# TestBitFlag

data/test/test_const_symbol_accessor.rb

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestConstSymbolAccessor < Test::Unit::TestCase
+
+  Unknown = -1
+  Const0  = 0
+  Const1  = 1
+
+  class ConstAccessor
+    attr_accessor :const
+    alias set const=
+    alias get const
+    def initialize (&block)
+      @const = Const0
+      block.call self if block
+    end
+  end
+
+  class SymbolAccessor < ConstAccessor
+    const_symbol_accessor :const, {
+      const0: Const0,
+      const1: Const1
+    }
+  end
+
+  def const (&block)
+    ConstAccessor.new &block
+  end
+
+  def symbol (&block)
+    SymbolAccessor.new &block
+  end
+
+  def test_const_accessor ()
+    assert_equal Const0, const.get
+    assert_equal Const1, const{|o| o.const = Const1}.get
+    assert_nothing_raised {const.const = Unknown}
+  end
+
+  def test_symbol_writer ()
+    assert_equal Const0, symbol.get
+    assert_equal Const1, symbol{|o| o.const = :const1}.get
+    assert_raise(ArgumentError) {symbol.const = :unknown}
+  end
+
+  def test_symbol_reader ()
+    assert_equal :const0, symbol.const
+    assert_equal :const1, symbol{|o| o.set Const1}.const
+    assert_raise(RuntimeError) {symbol{|o| o.set Unknown}.const}
+  end
+
+end# TestBitFlagAccessor

data/test/test_universal_accessor.rb

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestUniversalAccessor < Test::Unit::TestCase
+
+  class Accessor
+
+    attr_accessor :val
+
+    attr_reader :args
+
+    def args= (*args)
+      @args = args
+    end
+
+    universal_accessor :val, :args
+
+  end# Accessor
+
+  def accessor (*args)
+    Accessor.new *args
+  end
+
+  def test_accessor ()
+    a = accessor
+    assert_equal nil, a.val
+
+    a.val 1
+    assert_equal 1, a.val
+    assert_equal 2, a.val(2)
+
+    a.val = 3
+    assert_equal 3, a.val
+  end
+
+  def test_accessor_splat_args ()
+    a = accessor
+
+    a.args =   1, 2, 3;  assert_equal [[1, 2, 3]], a.args
+    a.args =  [1, 2, 3]; assert_equal [[1, 2, 3]], a.args
+    a.args = *[1, 2, 3]; assert_equal [[1, 2, 3]], a.args
+
+    assert_equal  [1, 2, 3],  a.args(  1, 2, 3)
+    assert_equal [[1, 2, 3]], a.args( [1, 2, 3])
+    assert_equal  [1, 2, 3],  a.args(*[1, 2, 3])
+  end
+
+end# TestUniversalAccessor

data/xot.gemspec

@@ -21,15 +21,12 @@ Gem::Specification.new do |s|
   s.description = 'This library include some useful utility classes and functions for development with C++.'
   s.version     = mod.version
 
-  s.authors  = %w[snori]
-  s.email    = 'snori@xord.org'
+  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 = '>=1.9.0'
-
-  s.add_runtime_dependency 'rake'
-  s.add_development_dependency 'gemcutter'
+  s.required_ruby_version = '~> 2'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

metadata

@@ -1,46 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
-- snori
+- xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 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: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gemcutter
-  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'
+date: 2019-11-23 00:00:00.000000000 Z
+dependencies: []
 description: This library include some useful utility classes and functions for development
   with C++.
-email: snori@xord.org
+email: xordog@gmail.com
 executables: []
 extensions:
 - Rakefile
@@ -55,6 +27,7 @@ files:
 - include/xot/debug.h
 - include/xot/defs.h
 - include/xot/exception.h
+- include/xot/noncopyable.h
 - include/xot/pimpl.h
 - include/xot/ref.h
 - include/xot/string.h
@@ -62,32 +35,38 @@ files:
 - include/xot/util.h
 - lib/xot.rb
 - lib/xot/bit_flag.rb
+- lib/xot/bit_flag_accessor.rb
+- lib/xot/bit_util.rb
 - lib/xot/block_util.rb
+- lib/xot/const_symbol_accessor.rb
 - lib/xot/extconf.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
+- lib/xot/rake/util.rb
 - lib/xot/setter.rb
 - lib/xot/test.rb
+- lib/xot/universal_accessor.rb
 - src/debug.cpp
 - src/exception.cpp
 - src/string.cpp
 - src/time.cpp
 - src/util.cpp
-- task/ext.rake
-- task/gem.rake
-- task/lib.rake
-- task/mac.rake
-- task/test.rake
 - test/helper.rb
 - test/test_bit_flag.rb
+- test/test_bit_flag_accessor.rb
+- test/test_bit_util.rb
 - test/test_block_util.rb
+- test/test_const_symbol_accessor.rb
 - test/test_hookable.rb
 - test/test_invoker.rb
 - test/test_rake.rb
 - test/test_setter.rb
 - test/test_tester.rb
+- test/test_universal_accessor.rb
 - xot.gemspec
 homepage: https://github.com/xord/xot
 licenses: []
@@ -98,26 +77,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Utility library for C++ developemt.
 test_files:
 - test/helper.rb
 - test/test_bit_flag.rb
+- test/test_bit_flag_accessor.rb
+- test/test_bit_util.rb
 - test/test_block_util.rb
+- test/test_const_symbol_accessor.rb
 - test/test_hookable.rb
 - test/test_invoker.rb
 - test/test_rake.rb
 - test/test_setter.rb
 - test/test_tester.rb
+- test/test_universal_accessor.rb

data/task/ext.rake

@@ -1,76 +0,0 @@
-# -*- mode: ruby; coding: utf-8 -*-
-
-
-require 'rbconfig'
-
-
-task :ext => 'ext:build'
-
-%w[clean].each do |t|
-  task t.intern => "ext:#{t}"
-end
-
-
-namespace :ext do
-
-
-  rbconf = RbConfig::CONFIG
-
-  mod      = MODULE
-  mods     = env :MODULES,  [], :array
-  modname  = env :MODNAME,  mod.name.downcase
-  dlname   = env :DLNAME,   'native'
-  dlext    = env :DLEXT,    rbconf['DLEXT'] || 'so'
-  extdir   = env :EXTDIR,   "ext/#{modname}"
-  libdir   = env :LIBDIR,   "lib/#{modname}"
-  ruby     = env :RUBY,     'ruby'
-  make     = env :MAKE,     'make'
-  cxx      = env :CXX,      rbconf['CXX'] || 'g++'
-  cppflags = env :CPPFLAGS, rbconf['CPPFLAGS']
-  cxxflags = env :CXXFLAGS, rbconf['CXXFLAGS']
-  defs     = env :DEFS,     [], :array
-  incdirs  = env(:INCDIRS,  [], :array) + mods.reverse.map {|m| m.include_dir}
-
-  cppflags = cppflags cppflags, defs, incdirs
-  cxxflags = cflags   cxxflags
-
-  outname = "#{dlname}.#{dlext}"
-  extout  = File.join extdir, outname
-  libout  = File.join libdir, outname
-
-  srcs = FileList["#{extdir}/**/*.cpp"]
-  libs = FileList["#{libdir}/../lib*.a"]
-
-  extconf  = File.join extdir, 'extconf.rb'
-  makefile = File.join extdir, 'Makefile'
-  depend   = File.join extdir, 'depend.mf'
-
-
-  task :build => libout
-
-  task :clean do
-    sh %( cd #{extdir} && #{make} clean ) if File.exist? makefile
-    sh %( rm -rf #{makefile} #{depend} #{libout} )
-  end
-
-  file libout => extout do
-    sh %( cp #{extout} #{libout} )
-  end
-
-  file extout => [:lib, makefile] do
-    sh %( cd #{extdir} && #{make} )
-  end
-
-  file makefile => [extconf, depend] + libs do
-    sh %( cd #{extdir} && #{ruby} #{File.basename extconf} )
-  end
-
-  file depend => srcs do
-    inc = incdirs.map {|s| " -I#{s}"}.join
-    src = srcs.map {|cpp| File.basename cpp}.join ' '
-    dep = File.basename depend
-    sh %( cd #{extdir} && #{cxx} -M #{cppflags} #{inc} #{src} > #{dep} )
-  end
-
-
-end# :ext