utilrb 2.0.1 → 2.0.2.b1

data/Manifest.txt

@@ -8,6 +8,7 @@ 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

data/Rakefile

@@ -10,12 +10,21 @@ begin
         developer "Sylvain Joyeux", "sylvain.joyeux@m4x.org"
         self.readme_file = 'README.rd'
 
+
         extra_deps <<
             ['facets', '>= 2.4.0'] <<
             ['rake',     '>= 0.9'] <<
-            ["rake-compiler",   "~> 0.8.0"] <<
+            ["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']
@@ -36,7 +45,6 @@ begin
         ext.name = 'utilrb'
         ext.ext_dir = 'ext/utilrb'
         ext.lib_dir = 'lib/utilrb'
-        ext.config_options << "-DRUBINIUS"
         ext.source_pattern ="*.{c,cc,cpp}"
     end
 

data/ext/utilrb/extconf.rb

@@ -5,6 +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"
@@ -12,10 +13,11 @@ if RUBY_VERSION < "1.9"
 else
     begin
         require 'debugger/ruby_core_source'
-        $CFLAGS += " -DHAS_RUBY_SOURCE"
         hdrs = lambda { try_compile("#include <vm_core.h>") }
+        $CFLAGS += " -DHAS_RUBY_SOURCE"
         Debugger::RubyCoreSource.create_makefile_with_core(hdrs, "utilrb/utilrb")
-    rescue LoadError
+    rescue Exception
+        $CFLAGS.gsub!(/ -DHAS_RUBY_SOURCE/, '')
         puts "not building with core source"
         create_makefile("utilrb/utilrb")
     end

data/ext/utilrb/readline.c

@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <readline/readline.h>
+#include <ruby.h>
+
+static VALUE readline_save_prompt(VALUE self)
+{
+    rl_save_prompt();
+    return Qnil;
+}
+
+static VALUE readline_message(VALUE self, VALUE msg)
+{
+    rl_message("%s", StringValuePtr(msg));
+    rl_redisplay();
+    return Qnil;
+}
+
+static VALUE readline_print(VALUE self, VALUE msg)
+{
+    int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
+    char *saved_line;
+    int saved_point;
+    if (need_hack)
+    {
+        saved_point = rl_point;
+        saved_line = rl_copy_text(0, rl_end);
+        rl_save_prompt();
+        rl_replace_line("", 0);
+        rl_redisplay();
+    }
+
+    printf("%s", StringValuePtr(msg));
+
+    if (need_hack)
+    {
+        rl_restore_prompt();
+        rl_replace_line(saved_line, 0);
+        rl_point = saved_point;
+        rl_redisplay();
+        free(saved_line);
+    }
+    return Qnil;
+}
+
+extern void Init_utilrb_readline()
+{
+    VALUE mReadline = rb_define_module("Readline");
+    rb_define_singleton_method(mReadline, "save_prompt", readline_save_prompt, 0);
+    rb_define_singleton_method(mReadline, "message", readline_message, 1);
+    rb_define_singleton_method(mReadline, "print", readline_print, 1);
+}
+

data/ext/utilrb/utilrb.cc

@@ -55,6 +55,7 @@ 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()
 {
@@ -73,5 +74,6 @@ extern "C" void Init_utilrb()
     Init_proc();
 
     Init_value_set();
+    Init_utilrb_readline();
 }
 

data/lib/utilrb/common.rb

@@ -3,9 +3,7 @@
 # the standard class extensions used by www.rock-robotics.org projects.
 module Utilrb
     unless defined? Utilrb::VERSION
-	VERSION = "2.0.1"
-        RUBY_IS_19  = (RUBY_VERSION >= "1.9.2")
-        RUBY_IS_191 = (RUBY_VERSION >= "1.9") && (RUBY_VERSION < "1.9.2")
+	VERSION = "2.0.2.b1"
     end
 
     LIB_DIR = File.expand_path(File.dirname(__FILE__))
@@ -16,6 +14,8 @@ 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/event_loop.rb

@@ -231,6 +231,11 @@ module Utilrb
             thread_pool.sync(sync_key,*args,&block)
         end
 
+        # (see ThreadPool#sync_timeout)
+        def sync_timeout(sync_key,timeout,*args,&block)
+            thread_pool.sync_timeout(sync_key,timeout,*args,&block)
+        end
+
         def pretty_print(pp) # :nodoc:
             pp.text "EventLoop "
         end

data/lib/utilrb/kernel/load_dsl_file.rb

@@ -160,10 +160,7 @@ module Kernel
                 end
             end
 
-            old_constants, new_constants = nil
-            if !Utilrb::RUBY_IS_191
-                old_constants = Kernel.constants
-            end
+            old_constants, new_constants = Kernel.constants, nil
 
             sandbox = sandbox.new(proxied_object)
             sandbox.with_module(*context) do
@@ -184,7 +181,7 @@ module Kernel
 
             # Check if the user defined new constants by using class K and/or
             # mod Mod
-            if !Utilrb::RUBY_IS_191 && !new_constants
+            if !new_constants
                 new_constants = Kernel.constants
             end
 

data/lib/utilrb/kernel/with_module.rb

@@ -1,19 +1,5 @@
 require 'utilrb/common'
 module Kernel
-    if Utilrb::RUBY_IS_191
-    def with_module(*consts, &blk)
-        slf = self
-
-        l = if !block_given? && consts.last.respond_to?(:to_str)
-                eval_string = consts.pop
-                lambda { slf.instance_eval(eval_string) }
-            else
-                lambda { slf.instance_eval(&blk) }
-            end
-
-        consts.inject(l) {|l, k| lambda { k.class_eval(&l) } }.call
-    end
-    else
     module WithModuleConstResolutionExtension
         def const_missing(const_name)
             if with_module_setup = Thread.current[:__with_module__]
@@ -48,6 +34,5 @@ module Kernel
     ensure
         Thread.current[:__with_module__].pop
     end
-    end
 end
 

data/lib/utilrb/logger/root.rb

@@ -42,7 +42,7 @@ class Logger
     def self.Root(progname, base_level, &block)
 	begin	
 	    base_level = ENV['BASE_LOG_LEVEL'].upcase.to_sym if ENV['BASE_LOG_LEVEL']
-	    base_level = Logger.const_get( base_level ) if base_level.is_a? Symbol
+	    base_level = ::Logger.const_get( base_level ) if base_level.is_a? Symbol
 	rescue Exception => e
 	    raise ArgumentError, "Log level #{base_level} is not available in the ruby Logger"
 	end
@@ -58,8 +58,8 @@ class Logger
             end
 
         Module.new do
-            include Logger::Forward
-            include Logger::HierarchyElement
+            include ::Logger::Forward
+            include ::Logger::HierarchyElement
 
             def has_own_logger?; true end
 

data/lib/utilrb/module/const_defined_here_p.rb

@@ -1,12 +1,6 @@
 require 'utilrb/common'
 class Module
-    if Utilrb::RUBY_IS_191 || Utilrb::RUBY_IS_19
     def const_defined_here?(name)
         const_defined?(name, false)
     end
-    else
-    def const_defined_here?(name)
-        const_defined?(name)
-    end
-    end
 end

data/lib/utilrb/object/scoped_eval.rb

@@ -1,17 +1,8 @@
 require 'utilrb/common'
 require 'utilrb/kernel/with_module'
 class Object
-    if Utilrb::RUBY_IS_191
-        def scoped_eval(type = :instance_eval, &b)
-            modules = b.binding.eval "Module.nesting"
-            with_module(*modules) do
-                send(type, &b)
-            end
-        end
-    else
-        def scoped_eval(type = :instance_eval, &b)
-            send(type, &b)
-        end
+    def scoped_eval(type = :instance_eval, &b)
+        send(type, &b)
     end
 end
 

data/lib/utilrb/pkgconfig.rb

@@ -50,16 +50,16 @@ module Utilrb
         end
         @loaded_packages = Hash.new
 
-        def self.load(path)
+        def self.load(path, preset_variables)
             pkg_name = File.basename(path, ".pc")
             pkg = Class.instance_method(:new).bind(PkgConfig).call(pkg_name)
-            pkg.load(path)
+            pkg.load(path, preset_variables)
             pkg
         end
 
         # Returns the pkg-config object that matches the given name, and
         # optionally a version string
-        def self.get(name, version_spec = nil)
+        def self.get(name, version_spec = nil, preset_variables = Hash.new)
             if !(candidates = loaded_packages[name])
                 paths = find_all_package_files(name)
                 if paths.empty?
@@ -68,7 +68,7 @@ module Utilrb
 
                 candidates = loaded_packages[name] = Array.new
                 paths.each do |p|
-                    candidates << PkgConfig.load(p)
+                    candidates << PkgConfig.load(p, preset_variables)
                 end
             end
 
@@ -84,8 +84,8 @@ module Utilrb
         # ...
         # @return [PkgConfig] the pkg-config description
         # @raise [NotFound] if the package is not found
-        def self.new(name, version_spec = nil)
-            get(name, version_spec)
+        def self.new(name, version_spec = nil, options = Hash.new)
+            get(name, version_spec, options)
         end
 
         # Returns the first package in +candidates+ that match the given version
@@ -206,11 +206,11 @@ module Utilrb
         SHELL_VARS = %w{Cflags Libs Libs.private}
 
         # Loads the information contained in +path+
-        def load(path)
+        def load(path, preset_variables = Hash.new)
             @path = path
             @file = File.readlines(path).map(&:strip)
 
-            raw_variables = Hash.new
+            raw_variables = preset_variables.dup
             raw_fields    = Hash.new
 
             running_line = nil

data/lib/utilrb/spawn.rb

@@ -1,3 +1,5 @@
+require 'fcntl'
+
 module Utilrb
     class SpawnFailed < RuntimeError; end
     def self.spawn(*cmdline)

data/lib/utilrb/thread_pool.rb

@@ -1,6 +1,7 @@
 require 'thread'
 require 'set'
 require 'utilrb/kernel/options'
+require 'timeout'
 
 module Utilrb
     # ThreadPool implementation inspired by
@@ -448,6 +449,36 @@ module Utilrb
             result
         end
 
+        # Same as sync but raises Timeout::Error if sync_key cannot be obtained after
+        # the given execution time.
+        #
+        # @param [Object] sync_key The sync key
+        # @param [Float] timeout The timeout
+        # @yield [*args] the code block block 
+        # @return [Object] The result of the code block
+        def sync_timeout(sync_key,timeout,*args,&block)
+            raise ArgumentError,"no sync key" unless sync_key
+
+            Timeout::timeout(timeout) do
+                @mutex.synchronize do
+                    while(!@sync_keys.add?(sync_key))
+                        @cond_sync_key.wait @mutex #wait until someone has removed a key
+                    end
+                end
+            end
+            begin
+                result = block.call(*args)
+            ensure
+                @mutex.synchronize do
+                    @sync_keys.delete sync_key
+                end
+                @cond_sync_key.signal
+                @cond.signal # worker threads are just waiting for work no matter if it is
+                # because of a deletion of a sync_key or a task was added
+            end
+            result
+        end
+
         # Processes the given {Task} as soon as the next thread is available
         # 
         # @param [Task] task The task.

data/test/test_kernel.rb

@@ -180,32 +180,6 @@ class TC_Kernel < Test::Unit::TestCase
         end
     end
 
-    if !Utilrb::RUBY_IS_19
-    def test_eval_dsl_file_does_not_allow_class_definition
-        obj = Class.new do
-            def real_method
-                @real_method_called = true
-            end
-        end.new
-
-        Tempfile.open('test_eval_dsl_file') do |io|
-            io.puts <<-EOD
-            class NewClass
-            end
-            EOD
-            io.flush
-
-            begin
-                eval_dsl_file(io.path, obj, [], false)
-                flunk("NewClass has been defined")
-            rescue NameError => e
-                assert e.message =~ /NewClass/, e.message
-                assert e.backtrace.first =~ /#{io.path}:1/, "wrong backtrace when checking constant definition detection: #{e.backtrace[0]}, expected #{io.path}:1"
-            end
-        end
-    end
-    end
-
     def test_dsl_exec
         obj = Class.new do
             def real_method_called?; !!@real_method_called end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: utilrb
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2.b1
+  prerelease: 6
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -44,21 +44,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: hoe
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: hoe-yard
   requirement: !ruby/object:Gem::Requirement
@@ -76,29 +76,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: flexmock
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
-  type: :development
+        version: 0.8.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: debugger-ruby_core_source
+  name: flexmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,23 +106,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: debugger-ruby_core_source
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 description: ! 'Utilrb is yet another Ruby toolkit, in the spirit of facets. It includes
   all
 
@@ -147,6 +147,7 @@ files:
 - 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
@@ -274,41 +275,41 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: utilrb
+rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Utilrb is yet another Ruby toolkit, in the spirit of facets
 test_files:
+- test/test_objectstats.rb
+- test/test_gc.rb
+- test/test_array.rb
+- test/test_enumerable.rb
 - test/test_weakref.rb
+- test/test_config.rb
+- test/test_event_loop.rb
 - test/test_unbound_method.rb
-- test/test_enumerable.rb
-- test/test_exception.rb
-- test/test_objectstats.rb
+- test/test_set.rb
 - test/test_models.rb
-- test/test_dir.rb
 - test/test_time.rb
-- test/test_misc.rb
-- test/test_set.rb
-- test/test_config.rb
-- test/test_logger.rb
+- test/test_kernel.rb
 - test/test_proc.rb
-- test/test_hash.rb
-- test/test_array.rb
 - test/test_object.rb
 - test/test_thread_pool.rb
+- test/test_dir.rb
+- test/test_hash.rb
+- test/test_exception.rb
+- test/test_logger.rb
+- test/test_misc.rb
 - test/test_module.rb
-- test/test_event_loop.rb
-- test/test_kernel.rb
 - test/test_pkgconfig.rb
-- test/test_gc.rb