rake-compiler 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03252eb82e9f149d8b0595c6d4d706b57b12162b
-  data.tar.gz: d044f1b61816c1e7a46bc0591969b553cff2bfee
+  metadata.gz: 4f72eedd0e2aa8b6e09dff6eaf2a4b5d64b3b47d
+  data.tar.gz: ccdcaf324ce4011c959c278cd04a3552d4ca2156
 SHA512:
-  metadata.gz: ffd3beb651811d3f616652dbd952f85f029d30ced44e5dfa4f7a8de06844617602a19558600cc07f956d0e0694b6855ac8976c02763d58ee3e222e54997c0e84
-  data.tar.gz: a443ea8df5261473b0058e69d3047771ff8b8c4f53349cfb77292684be046c829e9dfc5f65a340dbbdff3d8c328247c2c37da04a5963991446710459f4625678
+  metadata.gz: c2c14d6ef462ae69a1b80b7239da013fe9d3c7e80af0582df6bb09f1f1d0327acda0edbccab15881a158cc17a8b3c3baf8ca9988f56e5c370f85279ecda482de
+  data.tar.gz: 7a72083b3c95e41af61f5552ce39fbca484db1383e171b45d87577a72084be67999911b550747a59d04f5211ba9f3bdac4c06deb357a7800dfcc6ebb66ddc6ef

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.3 / 2016-12-02
+
+* Enhancements:
+  * Support specifying required Ruby versions.
+    #137 [Patch by Lars Kanis]
+
 === 1.0.2 / 2016-11-13
 
 * Bugfixes:

data/lib/rake/extensiontask.rb

@@ -25,6 +25,7 @@ module Rake
       @cross_compiling = nil
       @no_native = false
       @config_includes = []
+      @ruby_versions_per_platform = Hash.new([])
     end
 
     def cross_platform
@@ -253,6 +254,13 @@ Java extension should be preferred.
           # adjust to specified platform
           spec.platform = Gem::Platform.new(platf)
 
+          # set ruby version constraints
+          cross_rubies = @ruby_versions_per_platform[platf]
+          spec.required_ruby_version = [
+            ">= #{version_ary2str( cross_rubies.min[0,2] )}",
+            "< #{version_ary2str( cross_rubies.max[0,2].succ )}"
+          ]
+
           # clear the extensions defined in the specs
           spec.extensions.clear
 
@@ -346,6 +354,9 @@ Java extension should be preferred.
           @lib_dir = "#{@lib_dir}/#{$1}"
         end
 
+        # Update cross compiled platform/version combinations
+        @ruby_versions_per_platform[for_platform] << version_str2ary(version)
+
         define_cross_platform_tasks_with_version(for_platform, version)
 
         # restore lib_dir
@@ -497,6 +508,14 @@ Java extension should be preferred.
       [*@cross_platform].map { |p| "native:#{p}" }
     end
 
+    def version_str2ary(version_string)
+      version_string[/\A[^-]+/].split(".").map(&:to_i).pack("C*")
+    end
+
+    def version_ary2str(version_ary)
+      version_ary.unpack("C*").join(".")
+    end
+
     def fake_rb(platform, version)
       <<-FAKE_RB
         # Pre-load resolver library before faking, in order to avoid error

data/spec/lib/rake/extensiontask_spec.rb

@@ -454,6 +454,46 @@ describe Rake::ExtensionTask do
         end
       end
 
+      it "should set required_ruby_version from RUBY_CC_VERSION" do
+        platforms = ["x86-mingw32", "x64-mingw32"]
+        ruby_cc_versions = ["2.1.10", "2.2.6", "2.3.3"]
+        ENV["RUBY_CC_VERSION"] = ruby_cc_versions.join(":")
+        config = mock(Hash)
+        ruby_cc_versions.each do |ruby_cc_version|
+          platforms.each do |platform|
+            config.stub!(:[]).
+              with("rbconfig-#{platform}-#{ruby_cc_version}").
+              and_return("/rubies/#{ruby_cc_version}/rbconfig.rb")
+          end
+        end
+        YAML.stub!(:load_file).and_return(config)
+
+        Gem.stub_chain(:configuration, :verbose=).and_return(true)
+
+        spec = Gem::Specification.new do |s|
+          s.name = 'my_gem'
+          s.platform = Gem::Platform::RUBY
+        end
+
+        cross_specs = []
+        Rake::ExtensionTask.new("extension_one", spec) do |ext|
+          ext.cross_platform = platforms
+          ext.cross_compile = true
+          ext.cross_compiling do |cross_spec|
+            cross_specs << cross_spec
+          end
+        end
+        platforms.each do |platform|
+          Rake::Task["native:my_gem:#{platform}"].execute
+        end
+
+        expected_required_ruby_versions = [
+          Gem::Requirement.new([">= 2.1", "< 2.4"]),
+          Gem::Requirement.new([">= 2.1", "< 2.4"]),
+        ]
+        cross_specs.collect(&:required_ruby_version).should == expected_required_ruby_versions
+      end
+
       after :each do
         ENV.delete('RUBY_CC_VERSION')
       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     = "1.0.2"
+  s.version     = "1.0.3"
   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: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: rake-compiler
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rake-based Ruby Extension (C, Java) task generator.