Merge branch 'master' of https://github.com/orocos-toolchain/utilrb i…

…nto toolchain-2.9

Conflicts:
	Rakefile
	package.xml

.gitignore

@@ -11,3 +11,7 @@ tmp/
 .yardoc
 lib/utilrb/utilrb.so
 pkg/
+/vendor/
+/.bundle/
+/Gemfile.lock
+

.travis.yml

@@ -0,0 +1,10 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
+script:
+    - bundle exec rake
+    - bundle exec rake test

CMakeLists.txt

@@ -4,35 +4,9 @@ cmake_minimum_required(VERSION 2.6)
 project(utilrb)
 find_package(Ruby REQUIRED)
 
-include_directories( ${RUBY_INCLUDE_DIRS})
-if(${RUBY_VERSION} VERSION_LESS "1.9")
-  add_definitions(-DRUBY_IS_18)
-endif()
-
-# Find readline
-find_library(readline_LIBRARY readline)
-if(NOT readline_LIBRARY)
-  message(SEND_ERROR "libreadline not found!")
-endif()
-
-add_library( utilrb_ext MODULE
-  ext/utilrb/proc.c
-  ext/utilrb/readline.c
-  ext/utilrb/utilrb.cc
-  ext/utilrb/value_set.cc
-  ext/utilrb/weakref.cc
-)
-set_target_properties(utilrb_ext PROPERTIES PREFIX "")
-if(APPLE)
-  set_target_properties(utilrb_ext PROPERTIES SUFFIX ".bundle")
-endif()
-target_link_libraries(utilrb_ext ${RUBY_LIBRARY} ${readline_LIBRARY})
-set_target_properties(utilrb_ext PROPERTIES OUTPUT_NAME utilrb)
-
 string(REGEX REPLACE ".*(lib|share)(32|64)?/?" "\\1/" RUBY_EXTENSIONS_INSTALL_DIR ${RUBY_ARCH_DIR})
 string(REGEX REPLACE ".*(lib|share)(32|64)?/?" "\\1/" RUBY_LIBRARY_INSTALL_DIR ${RUBY_RUBY_LIB_PATH})
 install(DIRECTORY lib/ DESTINATION ${RUBY_LIBRARY_INSTALL_DIR} )
-install(TARGETS utilrb_ext DESTINATION ${RUBY_EXTENSIONS_INSTALL_DIR}/utilrb )
 install(FILES package.xml DESTINATION share/utilrb)
 
 # Install an env-hook if catkin is found

Gemfile

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

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 <[email protected]>

Rakefile

@@ -1,58 +1,12 @@
-$LOAD_PATH.unshift File.expand_path('lib', File.dirname(__FILE__))
-require 'rake'
-begin 
-    require 'hoe'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-    Hoe::plugin :yard
+task :default
 
-    hoe_spec = Hoe.spec 'utilrb' do
-        developer "Sylvain Joyeux", "[email protected]"
-        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"]
-
-        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
-
-
-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