rake-compiler 0.9.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d579996813d84b29302613b898fd3412125229
-  data.tar.gz: b785572b1100a1b4a1f5c07f7bc0312917751879
+  metadata.gz: 018f14ea44299daeddfc4e1a296a1d0649963f62
+  data.tar.gz: ec35dd39bf310b9c4db9e277fbf0eb972bd9a9a3
 SHA512:
-  metadata.gz: 2d56ae8f38d037dcaca636c427a9a2f7dc399917b9b0780667dd832a9f6c81877a5bfb7bdc1921492df926bedf91af66d65b91c9773674e0bbc605c31a365e4f
-  data.tar.gz: 84ca89985be0eb6082bf28ecce3e47254e6abd48100e357e07b7749c318a2770c22397aa272430123817c1bafa7f21051d040643963839a3821401f4cd62a18b
+  metadata.gz: 8710ea08c274844b9fefa282730cb3630f434efc155029df4827b6823388c3206831deeaa0ca75780ca21e7d69b0026dbf214bb14fd3c91a5d73d05be3b380ce
+  data.tar.gz: dcbace5ef6ca38907e41205af0461b868f263adccb0b374f2785e029c800f9dfb3467d91d81a9414cd6ebecda66f338a462d639de8be036eca011b767cadcb6e

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.0 / 2016-06-21
+
+* Enhancements:
+  * Really support extension in sub directory.
+
 === 0.9.9 / 2016-05-10
 
 * Bugfixes:

data/lib/rake/baseextensiontask.rb

@@ -68,7 +68,7 @@ module Rake
         else
           RbConfig::CONFIG['DLEXT']
       end
-      "#{File.basename(@name)}.#{ext}"
+      "#{@name}.#{ext}"
     end
 
     def source_files

data/lib/rake/extensiontask.rb

@@ -110,16 +110,23 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       # platform usage
       platf = for_platform || platform
 
+      binary_path = binary(platf)
+
       # lib_path
       lib_path = lib_dir
-      if @name.include?('/')
-        lib_path += "/#{File.dirname(@name)}"
-      end
+
+      lib_binary_path = "#{lib_path}/#{binary_path}"
+      lib_binary_dir_path = File.dirname(lib_binary_path)
 
       # tmp_path
       tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
       stage_path = "#{@tmp_dir}/#{platf}/stage"
 
+      tmp_binary_path = "#{tmp_path}/#{binary_path}"
+      tmp_binary_dir_path = File.dirname(tmp_binary_path)
+      stage_binary_path = "#{stage_path}/#{lib_path}/#{binary_path}"
+      stage_binary_dir_path = File.dirname(stage_binary_path)
+
       # cleanup and clobbering
       CLEAN.include(tmp_path)
       CLEAN.include(stage_path)
@@ -128,17 +135,17 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
 
       # directories we need
       directory tmp_path
-      directory "#{stage_path}/#{lib_path}"
-      directory lib_dir
+      directory lib_binary_dir_path
+      directory stage_binary_dir_path
 
       # copy binary from temporary location to final lib
       # tmp/extension_name/extension_name.{so,bundle} => lib/
-      task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do
-        install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
+      task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_binary_dir_path, "#{tmp_path}/#{binary_path}"] do
+        install "#{tmp_path}/#{binary_path}", "#{lib_path}/#{binary_path}"
       end
       # copy binary from temporary location to staging directory
-      task "copy:#{@name}:#{platf}:#{ruby_ver}" => ["#{stage_path}/#{lib_path}", "#{tmp_path}/#{binary(platf)}"] do
-        cp "#{tmp_path}/#{binary(platf)}", "#{stage_path}/#{lib_path}/#{binary(platf)}"
+      task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_binary_dir_path, "#{tmp_path}/#{binary_path}"] do
+        cp "#{tmp_path}/#{binary_path}", stage_binary_path
       end
 
       # copy other gem files to staging directory
@@ -146,7 +153,7 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
 
       # binary in temporary folder depends on makefile and source files
       # tmp/extension_name/extension_name.{so,bundle}
-      file "#{tmp_path}/#{binary(platf)}" => ["#{tmp_path}/Makefile"] + source_files do
+      file "#{tmp_path}/#{binary_path}" => [tmp_binary_dir_path, "#{tmp_path}/Makefile"] + source_files do
         jruby_compile_msg = <<-EOF
 Compiling a native C extension on JRuby. This is discouraged and a
 Java extension should be preferred.
@@ -155,6 +162,9 @@ Java extension should be preferred.
 
         chdir tmp_path do
           sh make
+          if binary_path != File.basename(binary_path)
+            cp File.basename(binary_path), binary_path
+          end
         end
       end
 
@@ -214,7 +224,7 @@ Java extension should be preferred.
       # platform matches the indicated one.
       if platf == RUBY_PLATFORM then
         # ensure file is always copied
-        file "#{lib_path}/#{binary(platf)}" => ["copy:#{name}:#{platf}:#{ruby_ver}"]
+        file "#{lib_path}/#{binary_path}" => ["copy:#{name}:#{platf}:#{ruby_ver}"]
 
         task "compile:#{@name}" => ["compile:#{@name}:#{platf}"]
         task "compile" => ["compile:#{platf}"]
@@ -297,7 +307,7 @@ Java extension should be preferred.
       end
 
       # add binaries to the dependency chain
-      task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_dir}/#{binary(platf)}"]
+      task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_path}/#{binary(platf)}"]
 
       # ensure the extension get copied
       unless Rake::Task.task_defined?("#{lib_path}/#{binary(platf)}") then

data/spec/lib/rake/extensiontask_spec.rb

@@ -314,21 +314,21 @@ describe Rake::ExtensionTask do
         end
       end
 
-      context 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/extension_one.{so,bundle}' do
+      context 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/prefix1/prefix2/extension_one.{so,bundle}' do
         it 'should define as task' do
-          Rake::Task.task_defined?("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}").should be_true
+          Rake::Task.task_defined?("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}").should be_true
         end
 
         it "should depend on 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/Makefile'" do
-          Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/Makefile")
+          Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/Makefile")
         end
 
         it "should depend on 'ext/extension_one/source.c'" do
-          Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("ext/prefix1/prefix2/extension_one/source.c")
+          Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should include("ext/prefix1/prefix2/extension_one/source.c")
         end
 
         it "should not depend on 'ext/extension_one/source.h'" do
-          Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should_not include("ext/prefix1/prefix2/extension_one/source.h")
+          Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should_not include("ext/prefix1/prefix2/extension_one/source.h")
         end
       end
     end

data/tasks/gem.rake

@@ -3,7 +3,7 @@ require 'rubygems/package_task'
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "0.9.9"
+  s.version     = "1.0.0"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake