xot 0.1.3 → 0.1.4

data/task/git.rake

@@ -1,6 +1,11 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
+%w[status diff push pull].each do |t|
+  task t.intern => "git:#{t}"
+end
+
+
 namespace :git do
 
 

data/task/lib.rake

@@ -5,28 +5,36 @@ require 'rbconfig'
 require 'rake/loaders/makefile'
 
 
+task :lib => 'lib:build'
+
+%w[clean].each do |t|
+  task t.intern => "lib:#{t}"
+end
+
+
 namespace :lib do
 
 
   rbconf = RbConfig::CONFIG
 
-  mod     = MODULE
-  name    = env :NAME, MODULE.name.downcase
-  incdir  = env :INCDIR, 'include'
-  srcdir  = env :SRCDIR, 'src'
-  libdir  = env :LIBDIR, 'lib'
-  cc      = env :CC,     rbconf['CC'] || 'g++'
-  ar      = env :AR,     'ar'
-  defs    = env :DEFS,   []
-  incdirs = env(:INCDIRS) ? env(:INCDIRS) : []
-  cflags  = env(:CFLAGS,  '-Wall -O -g').dup
-  arflags = env(:ARFLAGS, 'crs').dup
+  mod      = MODULE
+  name     = env :NAME,     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
 
   outname = "lib#{name}.a"
   out     = File.join libdir, outname
 
-  rbs     = glob '**/*.rb'
-  erbs    = convertions glob("**/*.erb"), {".erb" => ""}
+  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?
@@ -42,10 +50,16 @@ namespace :lib do
   ]
   incdirs.uniq!
 
-  defs   << 'WIN32' if win32?
-  defs   << 'COCOA' if cocoa?
-  cflags << defs.map{|s| " -D#{s}"}.join
-  cflags << incdirs.map{|s| " -I#{s}"}.join
+  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
 
   depend = 'depend.mf'
   objs   = convertions srcs, {".cpp" => ".o", ".mm" => ".o"}
@@ -54,20 +68,20 @@ namespace :lib do
 
   task :build => out
 
-  task :compile => objs.values
-
-  task :erb => erbs.values
-
   task :clean do
     sh %( rm -rf #{tmps.join " "} #{out} )
   end
 
+  task :compile => objs.values
+
+  task :erb => erbs.values
+
   file out => objs.values do
     sh %( #{ar} #{arflags} #{out} #{objs.values.join " "} )
   end
 
   file depend => erbs.values do
-    sh %( #{cc} -M #{cflags} #{srcs.join ' '} > #{depend} )
+    sh %( #{cxx} -M #{cxxflags} #{srcs.join ' '} > #{depend} )
     input = open(depend) {|f| f.read}
     open(depend, 'w') do |output|
       output << input.gsub(/\w+\.o/, srcdir + '/\0')
@@ -78,13 +92,13 @@ namespace :lib do
 
   objs.each do |(src, obj)|
     file obj => [depend, src] + erbs.values do
-      sh %( #{cc} -c #{cflags} -o #{obj} #{src} )
+      sh %( #{cxx} -c #{cxxflags} -o #{obj} #{src} )
     end
   end
 
   erbs.each do |(erb, out)|
-    file out => [erb] + rbs do
-      print "#{erb}: compiling to #{out}..."
+    file out => erb do
+      print "#{erb}: compiling to #{out} ..."
       compile erb, out
       puts "ok"
     end

data/task/submodule.rake

@@ -0,0 +1,51 @@
+# -*- mode: ruby; coding: utf-8 -*-
+
+
+SUBMODULE_TASKS = %w[
+  build clean lib ext doc test gem
+  status diff push pull
+  install uninstall upload
+]
+
+
+SUBMODULE_TASKS.each do |name|
+  t = task "#{name}-all".intern
+  t.prerequisites.unshift "submodule:#{name}", :header
+  t.prerequisites.push name.intern
+end if File.exist? '.gitmodules'
+
+task :submodule => "submodule:init"
+
+task :header do
+  header MODULE
+end
+
+
+namespace :submodule do
+
+
+  mods  = env :SUBMODULES, []
+  git   = env :GIT,        'git'
+
+
+  (SUBMODULE_TASKS + [:init]).each do |t|
+    task t.intern => mods.map {|m| "submodule:#{m}:#{t}"}
+  end
+
+  mods.each do |mod|
+    namespace mod.intern do
+
+      empty_task :init
+
+      SUBMODULE_TASKS.each do |t|
+        task t.intern => "submodule:#{mod}:init" do
+          header mod
+          sh %( cd #{mod} && rake #{t} )
+        end
+      end
+
+    end# mod.intern
+  end
+
+
+end# submodule

data/task/test.rake

@@ -0,0 +1,35 @@
+# -*- mode: ruby; coding: utf-8 -*-
+
+
+require 'rake/testtask'
+
+
+task :test => 'test:all'
+
+empty_task :ext
+
+
+namespace :test do
+
+
+  alones   = env :TESTS_ALONE,   []
+  excludes = env :TESTS_EXCLUDE, []
+  ruby     = env :RUBY,          'ruby'
+
+
+  task :all => [:ext, :full, :alones]
+
+  Rake::TestTask.new :full do |t|
+    t.libs << 'lib'
+    t.test_files = FileList['test/test_*.rb'] - alones - excludes
+    t.verbose = true
+  end
+
+  task :alones do
+    alones.each do |rb|
+      next if excludes.include? rb
+      sh %( #{ruby} #{rb} )
+    end
+  end
+
+end# :test

data/test/helpers.rb

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+
+require 'bundler/setup'
+require 'test/unit'
+require 'xot'
+require 'xot/tester'

data/test/test_blockutil.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestBlockUtil < Test::Unit::TestCase
+
+  include Xot::BlockUtil::ClassMethods
+
+  class Temp
+
+    attr_accessor :value
+
+  end# Temp
+
+  def temp (*args)
+    Temp.new
+  end
+
+  def test_instance_eval_or_block_call ()
+    t = temp
+    t.value = 1
+
+    assert_equal 2, instance_eval_or_block_call(t) {|x| x.value = 2}
+    assert_equal 2, t.value
+
+    assert_equal 3, instance_eval_or_block_call(t) {|x| t.value = 3}
+    assert_equal 3, t.value
+
+    assert_equal 4, instance_eval_or_block_call(t) {self.value = 4}
+    assert_equal 4, t.value
+
+    assert_equal 5, instance_eval_or_block_call(t) {t.value = 5}
+    assert_equal 5, t.value
+
+    assert_raise NoMethodError do
+      instance_eval_or_block_call(t) {|x| self.value = 9}
+    end
+  end
+
+end# TestBlockUtil

data/test/test_hookable.rb

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestHookable < Test::Unit::TestCase
+
+  class Temp
+
+    include Xot::Hookable
+
+    attr_reader :log
+
+    def initialize ()
+      @log = []
+    end
+
+    def test (val1, val2)
+      @log << val1 << val2
+    end
+
+    def zero ()
+      @log << 0
+    end
+
+  end# Temp
+
+  def temp (*args)
+    Temp.new
+  end
+
+  def test_hook ()
+    o = temp
+    o.hook(:test) do |*args|
+      super -1, 0
+      o.log << args
+      super *args
+      super 8, 9
+    end
+    o.test 1, 2
+    assert_equal [-1, 0, [1, 2], 1, 2, 8, 9], o.log
+  end
+
+  def test_before ()
+    o = temp
+    o.before(:zero) {o.log << 1}
+    o.zero
+    assert_equal [1, 0], o.log
+  end
+
+  def test_after ()
+    o = temp
+    o.after(:zero) {o.log << 1}
+    o.zero
+    assert_equal [0, 1], o.log
+  end
+
+  def test_on ()
+    o = temp
+    o.on(:zero) {o.log << 1}
+    o.zero
+    assert_equal [1], o.log
+  end
+
+  def test_hook_self ()
+    o, id = temp, nil
+    o.hook(:zero) {id = __id__}
+    o.zero
+    assert_equal o.__id__, id
+  end
+
+end# TestHookable

data/test/test_rake_helpers.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+require 'xot/rake'
+
+include Xot::Rake
+
+
+Const      = 'const'
+Zero       = 0
+NonZero    = 1
+ZeroStr    = '0'
+NonZeroStr = '1'
+True       = true
+False      = false
+TrueStr    = 'true'
+FalseStr   = 'false'
+
+
+class TestRakeHelpers < Test::Unit::TestCase
+
+  def test_set ()
+    assert_equal 'const', env(:Const, :dummy)
+    assert_equal 0, env(:Zero, :dummy)
+    assert_equal 1, env(:NonZero, :dummy)
+    assert_equal 0, env(:ZeroStr, :dummy)
+    assert_equal 1, env(:NonZeroStr, :dummy)
+    assert_equal true, env(:True, :dummy)
+    assert_equal false, env(:False, :dummy)
+    assert_equal true, env(:TrueStr, :dummy)
+    assert_equal false, env(:FalseStr, :dummy)
+  end
+
+end# TestRakeHelpers

data/test/test_setter.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestSetter < Test::Unit::TestCase
+
+  class Temp
+
+    include Xot::Setter
+
+    attr_accessor :x, :y
+
+  end# Temp
+
+  def temp (*args)
+    Temp.new
+  end
+
+  def test_set ()
+    o = temp
+    o.set :x, 1
+    assert_equal 1, o.x
+  end
+
+  def test_set_by_hash ()
+    o = temp
+    o.set :x => 1, :y => 2
+    assert_equal [1, 2], [o.x, o.y]
+  end
+
+  def test_invalid_name ()
+    assert_raise(NoMethodError) {temp.set :badname, 1}
+    assert_raise(NoMethodError) {temp.set :badname}
+  end
+
+  def test_invalid_value ()
+    assert_raise(ArgumentError) {temp.set :x}
+  end
+
+end# TestSetter

data/test/test_tester.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestTester < Test::Unit::TestCase
+
+  def test_native ()
+    assert Xot::Tester.test_native
+  end
+
+end# TestTester

data/xot.gemspec

@@ -1,53 +1,41 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-$: << File.join(File.dirname(__FILE__), 'lib')
+$: << File.expand_path('../lib', __FILE__)
 
-require 'rake'
 require 'xot/module'
 
 
-MODULE = Xot
-NAME   = MODULE.name.downcase
-
-
-FILES = FileList[*%W[
-  README
-  ChangeLog
-  Rakefile
-  #{NAME}.gemspec
-  VERSION
-  task/**/*.rake
-  include/**/*.h
-  lib/**/*.rb
-  src/**/*.h
-  src/**/*.cpp
-]]
-
-RDOCS = FileList[*%W[
-  README
-]]
+Gem::Specification.new do |s|
+  def glob (*patterns)
+    patterns.map {|pat| Dir.glob(pat).to_a}.flatten
+  end
 
+  mod   = Xot
+  name  = mod.name.downcase
+  rdocs = glob *%w[README]
 
-Gem::Specification.new do |s|
-  s.name        = NAME
+  s.name        = name
   s.summary     = 'A Utility library for C++ developemt.'
   s.description = 'This library include some useful utility classes and functions for development with C++.'
-  s.version     = MODULE.version
+  s.version     = mod.version
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "http://github.com/xord/#{NAME}"
+  s.homepage = "http://github.com/xord/#{name}"
 
-  s.platform = Gem::Platform::RUBY
+  s.platform              = Gem::Platform::RUBY
+  s.required_ruby_version = '>=1.9.0'
 
+  s.add_runtime_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'gemcutter'
 
-  s.files = FILES.to_a
-
+  s.files            = `git ls-files`.split $/
+  s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}
+  s.test_files       = s.files.grep %r{^(test|spec|features)/}
+  s.extra_rdoc_files = rdocs.to_a
   s.has_rdoc         = true
-  s.extra_rdoc_files = RDOCS.to_a
 
   s.extensions << 'Rakefile'
 end