gem-compiler 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c60ecb875d3d25f5eb22fba8df9f6081c1108aa
-  data.tar.gz: 1780e893b6aef4ceddcd14476781be1677205aa6
+SHA256:
+  metadata.gz: 2f88322755fee2322a31c6516b5f52dc9470bc132e2fde88628f6a0f449987ac
+  data.tar.gz: 53a1dc54a53791f6a106d012e6306228f548a906549dd601c7c273c252048013
 SHA512:
-  metadata.gz: 1a399552d43a414e5377063984e6f5461b5b82acd402f84f5fafb599665ac94133509b18d242be14378d6b2ac415d8e0a05ed956de48c027844d0f2ce83fb116
-  data.tar.gz: 04d4bc9a255fe2b85c30af5772aac1f6524d2b90d1a1917c2e4e10144a038cfb55625829c3e2d37a8565be87ef07df35cc668af781b4a19ef037008e71a0347a
+  metadata.gz: dc22e52f9e0328c93b90a0ed5e8dce3d63aece8377af375aba94e3c0d2d6e30dbd3bf37a91d6043fb859cb561e3e94622998b237509040f32b45e12cc694c381
+  data.tar.gz: 149623d4a832894032c1a249fabe912a8a6af1028faf9ad62a5735ebdb7aebe2b7e283f416c63f78ed69c4d3d03df89fe1b965ab1f71e96a30445cb66a91985c

data/CHANGELOG.md

@@ -10,6 +10,22 @@ upgrading.
 
 ## [Unreleased]
 
+## [0.8.0] - 2017-12-28
+
+### Added
+- Introduce `--include-shared-dir` to specify additional directory where to
+  lookup platform-specific shared libraries to bundle in the package. (#34)
+
+### Fixed
+- Solve RubyGems 2.6.x changes on exception hierarchy. Thanks to @MSP-Greg (#30)
+
+### Removed
+- Drop support for Ruby 2.1.x and 2.2.x, as they reached EOL (End Of Life)
+- Drop support for RubyGems older than 2.5.0
+
+### Changed
+- CI: Avoid possible issues when installing Bundler on AppVeyor
+
 ## [0.7.0] - 2017-10-01
 
 ### Added
@@ -78,7 +94,8 @@ upgrading.
 
 - Initial public release, extracted from internal project.
 
-[Unreleased]: https://github.com/luislavena/gem-compiler/compare/v0.7.0...HEAD
+[Unreleased]: https://github.com/luislavena/gem-compiler/compare/v0.8.0...HEAD
+[0.8.0]: https://github.com/luislavena/gem-compiler/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/luislavena/gem-compiler/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/luislavena/gem-compiler/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/luislavena/gem-compiler/compare/v0.4.0...v0.5.0

data/lib/rubygems/commands/compile_command.rb

@@ -9,6 +9,10 @@ class Gem::Commands::CompileCommand < Gem::Command
       options[:output] = File.expand_path(value, Dir.pwd)
     end
 
+    add_option "--include-shared-dir DIR", "Additional directory for shared libraries" do |value, options|
+      options[:include_shared_dir] = value
+    end
+
     add_option "--prune", "Clean non-existing files during re-packaging" do |value, options|
       options[:prune] = true
     end

data/lib/rubygems/compiler.rb

@@ -2,12 +2,7 @@ require "fileutils"
 require "rbconfig"
 require "tmpdir"
 require "rubygems/installer"
-
-if Gem::VERSION >= "2.0.0"
-  require "rubygems/package"
-else
-  require "rubygems/builder"
-end
+require "rubygems/package"
 
 class Gem::Compiler
   include Gem::UserInteraction
@@ -30,6 +25,12 @@ class Gem::Compiler
 
     artifacts = collect_artifacts
 
+    if shared_dir = options[:include_shared_dir]
+      shared_libs = collect_shared(shared_dir)
+
+      artifacts.concat shared_libs
+    end
+
     # build a new gemspec from the original one
     gemspec = installer.spec.dup
 
@@ -80,6 +81,12 @@ class Gem::Compiler
     Dir.glob("#{target_dir}/{#{lib_dirs}}/**/*.#{dlext}")
   end
 
+  def collect_shared(shared_dir)
+    libext = platform_shared_ext
+
+    Dir.glob("#{target_dir}/#{shared_dir}/**/*.#{libext}")
+  end
+
   def info(msg)
     say msg if Gem.configuration.verbose
   end
@@ -92,6 +99,21 @@ class Gem::Compiler
     @installer ||= prepare_installer
   end
 
+  def platform_shared_ext
+    platform = Gem::Platform.local
+
+    case platform.os
+    when /darwin/
+      "dylib"
+    when /linux|bsd|solaris/
+      "so"
+    when /mingw|mswin|cygwin|msys/
+      "dll"
+    else
+      "so"
+    end
+  end
+
   def prepare_installer
     # RubyGems 2.5 specifics
     unpack_options = options.dup.merge(unpack: true)
@@ -149,11 +171,7 @@ class Gem::Compiler
     output_gem = nil
 
     Dir.chdir target_dir do
-      output_gem = if defined?(Gem::Builder)
-                     Gem::Builder.new(gemspec).build
-                   else
-                     Gem::Package.build(gemspec)
-                   end
+      output_gem = Gem::Package.build(gemspec)
     end
 
     unless output_gem

data/lib/rubygems/compiler/version.rb

@@ -2,6 +2,6 @@
 
 module Gem
   class Compiler
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/test/rubygems/test_gem_compiler.rb

@@ -1,6 +1,14 @@
 require "rubygems/test_case"
 require "rubygems/compiler"
 
+# RubyGems 2.6.x introduced a new exception class for unmet requirements
+# Evalute if is present and use it in tests
+if defined?(Gem::RuntimeRequirementNotMetError)
+  GEM_REQUIREMENT_EXCEPTION = Gem::RuntimeRequirementNotMetError
+else
+  GEM_REQUIREMENT_EXCEPTION = Gem::InstallError
+end
+
 class TestGemCompiler < Gem::TestCase
   def setup
     super
@@ -71,13 +79,13 @@ class TestGemCompiler < Gem::TestCase
 
     compiler = Gem::Compiler.new(gem_file, :output => @output_dir)
 
-    e = assert_raises Gem::InstallError do
+    e = assert_raises GEM_REQUIREMENT_EXCEPTION do
       use_ui @ui do
         compiler.compile
       end
     end
 
-    assert_equal "old_required requires Ruby version = 1.4.6.", e.message
+    assert_match %r|old_required requires Ruby version = 1.4.6|, e.message
   end
 
   def test_compile_required_rubygems
@@ -85,14 +93,13 @@ class TestGemCompiler < Gem::TestCase
 
     compiler = Gem::Compiler.new(gem_file, :output => @output_dir)
 
-    e = assert_raises Gem::InstallError do
+    e = assert_raises GEM_REQUIREMENT_EXCEPTION do
       use_ui @ui do
         compiler.compile
       end
     end
 
-    assert_equal "old_rubygems requires RubyGems version < 0. " +
-                   "Try 'gem update --system' to update RubyGems itself.", e.message
+    assert_match %r|old_rubygems requires RubyGems version < 0|, e.message
   end
 
   def test_compile_succeed
@@ -228,6 +235,78 @@ class TestGemCompiler < Gem::TestCase
     end
   end
 
+  def test_compile_bundle_extra_artifacts_linux
+    util_set_arch "x86_64-linux"
+
+    name = 'a'
+
+    artifact = "shared.so"
+    old_spec = ''
+
+    gem_file = util_bake_gem(name) { |spec|
+      old_spec = spec
+      util_fake_extension spec, name, <<-EOF
+        require "fileutils"
+
+        FileUtils.touch "#{artifact}"
+
+        File.open 'Rakefile', 'w' do |rf| rf.puts "task :default" end
+      EOF
+    }
+
+    compiler = Gem::Compiler.new(gem_file,
+      :output => @output_dir, :include_shared_dir => "ext")
+
+    output_gem = nil
+
+    use_ui @ui do
+      output_gem = compiler.compile
+    end
+
+    assert_path_exists File.join(@output_dir, output_gem)
+    actual_spec = util_read_spec File.join(@output_dir, output_gem)
+
+    assert_includes actual_spec.files, "ext/#{name}/#{artifact}"
+  ensure
+    util_reset_arch
+  end
+
+  def test_compile_bundle_extra_artifacts_windows
+    util_set_arch "i386-mingw32"
+
+    name = 'a'
+
+    artifact = "shared.dll"
+    old_spec = ''
+
+    gem_file = util_bake_gem(name) { |spec|
+      old_spec = spec
+      util_fake_extension spec, name, <<-EOF
+        require "fileutils"
+
+        FileUtils.touch "#{artifact}"
+
+        File.open 'Rakefile', 'w' do |rf| rf.puts "task :default" end
+      EOF
+    }
+
+    compiler = Gem::Compiler.new(gem_file,
+      :output => @output_dir, :include_shared_dir => "ext")
+
+    output_gem = nil
+
+    use_ui @ui do
+      output_gem = compiler.compile
+    end
+
+    assert_path_exists File.join(@output_dir, output_gem)
+    actual_spec = util_read_spec File.join(@output_dir, output_gem)
+
+    assert_includes actual_spec.files, "ext/#{name}/#{artifact}"
+  ensure
+    util_reset_arch
+  end
+
   def test_compile_lock_ruby_abi
     util_reset_arch
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-compiler
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Luis Lavena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,15 +74,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.24
+      version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A RubyGems plugin that generates binary gems.