ffi-swig-generator 0.3.1 → 0.3.2

data/features/support/templates.rb

@@ -263,7 +263,8 @@ end
 
 def rakefile_template
 <<-EOF
-require '../lib/ffi-swig-generator'
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'ffi-swig-generator'
 
 FFI::Generator::Task.new
 EOF
@@ -283,8 +284,8 @@ end
 
 def rakefile_template
 <<-EOF
-require 'rubygems'
-require '../lib/ffi-swig-generator'
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'ffi-swig-generator'
 
 FFI::Generator::Task.new :input_fn => 'interfaces/*.i', :output_dir => 'generated/'
 
@@ -301,8 +302,8 @@ class << self
 
 def rakefile_template
 <<-EOF
-require 'rubygems'
-require '../lib/ffi-swig-generator'
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'ffi-swig-generator'
 
 FFI::Generator::Task.new do |task|
   task.input_fn = 'interfaces/*.i'
@@ -327,8 +328,9 @@ end
 
 def rakefile_template
 <<-EOF
-require 'rubygems'
-require '../lib/ffi-swig-generator'
+
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'ffi-swig-generator'
 
 FFI::Generator::Task.new do |task|
   task.input_fn = 'interfaces/*.i'

data/lib/ffi-swig-generator.rb

@@ -1,51 +1,13 @@
 require 'rubygems'
 require 'nokogiri'
-
-module FFI
-  module Generator
-    # :stopdoc:
-    VERSION = '0.3.1'
-    LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-    PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-    # :startdoc:
-
-    # Returns the version string for the library.
-    #
-    def self.version
-      VERSION
-    end
-
-    # Returns the library path for the module. If any arguments are given,
-    # they will be joined to the end of the libray path using
-    # <tt>File.join</tt>.
-    #
-    def self.libpath( *args )
-      args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-    end
-
-    # Returns the lpath for the module. If any arguments are given,
-    # they will be joined to the end of the path using
-    # <tt>File.join</tt>.
-    #
-    def self.path( *args )
-      args.empty? ? PATH : ::File.join(PATH, args.flatten)
-    end
-
-    # Utility method used to require all files ending in .rb that lie in the
-    # directory below this file that has the same name as the filename passed
-    # in. Optionally, a specific _directory_ name can be passed in such that
-    # the _filename_ does not have to be equivalent to the directory.
-    #
-    def self.require_all_libs_relative_to( fname, dir = nil )
-      dir ||= ::File.basename(fname, '.*')
-      search_me = ::File.expand_path(
-                                     ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-      Dir.glob(search_me).sort.each {|rb| require rb}
-    end
-  end
-end
-
-FFI::Generator.require_all_libs_relative_to(__FILE__, 'generator')
-
-# EOF
+require 'generator/application'
+require 'generator/types'
+require 'generator/logger'
+require 'generator/node'
+require 'generator/type'
+require 'generator/constant'
+require 'generator/enum'
+require 'generator/function'
+require 'generator/struct'
+require 'generator/parser'
+require 'generator/generatortask'

data/lib/generator/constant.rb

@@ -1,6 +1,5 @@
 module FFI
   module Generator
-    require libpath('generator/node')
     class Constant < Node
       def initialize(params = { })
         super

data/lib/generator/enum.rb

@@ -1,6 +1,5 @@
 module FFI
   module Generator
-    require libpath('generator/node')
     class Enum < Node
       def initialize(params = { })
         super

data/lib/generator/function.rb

@@ -1,6 +1,5 @@
 module FFI
   module Generator
-    require libpath('generator/type')
     class Function < Type
       class Argument < Type
         def to_s

data/lib/generator/struct.rb

@@ -1,7 +1,6 @@
 module FFI
   module Generator
-    require libpath('generator/node')
-    class Struct< Type
+    class Struct < Type
       def self.string_accessors(field_name, indent = 0)
         result = <<-code
 def #{field_name}=(str)

data/lib/generator/type.rb

@@ -1,6 +1,5 @@
 module FFI
   module Generator
-    require libpath('generator/node')
     class Type < Node
       attr_reader :full_decl
       

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'spec'
 
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib ffi-swig-generator]))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../lib/')))
+
+require 'ffi-swig-generator'
 
 Spec::Runner.configure do |config|
   # == Mock Framework

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-swig-generator
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Andrea Fazzi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 +02:00
+date: 2009-06-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.4
+        version: 0.8.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
 description: |-
   ffi-swig-generator is a ruby-ffi wrapper code generator that produces
   ruby-ffi glue code parsing C header files through SWIG.
@@ -181,6 +171,10 @@ files:
 - bin/ffi-gen
 - cucumber.yml
 - examples/Rakefile
+- examples/generated/libc_wrap.rb
+- examples/generated/libc_wrap.xml
+- examples/generated/wiiuse_wrap.rb
+- examples/generated/wiiuse_wrap.xml
 - examples/interfaces/libc.i
 - examples/interfaces/wiiuse.i
 - features/generate.feature
@@ -254,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi-swig-gen
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: ffi-swig-generator is a ruby-ffi wrapper code generator that produces ruby-ffi glue code parsing C header files through SWIG