rubber-generate 0.0.16 → 0.0.17

data/bin/rubber-generate

@@ -8,7 +8,6 @@ end
 
 require 'fileutils'
 require 'rbconfig'
-require 'ftools'
 
 dir = File.dirname(File.expand_path(file))
 $:.unshift(dir)
@@ -23,7 +22,11 @@ require 'optparse'
 require 'ostruct'
 
 Args           = OpenStruct.new
-Args.build_dir = Config::CONFIG['sitearch']
+if Object.const_defined?('RbConfig')
+  Args.build_dir = RbConfig::CONFIG['sitearch']
+else
+  Args.build_dir = Config::CONFIG['sitearch']
+end
 Args.configure = false
 Args.build     = false
 Args.install   = false

data/lib/rubber/codegen/gcrefpool.rb

@@ -24,7 +24,7 @@ class C_GCRefPool
       }
       rb_ary_delete(#{cname}, val);
       // If nothing is referenced, don't keep an empty array in the pool...
-      if (RARRAY(#{cname})->len == 0)
+      if (RARRAY_LEN(#{cname}) == 0)
         #{cname} = Qnil;
     }
     "

data/lib/rubber/mkextconf.rb

@@ -1,12 +1,16 @@
 
 module Rubber
 def generate_extconf(scanner, io)
-	io << <<-EOMK
+	io.write <<-EOMK
 require 'mkmf'
-
+use_gems = false
 begin
   require 'mkmf-gnome2'
 rescue LoadError
+  use_gems = true
+end
+
+if use_gems or Object.const_defined?('Gem')
   require 'rubygems'
   gem 'glib2'
   require 'mkmf-gnome2'
@@ -16,13 +20,31 @@ rescue LoadError
 	end
   end
 end
+EOMK
 
-have_func("rb_errinfo")
+io.write <<-EOMK
+# Look for headers in {gem_root}/ext/{package}
+if use_gems
+  %w[
 EOMK
+  io << " glib2" if scanner.options.glib
+  io << " gdk_pixbuf2 atk gtk2" if scanner.options.gtk
+  io.write <<-EOX
+    ].each do |package|
+      require package
+      $CFLAGS += " -I"+Gem.loaded_specs[package].full_gem_path+"/ext/"+package
+  end
+end
+EOX
 
-    #io.puts "require 'mkmf'"
-    #io.puts "require 'mkmf-gnome2'" if scanner.pkgs
-    #io.puts "$defs ||= []"
+io.write <<-EOY
+if RbConfig::CONFIG.has_key?('rubyhdrdir')
+$CFLAGS += " -I" + RbConfig::CONFIG['rubyhdrdir']+'/ruby'
+end
+
+$CFLAGS += " -I."
+have_func("rb_errinfo")
+EOY
 
     if scanner.inc_dirs
       io.puts "$CFLAGS += "+scanner.inc_dirs.collect { |i| " '-I#{i}'"}.join().inspect

data/lib/rubber/scanner.rb

@@ -1,9 +1,6 @@
 require 'rubber/struct'
+require 'rubber/version'
 module Rubber
-VERSION = [0,0,16]
-def VERSION.to_s
-	self.map{|i|i.to_s}.join('.')
-end
 class ScanState
   define_members(:in_code, :in_class, :in_func, :braces)
 end
@@ -140,7 +137,7 @@ def _scan(fp)
       @incs << @str[1].strip
     elsif @str.skip(/%option +([a-z]+)=(yes|no)\n/) # Option
       case @str[1]
-      when 'glib','gtk','gnu'
+      when 'glib', 'gtk', 'gnu'
       	@options[@str[1]] = (@str[2] == 'yes')
       else
         syntax_error "Unknown option #{@str[1]}"
@@ -411,7 +408,8 @@ EOADD
       unless name
         name = @str.scan(/[-\[\]<>~=+|&]{1,3}/)
       end
-       name = prename.to_s + (oname=name)
+      oname = name
+      name = prename.to_s + oname
       #p [prename, oname, name]
       @str.skip(/\s*/)
       args = scan_args().collect { |i| C_Param.new(i) }

data/lib/rubber/struct.rb

@@ -8,24 +8,24 @@ def define_member(name, value=nil)
     end
 end
 def define_members(*ids)
-    members = []
-    ids.each do |id|
-	if id.kind_of?(Hash)
+  members = []
+  ids.each do |id|
+    if id.kind_of?(Hash)
 	    STDERR.puts("WARNING: Hash passed to define_members has size > 1 in #{caller.join("\n")}\n`#{to_s}.new(...)' will not work as expected (non-predictable member order)") if id.size > 1
 	    id.each do |name,value|
-		define_member(name,value)
-                raise "Duplicate definition of member `#{name}'" if members.include?(name.to_s)
-		members.push(name.to_s)
-	    end
-	elsif id.kind_of?(Symbol)
-	    define_member(id)
-            raise "Duplicate definition of member `#{id}'" if members.include?(id.to_s)
-	    members.push(id.to_s)
-	else
-	    raise "Neither a Hash nor a Symbol - `#{id}'"
-	end
+        define_member(name,value)
+        raise "Duplicate definition of member `#{name}'" if members.include?(name.to_s)
+        members.push(name.to_s)
+      end
+    elsif id.kind_of?(Symbol)
+      define_member(id)
+      raise "Duplicate definition of member `#{id}'" if members.include?(id.to_s)
+      members.push(id.to_s)
+    else
+      raise "Neither a Hash nor a Symbol - `#{id}'"
     end
-    module_eval <<-EOS
+  end
+  code = <<-EOS
       def initialize(*ids); 
         members.each_index { |i| __send__((members[i]+'=').intern, i < ids.size ? ids[i] : __send__(members[i].intern)) }; 
           if respond_to?(:init)
@@ -42,11 +42,12 @@ def define_members(*ids)
       def members(); #{members.inspect}; end
       def kind_of?(klass); return true if klass == Struct; super(klass); end
       def to_a(); [#{members.join(', ')}]; end
-      def [](id); id=id.intern if id.kind_of?(String); case id; #{i=-1;members.collect{|name| "when :#{name},#{i+=1}; @#{name};"}} else raise 'Unknown member - '+id.to_s; end; end
-      def []=(id,value); id=id.intern if id.kind_of?(String); case id; #{i=-1;members.collect{|name| "when :#{name},#{i+=1}; @#{name}=value;"}} else raise 'Unknown member - '+id.to_s; end; end
+      def [](id); id=id.intern if id.kind_of?(String); case id; #{i=-1;members.collect{|name| "when :#{name},#{i+=1}; @#{name};"}.join("\n")} else raise 'Unknown member - '+id.to_s; end; end
+      def []=(id,value); id=id.intern if id.kind_of?(String); case id; #{i=-1;members.collect{|name| "when :#{name},#{i+=1}; @#{name}=value;"}.join("\n")} else raise 'Unknown member - '+id.to_s; end; end
       def length; #{members.size}; end
       alias_method(:size, :length)
       alias_method(:values, :to_a)
-    EOS
-  end
+  EOS
+  module_eval code
+end
 end

data/lib/rubber/version.rb

@@ -0,0 +1,6 @@
+module Rubber
+VERSION = [0,0,17]
+def VERSION.to_s
+	self.map{|i|i.to_s}.join('.')
+end
+end

metadata

@@ -1,92 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubber-generate
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 16
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Geoff Youngs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-26 00:00:00 +01:00
-default_executable: 
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies: []
-
-description: "    rubber-c-binder allows a rubyish means of generating bindings for C libraries,\n    including (but not limited to) GObject based libraries.\n\n    It allows C code to be written in the context of a ruby style class/method layout\n    and eases type checking and conversion between Ruby & C datatypes.\n"
+description: ! "    rubber-c-binder allows a rubyish means of generating bindings
+  for C libraries,\n    including (but not limited to) GObject based libraries.\n\n
+  \   It allows C code to be written in the context of a ruby style class/method layout\n
+  \   and eases type checking and conversion between Ruby & C datatypes.\n"
 email: g@intersect-uk.co.uk
-executables: 
+executables:
 - rubber-generate
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - bin/rubber-generate
-- lib/rubber/autord.rb
-- lib/rubber/codegen.rb
-- lib/rubber/scanner.rb
-- lib/rubber/struct.rb
-- lib/rubber/mkextconf.rb
-- lib/rubber/codegen/function.rb
-- lib/rubber/codegen/array.rb
+- lib/rubber/codegen/param.rb
 - lib/rubber/codegen/ginterface.rb
-- lib/rubber/codegen/class.rb
-- lib/rubber/codegen/gboxed.rb
-- lib/rubber/codegen/float.rb
-- lib/rubber/codegen/module.rb
-- lib/rubber/codegen/enum.rb
-- lib/rubber/codegen/integer.rb
 - lib/rubber/codegen/genum.rb
-- lib/rubber/codegen/struct.rb
-- lib/rubber/codegen/param.rb
-- lib/rubber/codegen/flags.rb
 - lib/rubber/codegen/gflags.rb
-- lib/rubber/codegen/gobject.rb
+- lib/rubber/codegen/flags.rb
 - lib/rubber/codegen/string.rb
+- lib/rubber/codegen/struct.rb
+- lib/rubber/codegen/module.rb
 - lib/rubber/codegen/gcrefpool.rb
+- lib/rubber/codegen/function.rb
+- lib/rubber/codegen/gboxed.rb
+- lib/rubber/codegen/integer.rb
+- lib/rubber/codegen/gobject.rb
+- lib/rubber/codegen/class.rb
+- lib/rubber/codegen/enum.rb
+- lib/rubber/codegen/array.rb
+- lib/rubber/codegen/float.rb
+- lib/rubber/autord.rb
+- lib/rubber/struct.rb
+- lib/rubber/version.rb
+- lib/rubber/mkextconf.rb
+- lib/rubber/codegen.rb
 - lib/rubber/types.rb
+- lib/rubber/scanner.rb
 - README.textile
 - example/vte.cr
-has_rdoc: true
 homepage: http://github.com/geoffyoungs/rubber-generate
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Template language for generating Ruby bindings for C libraries
-test_files: 
+test_files:
 - example/vte.cr
+has_rdoc: