rucy 0.1.0 → 0.1.1

data/ChangeLog

@@ -0,0 +1,8 @@
+2011-08-28 snori <snori@xord.org>
+
+	* v0.1.1
+
+	
+2011-06-03 snori <snori@xord.org>
+
+	* delete Gemfile.

data/README

@@ -1,4 +1,4 @@
 
 = Rucy - A Ruby C++ Extension Helper Library
 
-== by @tokujiros
+== by snori@xord.org

data/Rakefile

@@ -1,5 +1,8 @@
 # -*- mode: ruby; coding: utf-8 -*-
+
+
 $: << File.expand_path(File.dirname __FILE__)
+
 require 'rbconfig'
 require 'support'
 
@@ -14,9 +17,13 @@ TASKDIR = 'task'
 
 EXTEXT = RbConfig::CONFIG['DLEXT'] || 'so'
 
+DEFS  = %w[]
+DEFS << 'WIN32' if win32?
+DEFS << 'COCOA' if cocoa?
+
 incroot = RbConfig::CONFIG['rubyhdrdir']
 INCDIRS = [
-  'include',
+  File.expand_path('include'),
   incroot,
   "#{incroot}/#{RUBY_PLATFORM}",
   '/opt/local/include',
@@ -27,14 +34,19 @@ RBS = glob '**/*.rb'
 
 RUBY    = ENV['RUBY'] || 'ruby'
 GEM     = ENV['GEM']  || 'gem'
+GIT     = ENV['GIT']  || 'git'
 MAKE    = ENV['MAKE'] || 'make'
 CC      = RbConfig::CONFIG['CC'] || ENV['CC'] || 'g++'
-CFLAGS  = '-Wall -O'
+CFLAGS  = '-Wall -O' + DEFS.map{|s| " -D#{s}"}.join
 AR      = ENV['AR'] || 'ar'
 ARFLAGS = 'crs'
 
 
-task :default => :ext
+task :default => :build
+
+task :build => :ext
+
+task :rebuild => [:clean, :build]
 
 task :lib => 'lib:build'
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ext/rucy/extconf.rb

@@ -1,50 +1,51 @@
 # -*- coding: utf-8 -*-
+
+
 %w[../../lib].each do |path|
   $: << File.expand_path(File.join File.dirname(__FILE__), *path.split('/'))
 end
+
 require 'rubygems'
 require 'mkmf'
-require 'rucy'
+require 'rucy/module'
 
 
-DEBUG = ENV["DEBUG"] || false
+DEBUG = ENV['DEBUG'] || false
 
 DEFS    = []
 INCDIRS = %w[/opt/local/include /opt/include]
 LIBDIRS = []
 
 HEADERS = %w[
-	boost/noncopyable.hpp
-	ruby.h
-	rucy.h
+  boost/noncopyable.hpp
+  ruby.h
+  rucy.h
 ]
 LIBS = %w[stdc++ rucy]
 
 
-DEFS << "_DEBUG" if DEBUG
+DEFS << '_DEBUG' if DEBUG
 
 case RUBY_PLATFORM
-when /cygwin/
-  DEFS << "WIN32" << "WINDOWS" << "CYGWIN"
-when /mswin/
-  DEFS << "WIN32" << "WINDOWS"
+when /mswin|ming|cygwin/
+  DEFS << 'WINDOWS' << 'WIN32' << $~[0].upcase
 when /darwin/
-  DEFS << "COCOA"
+  DEFS << 'COCOA'
 end
 
-$CPPFLAGS << DEFS.map    {|s| " -D#{s}"}.join
-$CPPFLAGS << INCDIRS.map {|s| " -I#{s}"}.join
-$LDFLAGS  << LIBDIRS.map {|s| " -L#{s}"}.join
-$LOCAL_LIBS << " -lrucy"
+$CPPFLAGS   << DEFS.map    {|s| " -D#{s}"}.join
+$CPPFLAGS   << INCDIRS.map {|s| " -I#{s}"}.join
+$LDFLAGS    << LIBDIRS.map {|s| " -L#{s}"}.join
+$LOCAL_LIBS << ' -lrucy'
 
-dir_config "boost"
-dir_config "rucy", Rucy.root_dir
+dir_config 'boost'
+dir_config 'rucy', Rucy.root_dir
 
 
-Config::CONFIG.each {|key, val| val.gsub!(/gcc/, "g++")}
+Config::CONFIG.each {|key, val| val.gsub!(/gcc/, 'g++')}
 
 exit 1 unless HEADERS.all? {|s| have_header(s)}
 exit 1 unless LIBS.all?    {|s| have_library(s)}
 
 
-create_makefile "rucy/tester"
+create_makefile 'rucy/tester'

data/include/rucy/exception.h

@@ -16,6 +16,12 @@ namespace Rucy
 	Class native_error_class ();
 	// class Rucy::NativeError < RuntimeError
 
+	Class system_error_class ();
+	// class Rucy::SystemError < Rucy::NativeError
+
+	Class invalid_object_error_class ();
+	// class Rucy::InvalidObjectError < Rucy::NativeError
+
 
 	void error (const char* format, ...);
 
@@ -26,13 +32,19 @@ namespace Rucy
 
 	void argument_error (const char* format = NULL, ...);
 
-	void argument_error (
+	void arg_count_error (
 		const char* method, int nargs, int nargs_expected,
-		int n1 = -1, int n2 = -1, int n3 = -1, int n4 = -1, int n5 = -1);
+		int n1 = -1, int n2 = -1, int n3 = -1, int n4 = -1, int n5 = -1,
+		int n6 = -1, int n7 = -1, int n8 = -1, int n9 = -1, int n10 = -1);
 
 	void not_implemented_error (const char* format = NULL, ...);
 
 
+	void system_error (const char* format = NULL, ...);
+
+	void invalid_object_error (const char* format = NULL, ...);
+
+
 	class RubyException : public std::runtime_error
 	{
 

data/lib/rucy/module.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+
+module Rucy
+
+
+  extend module ClassMethods
+
+    def root_dir ()
+      File.expand_path(File.join File.dirname(__FILE__), '..', '..')
+    end
+
+	  def include_dirs ()
+      [File.join(root_dir, 'include')]
+    end
+
+    def library_dirs ()
+      [File.join(root_dir, 'lib')]
+    end
+
+    def version ()
+      open(File.join root_dir, 'VERSION') {|f| f.readline.chomp}
+    end
+
+    self
+
+  end# ClassMethods
+
+
+end# Rucy

data/lib/rucy.rb

@@ -1,24 +1,4 @@
 # -*- coding: utf-8 -*-
 
 
-module Rucy
-
-
-  def self.root_dir ()
-    File.expand_path(File.join File.dirname(__FILE__), '..')
-  end
-
-  def self.include_dirs ()
-    [File.join(root_dir, 'include')]
-  end
-
-  def self.library_dirs ()
-    [File.join(root_dir, 'lib')]
-  end
-
-  def self.version ()
-    open(File.join root_dir, 'VERSION') {|f| f.readline.chomp}
-  end
-
-
-end# Rucy
+require 'rucy/module'

data/rucy.gemspec

@@ -1,14 +1,16 @@
 # -*- mode: ruby; coding: utf-8 -*-
+
+
 $: << File.join(File.dirname(__FILE__), 'lib')
+
 require 'rake'
 require 'rucy'
 
 
 FILES = FileList[*%w[
   README
+  ChangeLog
   Rakefile
-  Gemfile
-  Gemfile.lock
   support.rb
   rucy.gemspec
   VERSION
@@ -29,15 +31,15 @@ Gem::Specification.new do |s|
   s.description = 'This library helps you to develop Ruby Extension by C++.'
   s.version     = Rucy.version
 
-  s.authors  = %w[@tokujiros]
-  s.email    = 'tokujiros@gmail.com'
-  s.homepage = 'http://xord.tumblr.com/'
+  s.authors  = %w[snori]
+  s.email    = 'snori@xord.org'
+  s.homepage = 'http://blog.xord.org/'
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'
   s.require_paths         << 'ext'
 
-  s.add_dependency 'rake'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'gemcutter'
 
   s.files      = FILES.to_a

data/src/exception.cpp

@@ -6,6 +6,10 @@
 #include <rucy/rucy.h>
 #include <rucy/string.h>
 
+#ifdef WIN32
+	#include <windows.h>
+#endif
+
 
 #define VA_STRING(format, result) \
 	String result; \
@@ -34,6 +38,22 @@ namespace Rucy
 		return c;
 	}
 
+	Class
+	system_error_class ()
+	{
+		static Class c =
+			rucy_module().define_class("SystemError", native_error_class());
+		return c;
+	}
+
+	Class
+	invalid_object_error_class ()
+	{
+		static Class c =
+			rucy_module().define_class("InvalidObjectError", native_error_class());
+		return c;
+	}
+
 
 	void
 	error (const char* format, ...)
@@ -65,15 +85,16 @@ namespace Rucy
 	}
 
 	void
-	argument_error (
+	arg_count_error (
 		const char* method, int nargs, int nargs_expected,
-		int n1, int n2, int n3, int n4, int n5)
+		int n1, int n2, int n3, int n4, int n5,
+		int n6, int n7, int n8, int n9, int n10)
 	{
 		String message = stringf(
 			"wrong number of arguments for %s: %d for %d",
 			method, nargs, nargs_expected);
 
-		int n[5] = {n1, n2, n3, n4, n5};
+		int n[10] = {n1, n2, n3, n4, n5, n6, n7, n8, n9, n10};
 		for (int i = 0; i < 5 && n[i] >= 0; ++i)
 			message += stringf(" or %d", n[i]);
 
@@ -89,6 +110,42 @@ namespace Rucy
 	}
 
 
+	void
+	system_error (const char* format, ...)
+	{
+		VA_STRING(format, message);
+
+		#ifdef WIN32
+		DWORD lasterror = GetLastError();
+		if (lasterror != 0)
+		{
+			LPVOID msg = NULL;
+			DWORD flags =
+				FORMAT_MESSAGE_ALLOCATE_BUFFER |
+				FORMAT_MESSAGE_FROM_SYSTEM |
+				FORMAT_MESSAGE_IGNORE_INSERTS;
+			if (FormatMessageA(
+				flags, NULL, lasterror, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+				(LPSTR) &msg, 0, NULL))
+			{
+				String s = (LPCSTR) msg;
+				if (!s.empty()) message = s + ": " + message;
+			}
+			LocalFree(msg);
+		}
+		#endif
+
+		raise(system_error_class(), message.c_str());
+	}
+
+	void
+	invalid_object_error (const char* format, ...)
+	{
+		VA_STRING(format, message);
+		raise(invalid_object_error_class(), message.c_str());
+	}
+
+
 	RubyException::RubyException (Value exception)
 	:	Super(""), val(exception)
 	{

data/support.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 require 'erb'
 require 'pp'
 
@@ -40,7 +42,7 @@ end
 
 def convertions (paths, convs)
   raise "empty conversion." if convs.empty?
-  paths.map! do |path|
+  paths = paths.map do |path|
     convpath = path
     convs.each do |from, to|
       convpath = convpath.sub(/#{from.gsub('.', '\.')}$/, to)
@@ -52,7 +54,15 @@ end
 
 alias sh_original sh
 
-def sh (s)
-  sh_original s
+def sh (*args)
+  sh_original *args
 #rescue
 end
+
+def win32? ()
+  RUBY_PLATFORM =~ /mswin|ming|cygwin/
+end
+
+def cocoa? ()
+  RUBY_PLATFORM =~ /darwin/
+end

data/task/ext.rake

@@ -10,27 +10,28 @@ namespace :ext do
 
   extconf  = File.join dir, "extconf.rb"
   makefile = File.join dir, "Makefile"
-  depends  = File.join dir, "depends"
+  depend   = File.join dir, "depend"
 
   cpps = Dir.glob("#{dir}/**/*.cpp")
 
-  task :build => out
+  task :build => makefile do
+    sh %( cd #{dir} && #{MAKE} )
+  end
 
   task :clean do
     sh %( cd #{dir} && #{MAKE} clean ) if File.exist? makefile
-    sh %( rm -f #{makefile} #{depends} )
-  end
-
-  file out => makefile do
-    sh %( cd #{dir} && #{MAKE} )
+    sh %( rm -f #{makefile} #{depend} )
   end
 
-  file makefile => [extconf, "lib:build"] do #, depends] do
+  file makefile => [extconf, depend] do
     sh %( cd #{dir} && #{RUBY} #{File.basename extconf} )
   end
 
-  file depends => cpps do
-    sh %( cd #{dir} && touch #{depends} )
+  file depend => ["lib:build"] + cpps do
+    incdirs = INCDIRS.map{|s| " -I#{s}"}.join
+    srcs = cpps.map{|cpp| File.basename cpp}.join ' '
+    dep = File.basename depend
+    sh %( cd #{dir} && #{CC} -M #{CFLAGS} #{incdirs} #{srcs} > #{dep} )
   end
 
 end# :ext

data/task/git.rake

@@ -0,0 +1,22 @@
+# -*- mode: ruby; coding: utf-8 -*-
+
+
+namespace :git do
+
+  task :status do
+    sh %( #{GIT} status )
+  end
+
+  task :diff do
+    sh %( #{GIT} diff | cat )
+  end
+
+  task :push do
+    sh %( #{GIT} push )
+  end
+
+  task :pull do
+    sh %( #{GIT} pull )
+  end
+
+end# :git

data/task/lib.rake

@@ -1,6 +1,9 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
+require 'rake/loaders/makefile'
+
+
 namespace :lib do
 
   name    = NAME
@@ -11,8 +14,12 @@ namespace :lib do
   headers = glob("include/**/*.h") | erbs.values.grep(/\.h$/)
   srcs    = glob("src/**/*.cpp")   | erbs.values.grep(/\.cpp$/)
 
-  objs = convertions srcs, {".cpp" => ".o"}
-  tmps = objs.values | erbs.values
+  depend = 'depend.mf'
+  objs   = convertions srcs, {".cpp" => ".o"}
+  tmps   = (objs.values | erbs.values) + [depend]
+
+  cflags  = CFLAGS.dup
+  cflags << INCDIRS.map{|s| " -I#{s}"}.join
 
   task :build => out
 
@@ -28,11 +35,19 @@ namespace :lib do
     sh %( #{AR} #{ARFLAGS} #{out} #{objs.values.join " "} )
   end
 
-  objs.each do |(src, obj)|
-    incdirs = INCDIRS.map{|s| " -I#{s}"}.join
+  file depend => 'lib:erb' do
+    sh %( #{CC} -M #{cflags} #{srcs.join ' '} > #{depend} )
+    input = open(depend) {|f| f.read}
+    open(depend, 'w') do |output|
+      output << input.gsub(/\w+\.o/, SRCDIR + '/\0')
+    end
+  end
 
-    file obj => [src] + erbs.values do
-      sh %( #{CC} -c #{CFLAGS} #{incdirs} -o #{obj} #{src} )
+  import depend if File.exist? depend
+
+  objs.each do |(src, obj)|
+    file obj => [depend, src] + erbs.values do
+      sh %( #{CC} -c #{cflags} -o #{obj} #{src} )
     end
   end
 

data/test/test_rucy.rb

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
+
+
 $: << File.expand_path(File.join File.dirname(__FILE__), "..", "ext")
+
 require 'test/unit'
 require 'rucy/tester'
 

metadata

@@ -2,15 +2,15 @@
 name: rucy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
-- "@tokujiros"
+- snori
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -21,7 +21,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gemcutter
@@ -35,7 +35,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 description: This library helps you to develop Ruby Extension by C++.
-email: tokujiros@gmail.com
+email: snori@xord.org
 executables: []
 
 extensions: 
@@ -44,14 +44,14 @@ extra_rdoc_files:
 - README
 files: 
 - README
+- ChangeLog
 - Rakefile
-- Gemfile
-- Gemfile.lock
 - support.rb
 - rucy.gemspec
 - VERSION
 - task/ext.rake
 - task/gem.rake
+- task/git.rake
 - task/lib.rake
 - ext/rucy/extconf.rb
 - ext/rucy/tester.cpp
@@ -70,6 +70,7 @@ files:
 - include/rucy/function.h.erb
 - include/rucy/module.h.erb
 - include/rucy/value.h.erb
+- lib/rucy/module.rb
 - lib/rucy.rb
 - src/class.cpp
 - src/exception.cpp
@@ -84,7 +85,7 @@ files:
 - src/module.cpp.erb
 - src/value.cpp.erb
 - test/test_rucy.rb
-homepage: http://xord.tumblr.com/
+homepage: http://blog.xord.org/
 licenses: []
 
 post_install_message: 

data/Gemfile

@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-gem "rake"
-gem "gemcutter"

data/Gemfile.lock

@@ -1,12 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    gemcutter (0.7.0)
-    rake (0.8.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  gemcutter
-  rake