xot 0.1.6 → 0.1.7

data/lib/xot/setter.rb

@@ -7,10 +7,8 @@ module Xot
   module Setter
 
     def set (*args)
-      return if args.empty?
-
       first = args.shift
-      if first.class == Hash
+      if first.kind_of? Hash
         first.each {|name, value| set_value__ name, value}
       else
         set_value__ first, *args
@@ -19,9 +17,10 @@ module Xot
 
     private
 
-    def set_value__ (name, *value)
-      __send__ name.to_s + '=', *value
-    end
+      def set_value__ (name, *values)
+        raise ArgumentError unless name && !values.empty?
+        __send__ "#{name}=", *values
+      end
 
   end# Setter
 

data/lib/xot/test.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+
+module Xot
+
+
+  module Test
+
+    def assert_not (expression, *args)
+      assert !expression, *args
+    end
+
+    def assert_not_includes (collection, obj, *args)
+      assert !collection.include?(obj), *args
+    end
+
+  end# Test
+
+
+end# Xot

data/src/debug.cpp

@@ -3,7 +3,11 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <xot/string.h>
+#include "xot/string.h"
+
+// compile to check
+#include "xot/pimpl.h"
+#include "xot/ref.h"
 
 
 namespace Xot

data/src/exception.cpp

@@ -0,0 +1,89 @@
+#include "xot/exception.h"
+
+
+namespace Xot
+{
+
+
+	XotError::XotError (const char* str)
+	:	Super(str ? str : "")
+	{
+	}
+
+
+	InvalidStateError::InvalidStateError (const char* str)
+	:	Super(str)
+	{
+	}
+
+
+	SystemError::SystemError (const char* str)
+	:	Super(str)
+	{
+	}
+
+
+	NotImplementedError::NotImplementedError (const char* str)
+	:	Super(str)
+	{
+	}
+
+
+	String
+	error_text (const char* file, int line, const char* str)
+	{
+		String s = str;
+		if (file) s = stringf("%s:%d: ", file, line) + s;
+		return s;
+	}
+
+
+	namespace ErrorFunctions
+	{
+
+		void
+		xot_error (const char* file, int line, const char* format, ...)
+		{
+			XOT_STRINGF(format, s);
+			throw XotError(error_text(file, line, s));
+		}
+
+		void
+		argument_error (const char* file, int line, const char* format, ...)
+		{
+			XOT_STRINGF(format, s);
+			throw std::invalid_argument(error_text(file, line, s));
+		}
+
+		void
+		index_error (const char* file, int line, const char* format, ...)
+		{
+			XOT_STRINGF(format, s);
+			throw std::out_of_range(error_text(file, line, s));
+		}
+
+		void
+		invalid_state_error (const char* file, int line, const char* format, ...)
+		{
+			XOT_STRINGF(format, s);
+			throw InvalidStateError(error_text(file, line, s));
+		}
+
+		void
+		system_error (const char* file, int line, const char* format, ...)
+		{
+			XOT_STRINGF(format, s);
+			throw SystemError(error_text(file, line, s));
+		}
+
+		void
+		not_implemented_error (const char* file, int line, const char* format, ...)
+		{
+			XOT_STRINGF(format, s);
+			throw NotImplementedError(error_text(file, line, s));
+		}
+
+	}// ErrorFunctions
+
+
+}// Xot

data/src/string.cpp

@@ -9,6 +9,45 @@ namespace Xot
 {
 
 
+	String::String ()
+	{
+	}
+
+	String::String (const char* str)
+	:	Super(str)
+	{
+	}
+
+	String::operator const char* () const
+	{
+		return c_str();
+	}
+
+	String
+	operator + (const String& lhs, const String& rhs)
+	{
+		String t = lhs;
+		t += rhs;
+		return t;
+	}
+
+	String
+	operator + (const String& lhs, const char* rhs)
+	{
+		String t = lhs;
+		t += rhs;
+		return t;
+	}
+
+	String
+	operator + (const char* lhs, const String& rhs)
+	{
+		String t = lhs;
+		t += rhs;
+		return t;
+	}
+
+
 	String
 	stringf (const char* format, ...)
 	{

data/src/time.cpp

@@ -0,0 +1,24 @@
+#include "xot/time.h"
+
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+namespace pt = boost::posix_time;
+
+
+namespace Xot
+{
+
+
+	double
+	time (bool local)
+	{
+		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;
+	}
+
+
+}// Xot

data/task/ext.rake

@@ -17,6 +17,7 @@ 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'
@@ -25,35 +26,20 @@ namespace :ext do
   ruby     = env :RUBY,     'ruby'
   make     = env :MAKE,     'make'
   cxx      = env :CXX,      rbconf['CXX'] || 'g++'
-  defs     = env :DEFS,     []
-  debug    = env :DEBUG,    false
-  incdirs  = env :INCDIRS,  []
-  cxxflags = env(:CXXFLAGS, rbconf['CXXFLAGS']).dup
+  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"]
-
-  incroot = rbconf['rubyhdrdir']
-  incdirs += [
-    incroot,
-    "#{incroot}/#{RUBY_PLATFORM}",
-    '/opt/local/include',
-    '/opt/include'
-  ]
-  incdirs.uniq!
-
-  defs     << '_DEBUG' if debug
-  defs     << 'NDEBUG' unless debug
-  defs     << 'WIN32' if win32?
-  defs     << 'COCOA' if cocoa?
-  defs     << $~[0].upcase if RUBY_PLATFORM =~ /mswin|ming|cygwin|darwin/i
-  cxxflags << ' ' << rbconf['debugflags'] if debug
-  cxxflags << ' --stdlib=libc++' if clang?
-  cxxflags << defs.map{|s| " -D#{s}"}.join
-  cxxflags << incdirs.map{|s| " -I#{s}"}.join
+  libs = FileList["#{libdir}/../lib*.a"]
 
   extconf  = File.join extdir, 'extconf.rb'
   makefile = File.join extdir, 'Makefile'
@@ -75,15 +61,15 @@ namespace :ext do
     sh %( cd #{extdir} && #{make} )
   end
 
-  file makefile => [extconf, depend] do
+  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 ' '
+    inc = incdirs.map {|s| " -I#{s}"}.join
+    src = srcs.map {|cpp| File.basename cpp}.join ' '
     dep = File.basename depend
-    sh %( cd #{extdir} && #{cxx} -M #{cxxflags} #{inc} #{src} > #{dep} )
+    sh %( cd #{extdir} && #{cxx} -M #{cppflags} #{inc} #{src} > #{dep} )
   end
 
 

data/task/lib.rake

@@ -18,48 +18,32 @@ namespace :lib do
   rbconf = RbConfig::CONFIG
 
   mod      = MODULE
-  name     = env :NAME,     MODULE.name.downcase
+  mods     = env :MODULES,  [], :array
+  modname  = env :MODNAME,  MODULE.name.downcase
   incdir   = env :INCDIR,   'include'
   srcdir   = env :SRCDIR,   'src'
   libdir   = env :LIBDIR,   'lib'
   cxx      = env :CXX,      rbconf['CXX'] || 'g++'
   ar       = env :AR,       rbconf['AR']  || 'ar'
-  defs     = env :DEFS,     []
-  debug    = env :DEBUG,    false
-  incdirs  = env :INCDIRS,  []
-  cxxflags = env(:CXXFLAGS, rbconf['CXXFLAGS']).dup
-  arflags  = env(:ARFLAGS,  'crs').dup
+  cppflags = env :CPPFLAGS, rbconf['CPPFLAGS']
+  cxxflags = env :CXXFLAGS, rbconf['CXXFLAGS']
+  arflags  = env :ARFLAGS,  'crs'
+  defs     = env :DEFS,     [], :array
+  incdirs  = env(:INCDIRS,  [], :array) + mods.reverse.map {|m| m.include_dir}
 
-  outname = "lib#{name}.a"
+  cppflags = cppflags cppflags, defs, incdirs
+  cxxflags = cflags cxxflags
+
+  outname = "lib#{modname}.a"
   out     = File.join libdir, outname
 
   erbs    = glob *[incdir, srcdir].map {|s| "#{s}/**/*.erb"}
   erbs    = convertions erbs, {".erb" => ""}
-  headers = glob("include/**/*.h") | erbs.values.grep(/\.h$/)
-  srcs    = glob("src/**/*.cpp")   | erbs.values.grep(/\.cpp$/)
-  srcs   += glob("src/**/*.mm") if cocoa?
+  srcs    = glob("#{srcdir}/**/*.cpp")   | erbs.values.grep(/\.cpp$/)
+  srcs   += glob("#{srcdir}/**/*.mm") if osx? || ios?
   srcs    = srcs.reject {|s| s =~ %r(/win32/)} unless win32?
-  srcs    = srcs.reject {|s| s =~ %r(/cocoa/)} unless cocoa?
-
-  incroot = rbconf['rubyhdrdir']
-  incdirs.concat Xot.include_dirs + [
-    incroot,
-    "#{incroot}/#{RUBY_PLATFORM}",
-    '/opt/local/include',
-    '/opt/include'
-  ]
-  incdirs.uniq!
-
-  defs     << '_DEBUG' if debug
-  defs     << 'NDEBUG' unless debug
-  defs     << 'WIN32' if win32?
-  defs     << 'COCOA' if cocoa?
-  defs     << $~[0].upcase if RUBY_PLATFORM =~ /mswin|ming|cygwin|darwin/i
-  cxxflags << ' ' << rbconf['debugflags'] if debug
-  cxxflags.gsub! /-O\d?/, '' if debug
-  cxxflags << ' --stdlib=libc++' if clang?
-  cxxflags << defs.map{|s| " -D#{s}"}.join
-  cxxflags << incdirs.map{|s| " -I#{s}"}.join
+  srcs    = srcs.reject {|s| s =~ %r(/osx/)}   unless osx?
+  srcs    = srcs.reject {|s| s =~ %r(/ios/)}   unless ios?
 
   depend = 'depend.mf'
   objs   = convertions srcs, {".cpp" => ".o", ".mm" => ".o"}
@@ -77,11 +61,11 @@ namespace :lib do
   task :erb => erbs.values
 
   file out => objs.values do
-    sh %( #{ar} #{arflags} #{out} #{objs.values.join " "} )
+    sh %( #{ar} #{arflags} #{out} #{objs.values.join " "} ) unless objs.values.empty?
   end
 
   file depend => erbs.values do
-    sh %( #{cxx} -M #{cxxflags} #{srcs.join ' '} > #{depend} )
+    sh %( #{cxx} -M #{cppflags} #{srcs.join ' '} > #{depend} )
     input = open(depend) {|f| f.read}
     open(depend, 'w') do |output|
       output << input.gsub(/\w+\.o/, srcdir + '/\0')
@@ -90,13 +74,13 @@ namespace :lib do
 
   import depend if File.exist? depend
 
-  objs.each do |(src, obj)|
+  objs.each do |src, obj|
     file obj => [depend, src] + erbs.values do
-      sh %( #{cxx} -c #{cxxflags} -o #{obj} #{src} )
+      sh %( #{cxx} -c #{cppflags} #{cxxflags} -o #{obj} #{src} )
     end
   end
 
-  erbs.each do |(erb, out)|
+  erbs.each do |erb, out|
     file out => erb do
       print "#{erb}: compiling to #{out} ..."
       compile erb, out

data/task/mac.rake

@@ -0,0 +1,45 @@
+# -*- mode: ruby; coding: utf-8 -*-
+
+
+task :app => 'app:build'
+
+%w[clean run].each do |t|
+  task t.intern => "app:#{t}"
+end
+
+
+namespace :app do
+
+
+  mod     = MODULE
+  name    = env :NAME,   MODULE.name.downcase
+  bindir  = env :BINDIR, 'bin'
+  ruby    = env :RUBY,   'ruby'
+
+  bin       = "#{bindir}/#{name}"
+  appname   = name.capitalize
+  appdir    = "#{appname}.app"
+  appbindir = "#{appdir}/Contents/MacOS"
+  out       = "#{appbindir}/#{name}"
+
+  tmps = [appdir]
+
+
+  task :build => out
+
+  task :clean do
+    sh %( rm -rf #{tmps.join ' '} )
+  end
+
+  task :run => :app do
+    sh %( #{ruby} #{bin} )
+  end
+
+  file out => [bin, appbindir] do
+    sh %( cp #{bin} #{appbindir} )
+  end
+
+  directory appbindir
+
+
+end# :app

data/test/helper.rb

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-File.expand_path('../../lib', __FILE__).tap do |path|
-  $:.unshift path if !$:.include?(path) && File.directory?(path)
-end
+%w[.]
+  .map  {|s| File.expand_path "../../#{s}/lib", __FILE__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'test/unit'
 require 'xot'
+require 'xot/test'
 require 'xot/tester'
+
+include Xot::Test