rbind 0.0.8 → 0.0.9

data/lib/rbind/generator_c.rb

@@ -286,6 +286,7 @@ module Rbind
        attr_accessor :library_name
        attr_accessor :libs
        attr_accessor :pkg_config
+       attr_accessor :gems
        attr_accessor :generate_cmake
        attr_accessor :output_path
 
@@ -304,6 +305,7 @@ module Rbind
            @erb_pkg_config = ERB.new(File.open(File.join(File.dirname(__FILE__),"templates","c","rbind.pc.in")).read)
            @includes = Array.new
            @pkg_config= Array.new
+           @gems = Array.new
            @library_name = library_name
            @generate_cmake = true
            @libs = []
@@ -320,11 +322,17 @@ module Rbind
            file_conversions = File.new(File.join(path,"conversions.cc"),"w")
            file_conversions_hdr = File.new(File.join(path,"conversions.hpp"),"w")
            rbind_pkgs = Rbind.rbind_pkgs(@pkg_config)
+           gem_paths = @gems.map do |gem|
+               Rbind.gem_path(gem)
+           end
 
            types_hdr = TypesHelperHDR.new("_#{library_name.upcase}_TYPES_H_",@root)
            types_hdr.includes = rbind_pkgs.map do |p|
                "<#{p}/types.h>"
            end
+           types_hdr.includes += gem_paths.map do |gem|
+               "<#{gem}/types.h>"
+           end
            file_types_hdr.write @erb_types_hdr.result(types_hdr.binding)
 
            types = TypesHelper.new("types",@root)
@@ -334,6 +342,9 @@ module Rbind
            consts.includes = rbind_pkgs.map do |p|
                "<#{p}/constants.h>"
            end
+           consts.includes += gem_paths.map do |gem|
+               "<#{gem}/constants.h>"
+           end
            file_consts.write @erb_consts.result(consts.binding)
 
            conversions_hdr = ConversionsHelperHDR.new("#{library_name.upcase}_CONVERSIONS_H_",@root)
@@ -341,6 +352,9 @@ module Rbind
                "<#{p}/conversions.hpp>"
            end
            conversions_hdr.includes += includes
+           conversions_hdr.includes += gem_paths.map do |gem|
+               "<#{gem}/conversions.hpp>"
+           end
            file_conversions_hdr.write @erb_conversions_hdr.result(conversions_hdr.binding)
 
            conversions = ConversionsHelper.new("conversions",@root)
@@ -354,7 +368,10 @@ module Rbind
 
            if generate_cmake && !File.exist?(File.join(path,"CMakeLists.txt"))
                file_cmakelists = File.new(File.join(path,"CMakeLists.txt"),"w")
-               cmakelists = CMakeListsHelper.new(@library_name,@pkg_config,@libs)
+               libs = gem_paths.map do |path|
+                   Dir.glob(File.join(path,"lib*"))
+               end
+               cmakelists = CMakeListsHelper.new(@library_name,@pkg_config,@libs+libs)
                file_cmakelists.write @erb_cmakelists.result(cmakelists.binding)
                if !File.exist?(File.join(path,"rbind.pc.in"))
                    file_pkg_config = File.new(File.join(path,"rbind.pc.in"),"w")

data/lib/rbind/rbind.rb

@@ -8,6 +8,7 @@ module Rbind
         attr_accessor :includes
         attr_accessor :name
         attr_accessor :pkg_config
+        attr_accessor :gems
 
         def self.pkg_paths(pkg_name)
             out = IO.popen("pkg-config --cflags-only-I #{pkg_name}")
@@ -24,6 +25,14 @@ module Rbind
             end
         end
 
+        def self.gem_path(gem_name)
+            out = IO.popen("gem contents #{gem_name}")
+            out.readlines.each do |line|
+                return $1 if line =~ /(.*)extern.rbind/
+            end
+            raise "Cannot find paths for gem #{gem_name}"
+        end
+
         def self.rbind_pkg_paths(pkg_names)
             rbind_packages = rbind_pkgs(pkg_names)
             rbind_paths = rbind_packages.map do |pkg|
@@ -40,6 +49,7 @@ module Rbind
             @name = name
             @includes = []
             @pkg_config = []
+            @gems = []
             @parser = DefaultParser.new
             lib_name = "rbind_#{name.downcase}"
             @generator_c = GeneratorC.new(@parser,lib_name)
@@ -83,6 +93,13 @@ module Rbind
                 ::Rbind.log.info "parsing extern rbind pkg file #{path}"
                 parser.parse(File.open(path).read,config.ruby_module_name)
             end
+            @gems.each do |gem|
+                path = Rbind.gem_path(gem)
+                config = YAML.load(File.open(File.join(path,"config.rbind")).read)
+                path = File.join(path,"extern.rbind")
+                ::Rbind.log.info "parsing extern gem file #{path}"
+                parser.parse(File.open(path).read,config.ruby_module_name)
+            end
         end
 
         def parse_headers_dry(*headers)
@@ -135,7 +152,7 @@ module Rbind
                 config = YAML.load(File.open(File.join(pkg,"config.rbind")).read)
                 config.ruby_module_name
             end
-            @generator_ruby.required_module_names = modules
+            @generator_ruby.required_module_names = modules + gems
             @generator_ruby.generate(path)
         end
 
@@ -143,6 +160,7 @@ module Rbind
             ::Rbind.log.info "generate c wrappers"
             @generator_c.includes = includes
             @generator_c.pkg_config = pkg_config
+            @generator_c.gems = gems
             @generator_c.generate(path)
         end
 

data/lib/rbind/templates/ruby/roverloaded_method_call.rb

@@ -6,9 +6,17 @@
             end
             begin
                 <%- if !return_type || return_type.basic_type? || operator? -%>
+                    <%- if constructor? || !instance_method? -%>
                 return Rbind::<%= cname %>(*args)
+                    <%- else -%>
+                return Rbind::<%= cname %>(self,*args)
+                    <%- end -%>
                 <%- else -%>
+                    <%- if instance_method? -%>
+                result = Rbind::<%= cname %>(self,*args)
+                    <%- else -%>
                 result = Rbind::<%= cname %>(*args)
+                    <%- end -%>
                 # store owner insight the pointer to not get garbage collected
                 result.instance_variable_get(:@__obj_ptr__).instance_variable_set(:@__owner__,self) if !result.__owner__?
                 return result

data/rbind.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name              = 'rbind'
-    s.version           = '0.0.8'
+    s.version           = '0.0.9'
     s.date              = '2013-06-30'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']

metadata

@@ -1,28 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbind
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-30 00:00:00 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies: []
-
-description: ""
-email: 
+description: ''
+email:
 - Alexander.Duda@dfki.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rbind.rb
 - lib/rbind/core.rb
 - lib/rbind/core/.roperation.rb.swp
@@ -75,30 +70,27 @@ files:
 - test/test_generator_ruby.rb
 homepage: http://github.com/
 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 
-      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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Library for genereating automated ffi-bindings for c/c++ libraries
 test_files: []
-
+has_rdoc: