utilrb 2.0.2.b2 → 2.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcf5ca71fc1f19f529df4911c7b626010657ee4f
-  data.tar.gz: b4b3f5f44a9df508352214921b5626d3f50fe27d
+  metadata.gz: 25dfac5169ea1deb85644a81fce37e34b57fbe06
+  data.tar.gz: d294185b07a13167202368e519b3dbdf1be0a46f
 SHA512:
-  metadata.gz: c60d168b824c6048b442905fa8541358496df2c4a2f68ecc984e2778dc6077b72ee8169bd47aee3486e0e68be642a011fdc3e55108ae201c8c9a61fe4c85aa11
-  data.tar.gz: 5988d6ba18bab35ba2e8f64d87e88a88ba1b774f7d9c88790ef8c19561eee1b0ac26d34a488b355539a65334bb0f1c17c5f3c720cdda9214be12c305890497a1
+  metadata.gz: 8d7ec758b7d5aa8854c828b5f5845fa92c0aad1c3e424879ec0866236f8f7c9c420cb01c22f6c15c547fc87b93d98b1d8b6fcb66b096ddaed0f45d1c9f2f8d3c
+  data.tar.gz: 543b63138464740343424f0e81b01fe0ac7a541b69e2cefeb5193546f0845db6a2e6d83b6bf6ee282b05184e4adbf2bd2dedcd2cd885cc42425de1bfafa97404

data/.boring

@@ -0,0 +1,40 @@
+# Boring file regexps:
+\.hi$
+\.o$
+\.o\.cmd$
+# *.ko files aren't boring by default because they might
+# be Korean translations rather than kernel modules.
+# \.ko$
+\.ko\.cmd$
+\.mod\.c$
+(^|/)\.tmp_versions($|/)
+(^|/)CVS($|/)
+(^|/)RCS($|/)
+~$
+#(^|/)\.[^/]
+(^|/)_darcs($|/)
+\.bak$
+\.BAK$
+\.orig$
+(^|/)vssver\.scc$
+\.swp$
+(^|/)MT($|/)
+(^|/)\{arch\}($|/)
+(^|/).arch-ids($|/)
+(^|/),
+\.class$
+\.prof$
+(^|/)\.DS_Store$
+(^|/)BitKeeper($|/)
+(^|/)ChangeSet($|/)
+(^|/)\.svn($|/)
+\.py[co]$
+\#
+\.cvsignore$
+(^|/)Thumbs\.db$
+(^|/)autom4te\.cache($|/)
+^rcov
+\.so$
+^ext/(Makefile|mkmf.log)$
+-stamp$
+^(doc|html|pkg)$

data/.gitignore

@@ -0,0 +1,13 @@
+coverage.html
+*.swp
+ext/*.o
+ext/*.so
+ext/Makefile
+lib/utilrb_ext.so
+doc/
+coverage/
+tmp/
+.yardoc
+lib/utilrb/utilrb.so
+pkg/
+/vendor/

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2

data/CMakeLists.txt

@@ -0,0 +1,18 @@
+
+cmake_minimum_required(VERSION 2.6)
+
+project(utilrb)
+FIND_PACKAGE(Ruby REQUIRED)
+
+ADD_CUSTOM_TARGET(utilrb_ext ALL
+  COMMAND rake
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+STRING(REGEX REPLACE ".*lib(32|64)?/?" "lib/" RUBY_EXTENSIONS_INSTALL_DIR ${RUBY_ARCH_DIR})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/ DESTINATION ${RUBY_EXTENSIONS_INSTALL_DIR}
+  PATTERN "utilrb_ext.*" EXCLUDE )
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ext/ DESTINATION ${RUBY_EXTENSIONS_INSTALL_DIR}
+  FILES_MATCHING PATTERN "utilrb_ext.*" 
+  PATTERN "*.o" EXCLUDE 
+  PATTERN "*.cc" EXCLUDE 
+  )

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Makefile

@@ -0,0 +1,8 @@
+default: install
+install:
+	rake
+gems:
+	if [ -d ../rtt_gems ]; then gem install ../rtt_gems/*.gem; else gem install rake flexmock rdoc rake-compiler hoe hoe-yard facets; fi
+	touch gems
+clean:
+	rake clean

data/Manifest.txt

@@ -8,7 +8,6 @@ bm/allocation.rb
 bm/speed.rb
 ext/utilrb/extconf.rb
 ext/utilrb/proc.c
-ext/utilrb/readline.c
 ext/utilrb/ruby_allocator.hh
 ext/utilrb/utilrb.cc
 ext/utilrb/value_set.cc
@@ -57,8 +56,6 @@ lib/utilrb/logger/log_pp.rb
 lib/utilrb/logger/root.rb
 lib/utilrb/logger/silent.rb
 lib/utilrb/marshal/load_with_missing_constants.rb
-lib/utilrb/models/inherited_enumerable.rb
-lib/utilrb/models/registration.rb
 lib/utilrb/module.rb
 lib/utilrb/module/ancestor_p.rb
 lib/utilrb/module/attr_enumerable.rb
@@ -75,14 +72,12 @@ lib/utilrb/object/address.rb
 lib/utilrb/object/attribute.rb
 lib/utilrb/object/scoped_eval.rb
 lib/utilrb/object/singleton_class.rb
-lib/utilrb/objectstats.rb
 lib/utilrb/pathname.rb
 lib/utilrb/pathname/find_matching_parent.rb
 lib/utilrb/pkgconfig.rb
 lib/utilrb/qt/mime_data/mime_data.rb
 lib/utilrb/qt/variant/from_ruby.rb
 lib/utilrb/rake_common.rb
-lib/utilrb/ruby_object_graph.rb
 lib/utilrb/set.rb
 lib/utilrb/set/to_s.rb
 lib/utilrb/socket/tcp_server.rb
@@ -102,7 +97,6 @@ patches/gc_live_objects.patch
 test/data/test_pkgconfig.pc
 test/data/test_pkgconfig_empty.pc
 test/test_array.rb
-test/test_config.rb
 test/test_dir.rb
 test/test_enumerable.rb
 test/test_event_loop.rb
@@ -112,10 +106,8 @@ test/test_hash.rb
 test/test_kernel.rb
 test/test_logger.rb
 test/test_misc.rb
-test/test_models.rb
 test/test_module.rb
 test/test_object.rb
-test/test_objectstats.rb
 test/test_pkgconfig.rb
 test/test_proc.rb
 test/test_set.rb

data/{README.rd → README.md}

@@ -1,18 +1,22 @@
-= Utilrb
+[![Build Status](https://travis-ci.org/orocos-toolchain/utilrb.svg?branch=master)](https://travis-ci.org/orocos-toolchain/utilrb)
+[![Gem Version](https://badge.fury.io/rb/utilrb.svg)](http://badge.fury.io/rb/utilrb)
+[![Documentation](http://b.repl.ca/v1/yard-docs-blue.png)](http://rubydoc.info/gems/utilrb/frames)
+
+Utilrb
+------
 
 homepage :: http://rock-robotics.org
 mailing list :: http://www.dfki.de/mailman/cgi-bin/listinfo/rock-dev
-bug tracker :: trac.rock-robotics.org
-rubygem page :: http://rubygems.org/gems/utilrb
-git repository :: http://gitorious.org/orocos-toolchain/utilrb.git
-API documentation :: http://rubydoc.info/gems/utilrb/1.6.6/frames
+bug tracker :: https://github.com/orocos-toolchain/utilrb
 
-== DESCRIPTION
+DESCRIPTION
+-----------
 
 Utilrb is yet another Ruby toolkit, in the spirit of facets. It includes all
 the standard class extensions I use in other projects.
 
-== LICENSE
+LICENSE
+-------
 
 Copyright (c) 2006-2013
     Sylvain Joyeux <sylvain.joyeux@m4x.org>

data/Rakefile

@@ -1,67 +1,20 @@
-$LOAD_PATH.unshift File.expand_path('lib', File.dirname(__FILE__))
-require 'rake'
-
-begin 
-    require 'hoe'
-
-    Hoe::plugin :yard
-
-    hoe_spec = Hoe.spec 'utilrb' do
-        developer "Sylvain Joyeux", "sylvain.joyeux@m4x.org"
-        self.readme_file = 'README.rd'
-
-
-        extra_deps <<
-            ['facets', '>= 2.4.0'] <<
-            ['rake',     '>= 0.9'] <<
-            ["hoe", ">= 3.7.1"] <<
-            ["hoe-yard",   ">= 0.1.2"]
-
-        if RUBY_VERSION < '2.0'
-            spec_extras[:required_ruby_version] = '~> 1.9'
-            extra_deps << ["rake-compiler", '~> 0.8.0']
-        else
-            spec_extras[:required_ruby_version] = '>= 2.0'
-            extra_deps << ["rake-compiler"]
-        end
-
-        extra_dev_deps <<
-            ['flexmock', '>= 0.8.6'] <<
-            ['debugger-ruby_core_source', '>= 0']
-
-        licenses << 'BSD'
-
-        spec_extras[:extensions] = FileList["ext/**/extconf.rb"]
-    end
-
-    require 'rubygems/package_task'
-    Gem::PackageTask.new(hoe_spec.spec) do |pkg|
-        pkg.need_zip = true
-        pkg.need_tar = true
-    end
-
-    require 'rake/extensiontask'
-    utilrb_task = Rake::ExtensionTask.new('utilrb', hoe_spec.spec) do |ext|
-        ext.name = 'utilrb'
-        ext.ext_dir = 'ext/utilrb'
-        ext.lib_dir = 'lib/utilrb'
-        ext.source_pattern ="*.{c,cc,cpp}"
-    end
-
-    Rake.clear_tasks(/^default$/)
-    task :default => :compile
-
-    task :docs => :yard
-    task :redocs => :yard
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new('utilrb') do |ext|
+    ext.name = 'utilrb'
+    ext.ext_dir = 'ext/utilrb'
+    ext.lib_dir = 'lib/utilrb'
+    ext.source_pattern ="*.{c,cc,cpp}"
+end
 
+task :default => :compile
 
-rescue LoadError => e
-    puts "'utilrb' cannot be build -- loading gem failed: #{e}"
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/test_*.rb']
 end
 
-task :full_test do
-    ENV.delete_if { |name,val| name == "UTILRB_EXT_MODE" }
-    system('testrb -I. test')
-    ENV['UTILRB_EXT_MODE'] = 'yes'
-    system('testrb -I. test')
-end
+task :gem => :build

data/benchmarks/validate_options.rb

@@ -0,0 +1,79 @@
+require 'benchmark'
+require 'utilrb/kernel/options'
+
+options = Hash[
+    test: 10,
+    other_test: 20]
+
+TIMES = 100_000
+
+def validate(options)
+    Kernel.validate_options options, :accept_opaques => false,
+        :accept_pointers => false,
+        :merge_skip_copy => true,
+        :remove_trailing_skips => true
+end
+
+def validate_with_new_style_hash(options)
+    Kernel.validate_options options, accept_opaques: false,
+        accept_pointers: false,
+        merge_skip_copy: true,
+        remove_trailing_skips: true
+end
+
+def validate_with_keyword_arguments(accept_opaques: false,
+                                    accept_pointers: false,
+                                    merge_skip_copy: true,
+                                    remove_trailing_skips: true)
+    Hash[accept_opaques: accept_opaques,
+         accept_pointers: accept_pointers,
+         merge_skip_copy: merge_skip_copy,
+         remove_trailing_skips: remove_trailing_skips]
+end
+
+Benchmark.bm do |x|
+    x.report("with empty options") do
+        TIMES.times do
+            validate(Hash.new)
+        end
+    end
+    x.report("with empty options and new-style hash") do
+        TIMES.times do
+            validate_with_new_style_hash(Hash.new)
+        end
+    end
+    x.report("with empty options and keyword arguments") do
+        TIMES.times do
+            validate_with_keyword_arguments(accept_opaques: false,
+                accept_pointers: false,
+                merge_skip_copy: true,
+                remove_trailing_skips: true)
+        end
+    end
+    x.report("with all options set") do
+        options = Hash[]
+        TIMES.times do
+            validate(:accept_opaques => false,
+                     :accept_pointers => false,
+                     :merge_skip_copy => true,
+                     :remove_trailing_skips => true)
+        end
+    end
+    x.report("with all options set and new-style hash") do
+        TIMES.times do
+            validate_with_new_style_hash(accept_opaques: false,
+                     accept_pointers: false,
+                     merge_skip_copy: true,
+                     remove_trailing_skips: true)
+        end
+    end
+    x.report("with all options set and keyword arguments") do
+        TIMES.times do
+            validate_with_keyword_arguments(accept_opaques: false,
+                     accept_pointers: false,
+                     merge_skip_copy: true,
+                     remove_trailing_skips: true)
+        end
+    end
+end
+

data/ext/utilrb/extconf.rb

@@ -5,23 +5,7 @@ if try_link("int main() { }", "-module")
     $LDFLAGS += " -module"
 end
 
-$LDFLAGS += "  -lreadline"
-if RUBY_VERSION < "1.9"
-    $CFLAGS += " -DRUBY_IS_18"
-    puts "not building with core source"
-    create_makefile("utilrb/utilrb")
-else
-    begin
-        require 'debugger/ruby_core_source'
-        hdrs = lambda { try_compile("#include <vm_core.h>") }
-        $CFLAGS += " -DHAS_RUBY_SOURCE"
-        Debugger::RubyCoreSource.create_makefile_with_core(hdrs, "utilrb/utilrb")
-    rescue Exception
-        $CFLAGS.gsub!(/ -DHAS_RUBY_SOURCE/, '')
-        puts "not building with core source"
-        create_makefile("utilrb/utilrb")
-    end
-end
+create_makefile("utilrb/utilrb")
 
 ## WORKAROUND a problem with mkmf.rb
 # It seems that the newest version do define an 'install' target. However, that

data/ext/utilrb/utilrb.cc

@@ -28,19 +28,6 @@ static VALUE enumerable_each_uniq(VALUE self)
     return self;
 }
 
-/* call-seq:
- *  Kernel.is_singleton?(object)
- *
- * Returns true if +self+ is a singleton class 
- */
-static VALUE kernel_is_singleton_p(VALUE self)
-{
-    if (BUILTIN_TYPE(self) == T_CLASS && FL_TEST(self, FL_SINGLETON))
-	return Qtrue;
-    else
-	return Qfalse;
-}
-
 static VALUE kernel_is_immediate(VALUE klass, VALUE object)
 { return IMMEDIATE_P(object) ? Qtrue : Qfalse; }
 #endif
@@ -53,9 +40,6 @@ static VALUE kernel_crash(VALUE klass)
 }
 
 extern "C" void Init_value_set();
-extern "C" void Init_weakref(VALUE mUtilrb);
-extern "C" void Init_proc();
-extern "C" void Init_utilrb_readline();
 
 extern "C" void Init_utilrb()
 {
@@ -63,17 +47,10 @@ extern "C" void Init_utilrb()
 
 #ifndef RUBINIUS
     rb_define_method(rb_mEnumerable, "each_uniq", RUBY_METHOD_FUNC(enumerable_each_uniq), 0);
-    rb_define_method(rb_mKernel, "is_singleton?", RUBY_METHOD_FUNC(kernel_is_singleton_p), 0);
-
     rb_define_singleton_method(rb_mKernel, "crash!", RUBY_METHOD_FUNC(kernel_crash), 0);
     rb_define_singleton_method(rb_mKernel, "immediate?", RUBY_METHOD_FUNC(kernel_is_immediate), 1);
-
-    Init_weakref(mUtilrb);
 #endif
 
-    Init_proc();
-
     Init_value_set();
-    Init_utilrb_readline();
 }
 

data/lib/utilrb/column_formatter.rb

@@ -1,3 +1,6 @@
+puts "WARN: ColumnFormatter is deprecated, use the tty-table gem which provides"
+puts "WARN: more functionality in a much nicer API"
+
 # Displays a set of data into a column-formatted table
 class ColumnFormatter
     MARGIN       = 1
@@ -53,18 +56,18 @@ class ColumnFormatter
 	# First, determine the columns width and height, and
 	# convert data into strings
 	data = data.map do |line_data|
-	    line_data = line_data.inject({}) do |h, (label, data)|
-		h[label.to_s] = data.to_s
+	    line_data = line_data.inject({}) do |h, (label, value)|
+		h[label.to_s] = value.to_s
 		h
 	    end
 		
-	    line_data.each do |label, data|
+	    line_data.each do |label, value|
 		unless width.has_key?(label)
 		    width[label] = label.length
 		end
 
-		if width[label] < data.length
-		    width[label] = data.length
+		if width[label] < value.length
+		    width[label] = value.length
 		end
 	    end
 	end

data/lib/utilrb/common.rb

@@ -1,11 +1,8 @@
+require 'utilrb/version'
 
 # Utilrb is yet another Ruby toolkit, in the spirit of facets. It includes all
 # the standard class extensions used by www.rock-robotics.org projects.
 module Utilrb
-    unless defined? Utilrb::VERSION
-	VERSION = "2.0.2.b2"
-    end
-
     LIB_DIR = File.expand_path(File.dirname(__FILE__))
 
     unless defined? UTILRB_EXT_MODE
@@ -14,8 +11,6 @@ module Utilrb
 	    STDERR.puts "Utilrb: not loading the C extension"
 	else
 	    begin
-                # We need readline
-                require 'readline'
 		require 'utilrb/utilrb'
 		UTILRB_EXT_MODE = true
 		STDERR.puts "Utilrb: loaded C extension" if ENV['UTILRB_EXT_MODE']

data/lib/utilrb/enumerable/uniq.rb

@@ -2,15 +2,9 @@ require 'utilrb/common'
 require 'enumerator'
 require 'set'
 
-enumerator = if defined?(Enumerable::Enumerator)
-                 Enumerable::Enumerator
-             else
-                 Enumerator
-             end
-
 # Enumerator object which removes duplicate entries. 
 # See also Object#enum_uniq and Enumerable#each_uniq
-class UniqEnumerator < enumerator
+class UniqEnumerator < Enumerator
     # Creates the enumerator on +obj+ using the method +enum_with+ to
     # enumerate. The method will be called with the arguments in +args+.
     #
@@ -60,7 +54,7 @@ Utilrb.unless_ext do
 	#  each_uniq { |obj| ... }
 	# 
 	# Yields all unique values found in +enum+
-	def each_uniq(&iterator)
+	def each_uniq
 	    seen = Set.new
 	    each do |obj|
 		if !seen.include?(obj)

data/lib/utilrb/event_loop.rb

@@ -74,10 +74,6 @@ module Utilrb
                 @event_loop.cancel_timer self
             end
 
-            def single_shot?
-                @single_shot
-            end
-
             def stopped?
                 @stopped 
             end
@@ -364,7 +360,7 @@ module Utilrb
             raise ArgumentError "no block given" unless block
             if delay && delay > 0
                 timer = Timer.new(self,delay,true,&block)
-                timer.start
+                timer.start(timer.period, false)
             else
                 add_event(Event.new(block))
             end
@@ -579,7 +575,7 @@ module Utilrb
         end
 
         def reraise_error(error)
-            raise error, error.message, error.backtrace + caller(1)
+            raise error, error.message, (error.backtrace || []) + caller(1)
         end
 
         # Handles all current events and timers. If a code
@@ -594,7 +590,7 @@ module Utilrb
             #copy all work otherwise it would not be allowed to 
             #call any event loop functions from a timer
             timers,call = @mutex.synchronize do
-                                    @every_cylce_events.delete_if &:ignore?
+                                    @every_cylce_events.delete_if(&:ignore?)
                                     @every_cylce_events.each do |event|
                                         add_event event
                                     end
@@ -897,7 +893,6 @@ module Utilrb
 
                     line_no = __LINE__; str = %Q{
                     def #{ali}(*args, &block)
-                        options = Hash.new
                         accessor,error = #{if options[:known_errors]
                                             %Q{
                                                 begin
@@ -923,7 +918,7 @@ module Utilrb
                                 raise error
                             end
                         else
-                            work = Proc.new do |*args|
+                            work = Proc.new do |*callback_args|
                                     acc,err = #{accessor} # cache accessor
                                     if !acc
                                         if err
@@ -932,7 +927,7 @@ module Utilrb
                                             raise DesignatedObjectNotFound,'designated object is nil'
                                         end
                                     else
-                                        acc.__send__(:#{method}, *args, &block)
+                                        acc.__send__(:#{method}, *callback_args, &block)
                                     end
                                 end
                             callback = #{filter ? "block.to_proc.arity == 2 ? Proc.new { |r,e| block.call(#{filter}(r),e)} : Proc.new {|r| block.call(#{filter}(r))}" : "block"}

data/lib/utilrb/kernel/load_dsl_file.rb

@@ -1,5 +1,4 @@
 require 'utilrb/common'
-require 'utilrb/object/singleton_class'
 require 'utilrb/kernel/with_module'
 
 module Kernel
@@ -67,7 +66,7 @@ module Kernel
 
         filtered_backtrace = backtrace[0, backtrace.size - our_frame_pos].
             map do |line|
-                line.gsub! /:in `.*dsl.*'/, ''
+                line = line.gsub(/:in `.*dsl.*'/, '')
                 if line =~ /load_dsl_file.*(method_missing|send)/
                     next
                 end

data/lib/utilrb/kernel/options.rb

@@ -1,6 +1,19 @@
 require 'utilrb/hash/to_sym_keys'
 require 'utilrb/hash/slice'
 module Kernel
+    def filter_options_handle_single_entry(known_options, options, key)
+        key = key.to_sym
+        if options.has_key?(key)
+            known_options[key] = options.delete(key)
+            false
+        elsif options.has_key?(key_s = key.to_s)
+            known_options[key] = options.delete(key_s)
+            false
+        else
+            true
+        end
+    end
+
     # Partitions an option hash between known arguments and unknown
     # arguments, with default value support. All option keys are
     # converted to symbols for consistency.
@@ -17,44 +30,27 @@ module Kernel
     #   filter_options(nil, known_options) -> default_options, {}
     #
     def filter_options(options, *user_option_spec)
-        option_spec = Hash.new
+        options = options.dup
+        known_options = Hash.new
         user_option_spec.each do |opt|
             if opt.respond_to?(:to_hash)
-                option_spec.merge!(opt)
+                opt.each do |key, value|
+                    if filter_options_handle_single_entry(known_options, options, key)
+                        if !value.nil?
+                            known_options[key.to_sym] = value
+                        end
+                    end
+                end
             elsif opt.respond_to?(:to_ary)
                 opt.each do |key|
-                    option_spec[key] = nil
+                    filter_options_handle_single_entry(known_options, options, key)
                 end
             else
-                option_spec[opt] = nil
+                filter_options_handle_single_entry(known_options, options, opt)
             end
         end
 
-        unknown_options = Hash.new
-        options = options.dup
-        options.delete_if do |key, value|
-            if !key.respond_to?(:to_sym)
-                unknown_options[key] = value
-                true
-            end
-        end
-
-        options     = (options.to_hash || Hash.new).to_sym_keys
-	# cannot use #to_sym_keys as option_spec can be an array
-	option_spec = option_spec.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
-
-	unknown_options.merge!(options.slice(*(options.keys - option_spec.keys)))
-	known_options   = options.slice(*option_spec.keys)
-
-        # Set default values defined in the spec
-        option_spec.each_key do |k| 
-            value = option_spec[k]
-	    if !known_options.has_key?(k) && !value.nil?
-		known_options[k] ||= value
-	    end
-        end
-
-        return *[known_options, unknown_options]
+        return *[known_options, options]
     end
 
     # Normalizes all keys in the given option hash to symbol and returns the

data/lib/utilrb/logger/hierarchy.rb

@@ -1,7 +1,6 @@
 require 'facets/module/spacename'
 require 'facets/kernel/constant'
 require 'utilrb/object/attribute'
-require 'utilrb/object/singleton_class'
 require 'utilrb/logger/forward'
 
 class Logger