xot 0.1.4 → 0.1.5

data/Rakefile

@@ -1,7 +1,10 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-require 'bundler/setup'
+File.expand_path('../lib', __FILE__).tap do |path|
+  $:.unshift path if !$:.include?(path) && File.directory?(path)
+end
+
 require 'xot/rake'
 require 'xot/module'
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/ext/xot/extconf.rb

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 
 
-require 'bundler/setup'
+File.expand_path('../../../lib', __FILE__).tap do |path|
+  $:.unshift path if !$:.include?(path) && File.directory?(path)
+end
+
 require 'mkmf'
-require 'xot/rake/helpers'
+require 'xot/rake'
 require 'xot/module'
 
 include Xot::Rake

data/lib/xot.rb

@@ -4,4 +4,4 @@
 require 'xot/module'
 require 'xot/hookable'
 require 'xot/setter'
-require 'xot/blockutil'
+require 'xot/block_util'

data/lib/xot/block_util.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+
+module Xot
+
+
+  module BlockUtil
+
+    def instance_eval_or_block_call (recv, *args, &block)
+      if block.arity == 0
+        recv.instance_eval &block
+      else
+        block.call recv, *args
+      end
+    end
+
+    extend self
+
+  end# BlockUtil
+
+
+end# Xot

data/lib/xot/load_path.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+
+module Xot
+
+
+  module LoadPath
+
+    def unshift_lib (base_dir, *module_names)
+      each_lib_dir_to_add base_dir, *module_names do |dir|
+        $LOCA_PATH.unshift dir
+      end
+    end
+
+    def push_lib (base_dir, *module_names)
+      each_lib_dir_to_add base_dir, *module_names do |dir|
+        $LOAD_PATH.push dir
+      end
+    end
+
+    extend self
+
+    private
+
+      def each_lib_dir_to_add (base_dir, *module_names)
+        module_names.each do |name|
+          dir = File.join base_dir, name.to_s.downcase, 'lib'
+          next if $LOAD_PATH.include?(dir) || !File.directory?(dir)
+          yield dir
+        end
+      end
+
+  end# LoadPath
+
+
+end# Xot

data/lib/xot/module.rb

@@ -4,22 +4,26 @@
 module Xot
 
 
-  extend module ClassMethods
+  extend module ModuleInfo
 
-    def root_dir ()
-      File.expand_path(File.join File.dirname(__FILE__), '..', '..')
+    def version ()
+      open(root_dir 'VERSION') {|f| f.readline.chomp}
+    end
+
+    def root_dir (path = '')
+      File.expand_path "../../../#{path}", __FILE__
     end
 
     def include_dirs ()
-      [File.join(root_dir, 'include')]
+      %w[include].map {|dir| root_dir dir}
     end
 
-    def library_dirs ()
-      %w[lib].map {|dir| File.join root_dir, dir}
+    def lib_dirs ()
+      %w[lib].map {|dir| root_dir dir}
     end
 
     def task_dir ()
-      File.join root_dir, 'task'
+      root_dir 'task'
     end
 
     def load_tasks (*names)
@@ -33,13 +37,9 @@ module Xot
       end
     end
 
-    def version ()
-      open(File.join root_dir, 'VERSION') {|f| f.readline.chomp}
-    end
-
     self
 
-  end# ClassMethods
+  end# ModuleInfo
 
 
 end# Xot

data/lib/xot/rake.rb

@@ -1,5 +1,100 @@
 # -*- coding: utf-8 -*-
 
 
-require 'xot/rake/task'
-require 'xot/rake/helpers'
+require 'erb'
+require 'pp'
+
+
+module Xot
+
+
+  module Rake
+
+
+    def empty_task (*names)
+      names.each do |name|
+        task name => '.'
+      end
+    end
+
+    def glob (*patterns)
+      paths = []
+      patterns.each do |pattern|
+        paths.concat Dir.glob(pattern)
+      end
+      paths
+    end
+
+    def erb (str)
+      ERB.new(str, nil, "%").result binding
+    end
+
+    def compile (path, out)
+      open(path) do |input|
+        open(out, "w") do |output|
+          output.write erb(input.read)
+        end
+      end
+    #rescue
+    end
+
+    def params (n, sep = "", &block)
+      raise "block not given." unless block
+      return "" if n == 0
+      (1..n).map(&block).join(sep)
+    end
+
+    def convertions (paths, convs)
+      raise "empty conversion." if convs.empty?
+      paths = paths.map do |path|
+        convpath = path
+        convs.each do |from, to|
+          convpath = convpath.sub(/#{from.gsub('.', '\.')}$/, to)
+        end
+        [path, convpath]
+      end
+      Hash[*paths.flatten]
+    end
+
+    def env (name, defval = nil)
+      case val = (ENV[name.to_s] || Object.const_get(name) rescue defval)
+      when /^\d+$/ then val.to_i
+      when 'true'  then true
+      when 'false' then false
+      else val
+      end
+    end
+
+    def header (mod)
+      puts "-- #{mod.to_s.capitalize} " + "-" * 50
+    end
+
+    def win32? ()
+      RUBY_PLATFORM =~ /mswin|ming|cygwin/
+    end
+
+    def mswin? ()
+      RUBY_PLATFORM =~ /mswin/
+    end
+
+    def ming? ()
+      RUBY_PLATFORM =~ /ming/
+    end
+
+    def cygwin? ()
+      RUBY_PLATFORM =~ /cygwin/
+    end
+
+    def cocoa? ()
+      RUBY_PLATFORM =~ /darwin/
+    end
+
+    def clang? ()
+      RbConfig::CONFIG['CXX'] =~ /clang/
+    end
+
+
+  end# Rake
+
+
+end# Xot

data/task/gem.rake

@@ -19,7 +19,8 @@ namespace :gem do
 
   gemspec = "#{name}.gemspec"
   gemname = env :GEMNAME, name
-  gemfile = "#{gemname}-#{mod.version}.gem"
+  gemver  = mod.version
+  gemfile = "#{gemname}-#{gemver}.gem"
 
 
   task :build => gemfile
@@ -33,14 +34,16 @@ namespace :gem do
   end
 
   task :uninstall do
-    sh %( #{gem} uninstall #{name} )
+    sh %( #{gem} uninstall -x --version #{gemver} #{gemname} )
   end
 
-  task :upload => gemfile do
+  task :upload => :test_install do
     sh %( #{gem} push #{gemfile} )
   end
 
-  file gemfile => [:lib, :ext, :rdoc] do
+  task :test_install => [:install, :uninstall]
+
+  file gemfile => [:ext, :rdoc] do
     sh %( #{gem} build #{gemspec} )
   end
 

data/test/helper.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+
+File.expand_path('../../lib', __FILE__).tap do |path|
+  $:.unshift path if !$:.include?(path) && File.directory?(path)
+end
+
+require 'test/unit'
+require 'xot'
+require 'xot/tester'

data/test/{test_blockutil.rb → test_block_util.rb}

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 
-require_relative 'helpers'
+require_relative 'helper'
 
 
 class TestBlockUtil < Test::Unit::TestCase
 
-  include Xot::BlockUtil::ClassMethods
+  include Xot::BlockUtil
 
   class Temp
 

data/test/test_hookable.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require_relative 'helpers'
+require_relative 'helper'
 
 
 class TestHookable < Test::Unit::TestCase

data/test/{test_rake_helpers.rb → test_rake.rb}

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-require_relative 'helpers'
+require_relative 'helper'
 require 'xot/rake'
 
-include Xot::Rake
-
 
 Const      = 'const'
 Zero       = 0
@@ -18,7 +16,9 @@ TrueStr    = 'true'
 FalseStr   = 'false'
 
 
-class TestRakeHelpers < Test::Unit::TestCase
+class TestRake < Test::Unit::TestCase
+
+  include Xot::Rake
 
   def test_set ()
     assert_equal 'const', env(:Const, :dummy)
@@ -32,4 +32,4 @@ class TestRakeHelpers < Test::Unit::TestCase
     assert_equal false, env(:FalseStr, :dummy)
   end
 
-end# TestRakeHelpers
+end# TestRake

data/test/test_setter.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require_relative 'helpers'
+require_relative 'helper'
 
 
 class TestSetter < Test::Unit::TestCase

data/test/test_tester.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require_relative 'helpers'
+require_relative 'helper'
 
 
 class TestTester < Test::Unit::TestCase

data/xot.gemspec

@@ -1,19 +1,21 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-$: << File.expand_path('../lib', __FILE__)
+File.expand_path('../lib', __FILE__) do |path|
+  $:.unshift path if !$:.include?(path) && File.directory?(path)
+end
 
 require 'xot/module'
 
 
 Gem::Specification.new do |s|
-  def glob (*patterns)
+  glob = -> *patterns do
     patterns.map {|pat| Dir.glob(pat).to_a}.flatten
   end
 
   mod   = Xot
   name  = mod.name.downcase
-  rdocs = glob *%w[README]
+  rdocs = glob.call *%w[README]
 
   s.name        = name
   s.summary     = 'A Utility library for C++ developemt.'
@@ -22,13 +24,12 @@ Gem::Specification.new do |s|
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "http://github.com/xord/#{name}"
+  s.homepage = "http://github.com/xord/#{name}/wiki"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'
 
-  s.add_runtime_dependency 'bundler'
-  s.add_development_dependency 'rake'
+  s.add_runtime_dependency 'rake'
   s.add_development_dependency 'gemcutter'
 
   s.files            = `git ls-files`.split $/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +19,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -83,12 +67,11 @@ files:
 - include/xot/string.h
 - include/xot/util.h
 - lib/xot.rb
-- lib/xot/blockutil.rb
+- lib/xot/block_util.rb
 - lib/xot/hookable.rb
+- lib/xot/load_path.rb
 - lib/xot/module.rb
 - lib/xot/rake.rb
-- lib/xot/rake/helpers.rb
-- lib/xot/rake/task.rb
 - lib/xot/setter.rb
 - src/debug.cpp
 - src/defs.cpp
@@ -100,14 +83,14 @@ files:
 - task/lib.rake
 - task/submodule.rake
 - task/test.rake
-- test/helpers.rb
-- test/test_blockutil.rb
+- test/helper.rb
+- test/test_block_util.rb
 - test/test_hookable.rb
-- test/test_rake_helpers.rb
+- test/test_rake.rb
 - test/test_setter.rb
 - test/test_tester.rb
 - xot.gemspec
-homepage: http://github.com/xord/xot
+homepage: http://github.com/xord/xot/wiki
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -125,19 +108,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2411393735546273344
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Utility library for C++ developemt.
 test_files:
-- test/helpers.rb
-- test/test_blockutil.rb
+- test/helper.rb
+- test/test_block_util.rb
 - test/test_hookable.rb
-- test/test_rake_helpers.rb
+- test/test_rake.rb
 - test/test_setter.rb
 - test/test_tester.rb

data/lib/xot/blockutil.rb

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-module Xot
-
-
-  module BlockUtil
-
-    extend module ClassMethods
-
-      def instance_eval_or_block_call (recv, *args, &block)
-        if block.arity == 0
-          recv.instance_eval &block
-        else
-          block.call recv, *args
-        end
-      end
-
-      self
-
-    end# ClassMethods
-
-  end# BlockUtil
-
-
-end# Xot

data/lib/xot/rake/helpers.rb

@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'erb'
-require 'pp'
-
-
-module Xot
-
-
-  module Rake
-
-
-    def glob (*patterns)
-      paths = []
-      patterns.each do |pattern|
-        paths.concat Dir.glob(pattern)
-      end
-      paths
-    end
-
-    def erb (str)
-      ERB.new(str, nil, "%").result binding
-    end
-
-    def compile (path, out)
-      open(path) do |input|
-        open(out, "w") do |output|
-          output.write erb(input.read)
-        end
-      end
-    #rescue
-    end
-
-    def params (n, sep = "", &block)
-      raise "block not given." unless block
-      return "" if n == 0
-      (1..n).map(&block).join(sep)
-    end
-
-    def convertions (paths, convs)
-      raise "empty conversion." if convs.empty?
-      paths = paths.map do |path|
-        convpath = path
-        convs.each do |from, to|
-          convpath = convpath.sub(/#{from.gsub('.', '\.')}$/, to)
-        end
-        [path, convpath]
-      end
-      Hash[*paths.flatten]
-    end
-
-    def env (name, defval = nil)
-      case val = (ENV[name.to_s] || Object.const_get(name) rescue defval)
-      when /^\d+$/ then val.to_i
-      when 'true'  then true
-      when 'false' then false
-      else val
-      end
-    end
-
-    def header (mod)
-      puts "-- #{mod.to_s.capitalize} " + "-" * 50
-    end
-
-    def win32? ()
-      RUBY_PLATFORM =~ /mswin|ming|cygwin/
-    end
-
-    def mswin? ()
-      RUBY_PLATFORM =~ /mswin/
-    end
-
-    def ming? ()
-      RUBY_PLATFORM =~ /ming/
-    end
-
-    def cygwin? ()
-      RUBY_PLATFORM =~ /cygwin/
-    end
-
-    def cocoa? ()
-      RUBY_PLATFORM =~ /darwin/
-    end
-
-    def clang? ()
-      RbConfig::CONFIG['CXX'] =~ /clang/
-    end
-
-
-  end# Rake
-
-
-end# Xot

data/lib/xot/rake/task.rb

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-module Xot
-
-
-  module Rake
-
-
-    def empty_task (*names)
-      names.each do |name|
-        task name => '.'
-      end
-    end
-
-
-  end# Rake
-
-
-end#Xot

data/test/helpers.rb

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