ffi-compiler 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cdb05a319935e697b444c6c5a10174a09d394d2
-  data.tar.gz: c8f173b996c9db0735db8193508029d079b6d649
+  metadata.gz: 87b97ccecbaf39ef45a53f9337e6ecade626e876
+  data.tar.gz: a24d4e75bc369faf590da123fe91b281f85cda09
 SHA512:
-  metadata.gz: 963dd03a9a2e64f770fe7716233e361e8ce492284314a5757adce2de48bee0aed10107de7e29a13121188119bde6e88dd7d2c52d2ae6b9ed55c5657da4ab85af
-  data.tar.gz: 5e0940d5b492b909a19a927791df4b53b890384d3741cef6ea61253f2a5d17c4cee30931e1056e51dab305cde4c53d1a561710a704aa82a1b49f8627f6d33fe8
+  metadata.gz: f8359cadf2f988f7099fd167a657af27ce8b1ebfb57bf459a84ef48ce6dda08c66b38ccd138e8e04fff954daeedd7bf8fe8cbe96958f41c114e8615ce7e11331
+  data.tar.gz: de1f3dbd908f0144c19ba89d290e6a6d39e35c35686eba25784c045536b0b5ecc71ecd865411c5b4564b74f0c956bb4660d663b3672092a9e9fb786bc8929a54

data/Rakefile

@@ -1,12 +1,6 @@
 require 'rubygems'
-require 'rubygems/package_task'
+require 'rubygems/tasks'
 
-def gem_spec
-  @gem_spec ||= Gem::Specification.load('ffi-compiler.gemspec')
-end
-
-Gem::PackageTask.new(gem_spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-  pkg.package_dir = 'pkg'
+Gem::Tasks.new do |t|
+  t.scm.tag.format = '%s'
 end

data/ffi-compiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler'
-  s.version = '0.1.2'
+  s.version = '0.1.3'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'
@@ -13,4 +13,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'rake'
   s.add_dependency 'ffi', '>= 1.0.0'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubygems-tasks'
 end

data/lib/ffi-compiler/compile_task.rb

@@ -123,6 +123,9 @@ module FFI
           CLEAN.include(obj_file)
         end
 
+        # create all the directories for the output files
+        obj_files.map { |f| File.dirname(f) }.sort.uniq.map { |d| directory d }
+
         desc "Build dynamic library"
         file lib_name => obj_files do |t|
           sh "#{ld} #{so_flags} -o #{t.name} #{t.prerequisites.join(' ')} #{ld_flags} #{libs}"

data/lib/ffi-compiler/ffi-compiler.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p392" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.4.0, RVM: ruby-1.9.3-p392) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, RVM: ruby-1.9.3-p392) [gem]" level="application" />
+  </component>
+</module>
+

data/lib/ffi-compiler/loader.rb

@@ -8,7 +8,7 @@ module FFI
       def self.find(name, start_path = nil)
         library = Platform.system.map_library_name(name)
         root = false
-        Pathname.new(start_path || File.dirname(caller[0].split(/:/)[0])).ascend do |path|
+        Pathname.new(start_path || caller_path(caller[0])).ascend do |path|
           Dir.glob("#{path}/**/{#{FFI::Platform::ARCH}-#{FFI::Platform::OS}/#{library},#{library}}") do |f|
             return f
           end
@@ -20,6 +20,17 @@ module FFI
         end
         raise LoadError.new("cannot find '#{name}' library")
       end
+
+      def self.caller_path(line = caller[0])
+        if FFI::Platform::OS == 'windows'
+          drive = line[0..1]
+          path =  line[2..-1].split(/:/)[0]
+          full_path = drive + path
+        else
+          full_path = line.split(/:/)[0]
+        end
+        File.dirname full_path
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
@@ -67,6 +81,7 @@ files:
 - lib/ffi-compiler/exporter.rb
 - lib/ffi-compiler/fake_ffi/ffi-compiler/loader.rb
 - lib/ffi-compiler/fake_ffi/ffi.rb
+- lib/ffi-compiler/ffi-compiler.iml
 - lib/ffi-compiler/loader.rb
 - lib/ffi-compiler/platform.rb
 - lib/ffi-compiler/task.rb