rake-compiler 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86422ea8e6f06022d2fd7e29b4733f90797246e
-  data.tar.gz: e82204ee926ce75345943ab08dd5cfe4908ba72e
+  metadata.gz: 27afa23965c11369d4a99dfb0bff5050e481a184
+  data.tar.gz: 2a7b657c3e7d72e18521f1104a2bf13eca469062
 SHA512:
-  metadata.gz: 902c6c4a62d86b44174ec90c36cfa644b715ad7e65575c629a2cd056634c3eea0714f65e83987ef50c62ebcb066169ff2e0428a23e849648030b9ebfe542f056
-  data.tar.gz: 00f6496d251ba859103f2aded902662bd77ec98fa043ef5591fece0f4cbe56a4a6503a568ff753e0af4fe9e80c4d78b729333dbdb46e08d6158edcc74dafe4a7
+  metadata.gz: 63d63315f3b86beca6b95293f84aaab057d4bb35658e0b62db7269eeb46fffdfc1d999003a3346f9ff495fc28abd91cd465adc573fcbb0b807c5ba7478ce519d
+  data.tar.gz: b19295ad94ad980d2b2046558c376657e4b5f7bdeb811c0eb5638aba76148519d3aa5decf80394e64076edfa3ae93f00c20052e000f8008f8629aaaf4ced3a0f

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.9.5 / 2015-01-03
+
+* Enhancements
+  * Support adding bundled files in cross_compiling block.
+    Closes #100 [Patch by Aaron Stone]
+
 === 0.9.4 / 2014-12-28
 
 * Notes:

data/README.rdoc

@@ -390,7 +390,7 @@ So, what if I show you some examples?
 Check our wiki with links to the proper rake files used by many developers and
 projects and how they use rake-compiler.
 
-http://github.com/luislavena/rake-compiler/wiki/projects-using-rake-compiler
+http://github.com/rake-compiler/rake-compiler/wiki/projects-using-rake-compiler
 
 == Future
 
@@ -399,11 +399,10 @@ during the development of it! (and contributions too!)
 
 You can find more information about rake-compiler:
 
-* GitHub:    https://github.com/luislavena/rake-compiler
-* Issues:    https://github.com/luislavena/rake-compiler/issues
-* Blog:      http://blog.mmediasys.com
+* GitHub:    https://github.com/rake-compiler/rake-compiler
+* Issues:    https://github.com/rake-compiler/rake-compiler/issues
 * Docs:      http://rubydoc.info/gems/rake-compiler
-* Wiki:      https://github.com/luislavena/rake-compiler/wiki
+* Wiki:      https://github.com/rake-compiler/rake-compiler/wiki
 
 == Disclaimer
 

data/lib/rake/extensiontask.rb

@@ -87,6 +87,26 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
     end
 
     private
+    # copy other gem files to staging directory
+    def define_staging_file_tasks(files, lib_path, stage_path, platf, ruby_ver)
+      files.each do |gem_file|
+        # ignore directories and the binary extension
+        next if File.directory?(gem_file) || gem_file == "#{lib_path}/#{binary(platf)}"
+        stage_file = "#{stage_path}/#{gem_file}"
+
+        # copy each file from base to stage directory
+        unless Rake::Task.task_defined?(stage_file) then
+          directory File.dirname(stage_file)
+          file stage_file => [File.dirname(stage_file), gem_file] do
+            cp gem_file, stage_file
+          end
+        end
+
+        # append each file to the copy task
+        task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_file]
+      end
+    end
+
     def define_compile_tasks(for_platform = nil, ruby_ver = RUBY_VERSION)
       # platform usage
       platf = for_platform || platform
@@ -120,24 +140,7 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       end
 
       # copy other gem files to staging directory
-      if @gem_spec
-        @gem_spec.files.each do |gem_file|
-          # ignore directories and the binary extension
-          next if File.directory?(gem_file) || gem_file == "#{lib_path}/#{binary(platf)}"
-          stage_file = "#{stage_path}/#{gem_file}"
-
-          # copy each file from base to stage directory
-          unless Rake::Task.task_defined?(stage_file) then
-            directory File.dirname(stage_file)
-            file stage_file => [File.dirname(stage_file), gem_file] do
-              cp gem_file, stage_file
-            end
-          end
-
-          # append each file to the copy task
-          task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_file]
-        end
-      end
+      define_staging_file_tasks(@gem_spec.files, lib_path, stage_path, platf, ruby_ver) if @gem_spec
 
       # binary in temporary folder depends on makefile and source files
       # tmp/extension_name/extension_name.{so,bundle}
@@ -253,9 +256,7 @@ Java extension should be preferred.
           spec.files += ext_files
 
           # expose gem specification for customization
-          if callback
-            callback.call(spec)
-          end
+          callback.call(spec) if callback
 
           # Generate a package for this gem
           pkg = Gem::PackageTask.new(spec) do |pkg|
@@ -266,6 +267,9 @@ Java extension should be preferred.
             pkg.package_files.clear
           end
 
+          # copy other gem files to staging directory if added by the callback
+          define_staging_file_tasks(spec.files, lib_path, stage_path, platf, ruby_ver)
+
           # Copy from staging directory to gem package directory.
           # This is derived from the code of Gem::PackageTask
           # but uses stage_path as source directory.

data/spec/lib/rake/extensiontask_spec.rb

@@ -338,6 +338,36 @@ describe Rake::ExtensionTask do
         }.should_not raise_error
       end
 
+      it 'should generate additional rake tasks if files are added when cross compiling' do
+        config = mock(Hash)
+        config.stub!(:[]).and_return('/rubies/1.9.1/rbconfig.rb')
+        YAML.stub!(:load_file).and_return(config)
+
+        # Use a real spec instead of a mock because define_native_tasks dups and
+        # calls methods on Gem::Specification, which is more than mock can do.
+        spec = Gem::Specification.new do |s|
+          s.name = 'my_gem'
+          s.platform = Gem::Platform::RUBY
+        end
+
+        # Gem::PackageTask calls Rake::PackageTask which sets Gem.configuration.verbose,
+        # which initializes Gem::ConfigFile,
+        # which gets mad if it cannot find `sysconfdir`/gemrc
+        Gem.stub_chain(:configuration, :verbose=).and_return(true)
+
+        ENV['RUBY_CC_VERSION'] = '1.9.1'
+        Rake::ExtensionTask.new('extension_one', spec) do |ext|
+          ext.cross_compile = true
+          ext.cross_platform = 'universal-unknown'
+          ext.cross_compiling do |gem_spec|
+            gem_spec.files << 'somedir/somefile'
+          end
+        end
+        Rake::Task['native:my_gem:universal-unknown'].execute
+        Rake::Task.should have_defined("tmp/universal-unknown/stage/somedir")
+        Rake::Task.should have_defined("tmp/universal-unknown/stage/somedir/somefile")
+      end
+
       it 'should allow usage of RUBY_CC_VERSION to indicate a different version of ruby' do
         config = mock(Hash)
         config.should_receive(:[]).with("rbconfig-i386-mingw32-1.9.1").and_return('/rubies/1.9.1/rbconfig.rb')

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.4"
+  s.version     = "0.9.5"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

data/tasks/rspec.rake

@@ -4,6 +4,6 @@ rescue LoadError => e
   warn "RSpec gem is required, please install it (gem install rspec)."
 end
 
-# if defined?(RSpec::Core::RakeTask)
-#   RSpec::Core::RakeTask.new(:spec)
-# end
+if defined?(RSpec::Core::RakeTask)
+  RSpec::Core::RakeTask.new(:spec)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake