ffi-inline 0.0.4 → 0.0.4.1

data/lib/ffi/inline/compilers/gcc.rb

@@ -11,57 +11,59 @@
 module FFI; module Inline
 
 Compiler.define :gcc do
-	def exists?
-		`gcc -v 2>&1'`; $?.success?
-	end
+  def exists?
+    `gcc -v 2>&1'`; $?.success?
+  end
 
-	def compile (code, libraries = [])
-		@code      = code
-		@libraries = libraries
+  def compile (code, libraries = [])
+    @code      = code
+    @libraries = libraries
 
-		return output if File.exists?(output)
+    return output if File.exists?(output)
 
-		unless system(if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
-				"sh -c '#{ldshared} #{ENV['CFLAGS']} -o #{output.shellescape} #{input.shellescape} #{libs}' 2>#{log.shellescape}"
-		else
-			"#{ldshared} #{ENV['CFLAGS']} -o #{output.shellescape} #{input.shellescape} #{libs} 2>#{log.shellescape}"
-		end)
-			raise CompilationError.new(log)
-		end
+    cmd = if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
+      "sh -c '#{ldshared} #{ENV['CFLAGS']} -o #{output.shellescape} #{input.shellescape} #{libs}' 2>>#{log.shellescape}"
+    else
+      "#{ldshared} #{ENV['CFLAGS']} -o #{output.shellescape} #{input.shellescape} #{libs} 2>>#{log.shellescape}"
+    end
+    File.write(log, cmd + "\n")
+    unless system(cmd)
+      raise CompilationError.new(log)
+    end
 
-		output
-	end
+    output
+  end
 
 private
-	def digest
-		Digest::SHA1.hexdigest(@code + @libraries.to_s + @options.to_s)
-	end
+  def digest
+    Digest::SHA1.hexdigest(@code + @libraries.to_s + @options.to_s)
+  end
 
-	def input
-		File.join(Inline.directory, "#{digest}.c").tap {|path|
-			File.open(path, 'w') { |f| f.write(@code) } unless File.exists?(path)
-		}
-	end
+  def input
+    File.join(Inliner.directory, "#{digest}.c").tap {|path|
+      File.open(path, 'w') { |f| f.write(@code) } unless File.exists?(path)
+    }
+  end
 
-	def output
-		File.join(Inline.directory, "#{digest}.#{Compiler::Extension}")
-	end
+  def output
+    File.join(Inliner.directory, "#{digest}.#{Compiler::Extension}")
+  end
 
-	def log
-		File.join(Inline.directory, "#{digest}.log")
-	end
+  def log
+    File.join(Inliner.directory, "#{digest}.log")
+  end
 
-	def ldshared
-		if RbConfig::CONFIG['target_os'] =~ /darwin/
-			"gcc -dynamic -bundle -fPIC #{options} #{ENV['LDFLAGS']}"
-		else
-			"gcc -shared -fPIC #{options} #{ENV['LDFLAGS']}"
-		end
-	end
+  def ldshared
+    if RbConfig::CONFIG['target_os'] =~ /darwin/
+      "gcc -dynamic -bundle -fPIC #{options} #{ENV['LDFLAGS']}"
+    else
+      "gcc -shared -fPIC #{options} #{ENV['LDFLAGS']}"
+    end
+  end
 
-	def libs
-		@libraries.map { |lib| "-l#{lib}".shellescape }.join(' ')
-	end
+  def libs
+    @libraries.map { |lib| "-l#{lib}".shellescape }.join(' ')
+  end
 end
 
 end; end

data/lib/ffi/inline/compilers/tcc.rb

@@ -11,57 +11,60 @@
 module FFI; module Inline
 
 Compiler.define :tcc do
-	def exists?
-		`tcc -v 2>&1'`; $?.success?
-	end
+  def exists?
+    `tcc -v 2>&1'`; $?.success?
+  end
 
-	def compile (code, libraries = [])
-		@code      = code
-		@libraries = libraries
+  def compile (code, libraries = [])
+    @code      = code
+    @libraries = libraries
 
-		return output if File.exists?(output)
+    return output if File.exists?(output)
 
-		unless system(if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
-			"sh -c '#{ldshared} #{ENV['CFLAGS']} #{libs} -o #{output.shellescape} #{input.shellescape}' 2>#{log.shellescape}"
-		else
-			"#{ldshared} #{ENV['CFLAGS']} #{libs} -o #{output.shellescape} #{input.shellescape} 2>#{log.shellescape}"
-		end)
-			raise CompilationError.new(log)
-		end
+    cmd = if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
+      "sh -c '#{ldshared} #{ENV['CFLAGS']} #{libs} -o #{output.shellescape} #{input.shellescape}' 2>>#{log.shellescape}"
+    else
+      "#{ldshared} #{ENV['CFLAGS']} #{libs} -o #{output.shellescape} #{input.shellescape} 2>>#{log.shellescape}"
+    end
+    File.write(log, cmd + "\n")
+    unless system(cmd)
+      raise CompilationError.new(log)
+    end
 
-		output
-	end
+    output
+  end
 
 private
-	def digest
-		Digest::SHA1.hexdigest(@code + @libraries.to_s + @options.to_s)
-	end
+  def digest
+    Digest::SHA1.hexdigest(@code + @libraries.to_s + @options.to_s)
+  end
 
-	def input
-		File.join(Inline.directory, "#{digest}.c").tap {|path|
-			File.open(path, 'w') { |f| f.write(@code) } unless File.exists?(path)
-		}
-	end
+  def input
+    File.join(Inliner.directory, "#{digest}.c").tap {|path|
+      File.open(path, 'w') { |f| f.write(@code) } unless File.exists?(path)
+    }
+  end
 
-	def output
-		File.join(Inline.directory, "#{digest}.#{Compiler::Extension}")
-	end
+  def output
+    File.join(Inliner.directory, "#{digest}.#{Compiler::Extension}")
+  end
 
-	def log
-		File.join(Inline.directory, "#{digest}.log")
-	end
+  def log
+    File.join(Inliner.directory, "#{digest}.log")
+  end
 
-	def ldshared
-		if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
-			"tcc -rdynamic -shared -fPIC #{options} #{ENV['LDFLAGS']}"
-		else
-			"tcc -shared #{options} #{ENV['LDFLAGS']}"
-		end
-	end
+  def ldshared
+    if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
+      "tcc -rdynamic -shared -fPIC #{options} #{ENV['LDFLAGS']}"
+    else
+      "tcc -shared #{options} #{ENV['LDFLAGS']}"
+    end
+  end
+
+  def libs
+    @libraries.map { |lib| "-l#{lib}".shellescape }.join(' ')
+  end
 
-	def libs
-		@libraries.map { |lib| "-l#{lib}".shellescape }.join(' ')
-	end
 end
 
 end; end

data/lib/ffi/inline/version.rb

@@ -11,7 +11,7 @@
 module FFI
 
 module Inline
-  VERSION = '0.0.4'
+  VERSION = '0.0.4.1'
 end
 
 end

data/spec/inliner_spec.rb

@@ -115,7 +115,7 @@ describe FFI::Inliner do
     end
     module Foo
       inline do |builder|
-        builder.map 'my_struct_t *' => 'pointer'
+        builder.map 'my_struct_t *' => :pointer
 
         builder.raw %q{
           typedef struct {
@@ -258,20 +258,15 @@ EOC
       module Foo
         inline :cpp do |builder|
           builder.raw %{
-            #include <iostream>
-            #include <string>
-
-            using namespace std;
-
             class Greeter
             {
               public:
                 Greeter();
-                string say_hello();
+                const char *say_hello();
             };
 
             Greeter::Greeter () { };
-            string Greeter::say_hello ()
+            const char *Greeter::say_hello ()
             {
                 return "Hello foos!";
             };
@@ -281,7 +276,7 @@ EOC
             const char* say_hello () {
               Greeter greeter;
 
-              return greeter.say_hello().c_str();
+              return greeter.say_hello();
             }
           }, return: :string
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-inline
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Inline C/C++ in Ruby easily and cleanly.