thermite 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5be6d2dadd7ecc7511529c5c02bc2a8b818b2c2
-  data.tar.gz: 93507f6f71a4135fb8a26d9188a59bfe7ae9e02f
+  metadata.gz: 67d13d93b823cb59cfaee97258a453554c37776b
+  data.tar.gz: 6b43c2078ca42b9968f66de7eb8c1f195d8344c3
 SHA512:
-  metadata.gz: fd95587e1e64983ca41e37bf597ed87564a6f929f5fcd05d5972fd59348bc871995c02e6328c02bd619f7b7914020ea016b5987198e02dedca28598b5917caa0
-  data.tar.gz: 6480dbe2896f46ff2126cf650049e239caaf8171999390fa6f1480c57e21fc6e1e96a4f24b6fdbe687f5ba728aed3c7bf5c6ef0a85e9dcbe79368136ff1d6836
+  metadata.gz: 2751b4bfd2bfba6a2e1a8819216a434d24ef3e5b8b52fe941684316d39a5fc0738f1ae9327c7ce7507f4cbbd6e45b2d825516414750c4eee5f1fff3ac741fab3
+  data.tar.gz: 84708d23d5cbd0ee9ef48cf24fef94b99ab1b25b3d1ab717ff8682c1a7d1d13768fdb848027043ac4bbb903afe80cac4029c6ca8b41bee1e8ede2ad37d933c95

data/NEWS.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## [0.10.0] - 2017-01-22
+
+### Fixed
+
+* Adjust OSX dylib library paths upon installation (#28)
+* Don't use UNIX shell escaping on Windows
+
+### Changed
+
+* `cargo build` has been replaced by `cargo rustc` - non-Windows builds use DLDFLAGS as linker
+  arguments (#27)
+
 ## [0.9.0] - 2017-01-18
 
 ### Fixed
@@ -102,6 +114,7 @@
 
 Initial release.
 
+[0.10.0]: https://github.com/malept/thermite/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/malept/thermite/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/malept/thermite/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/malept/thermite/compare/v0.6.0...v0.7.0

data/lib/thermite/cargo.rb

@@ -38,7 +38,8 @@ module Thermite
     #
     def run_cargo(*args)
       Dir.chdir(config.rust_toplevel_dir) do
-        sh "#{cargo} #{Shellwords.join(args)}"
+        shell_args = config.target_os == 'mingw32' ? args.join(' ') : Shellwords.join(args)
+        sh "#{cargo} #{shell_args}"
       end
     end
 
@@ -50,11 +51,12 @@ module Thermite
     end
 
     #
-    # Run `cargo build`, given a target (i.e., `release` [default] or `debug`).
+    # Run `cargo rustc`, given a target (i.e., `release` [default] or `debug`).
     #
-    def run_cargo_build(target)
-      cargo_args = %w(build)
+    def run_cargo_rustc(target)
+      cargo_args = %w(rustc)
       cargo_args << '--release' if target == 'release'
+      cargo_args.push(*cargo_rustc_args)
       run_cargo(*cargo_args)
     end
 
@@ -96,5 +98,20 @@ EOM
     def cargo_recommended_msg
       cargo_msg('recommended (but not required)')
     end
+
+    private
+
+    def cargo_rustc_args
+      args = []
+      unless config.dynamic_linker_flags == '' || config.target_os == 'mingw32'
+        args.push(
+          '--',
+          '-C',
+          "link-args=#{config.dynamic_linker_flags}"
+        )
+      end
+
+      args
+    end
   end
 end

data/lib/thermite/config.rb

@@ -142,6 +142,17 @@ module Thermite
       File.join(ruby_toplevel_dir, *path_components)
     end
 
+    # :nocov:
+
+    #
+    # Absolute path to the shared libruby.
+    #
+    def libruby_path
+      @libruby_path ||= File.join(RbConfig::CONFIG['libdir'], RbConfig::CONFIG['LIBRUBY_SO'])
+    end
+
+    # :nocov:
+
     #
     # The top-level directory of the Cargo project. Defaults to the current working directory.
     #
@@ -212,10 +223,17 @@ module Thermite
       end
     end
 
-    private
-
     # :nocov:
 
+    #
+    # Linker flags for libruby.
+    #
+    def dynamic_linker_flags
+      @dynamic_linker_flags ||= RbConfig::CONFIG['DLDFLAGS'].strip
+    end
+
+    private
+
     def dlext
       RbConfig::CONFIG['DLEXT']
     end

data/lib/thermite/custom_binary.rb

@@ -38,15 +38,17 @@ module Thermite
       return false unless config.binary_uri_format
 
       version = config.crate_version
-      uri ||= config.binary_uri_format % {
+      uri ||= format(
+        config.binary_uri_format,
         filename: config.tarball_filename(version),
         version: version
-      }
+      )
 
       return false unless (tgz = download_versioned_binary(uri, version))
 
       debug "Unpacking binary from Cargo version: #{File.basename(uri)}"
       unpack_tarball(tgz)
+      prepare_downloaded_library
       true
     end
 

data/lib/thermite/github_release_binary.rb

@@ -61,6 +61,7 @@ module Thermite
 
       debug "Unpacking GitHub release from Cargo version: #{File.basename(uri)}"
       unpack_tarball(tgz)
+      prepare_downloaded_library
       true
     end
 
@@ -75,6 +76,7 @@ module Thermite
         next unless tgz
         debug "Unpacking GitHub release: #{File.basename(download_uri)}"
         unpack_tarball(tgz)
+        prepare_downloaded_library
         installed_binary = true
         break
       end

data/lib/thermite/package.rb

@@ -33,6 +33,7 @@ module Thermite
     def build_package
       filename = config.tarball_filename(config.toml[:package][:version])
       relative_library_path = config.ruby_extension_path.sub("#{config.ruby_toplevel_dir}/", '')
+      prepare_built_library
       Zlib::GzipWriter.open(filename) do |tgz|
         Dir.chdir(config.ruby_toplevel_dir) do
           Archive::Tar::Minitar.pack(relative_library_path, tgz)
@@ -55,6 +56,19 @@ module Thermite
       end
     end
 
+    # :nocov:
+
+    def prepare_downloaded_library
+      return unless config.target_os.start_with?('darwin')
+
+      libruby_path = Shellwords.escape(config.libruby_path)
+      library_path = Shellwords.escape(config.ruby_extension_path)
+      `install_name_tool -id #{library_path} #{library_path}`
+      `install_name_tool -change @libruby_path@ #{libruby_path} #{library_path}`
+    end
+
+    # :nocov:
+
     private
 
     def each_compressed_file(tgz)
@@ -68,5 +82,15 @@ module Thermite
         end
       end
     end
+
+    # :nocov:
+
+    def prepare_built_library
+      return unless config.target_os.start_with?('darwin')
+
+      libruby_path = Shellwords.escape(config.libruby_path)
+      library_path = Shellwords.escape(config.ruby_extension_path)
+      `install_name_tool -change #{libruby_path} @libruby_path@ #{library_path}`
+    end
   end
 end

data/lib/thermite/tasks.rb

@@ -118,7 +118,7 @@ module Thermite
         # if cargo found, build. Otherwise, grab binary (when github_releases is enabled).
         if cargo
           target = ENV.fetch('CARGO_TARGET', 'release')
-          run_cargo_build(target)
+          run_cargo_rustc(target)
           FileUtils.cp(config.rust_path('target', target, config.shared_library),
                        config.ruby_path('lib'))
         elsif !download_binary_from_custom_uri && !download_binary_from_github_release

data/test/lib/thermite/cargo_test.rb

@@ -22,14 +22,26 @@ module Thermite
       mock_module.run_cargo_if_exists('foo', 'bar')
     end
 
-    def test_run_cargo_debug_build
-      mock_module.expects(:run_cargo).with('build').once
-      mock_module.run_cargo_build('debug')
+    def test_run_cargo_debug_rustc
+      mock_module.config.stubs(:dynamic_linker_flags).returns('')
+      mock_module.expects(:run_cargo).with('rustc').once
+      mock_module.run_cargo_rustc('debug')
     end
 
-    def test_run_cargo_release_build
-      mock_module.expects(:run_cargo).with('build', '--release').once
-      mock_module.run_cargo_build('release')
+    def test_run_cargo_release_rustc
+      mock_module.config.stubs(:dynamic_linker_flags).returns('')
+      mock_module.expects(:run_cargo).with('rustc', '--release').once
+      mock_module.run_cargo_rustc('release')
+    end
+
+    def test_run_cargo_rustc_with_dynamic_linker_flags
+      mock_module.config.stubs(:dynamic_linker_flags).returns('foo bar')
+      if RbConfig::CONFIG['target_os'] == 'mingw32'
+        mock_module.expects(:run_cargo).with('rustc').once
+      else
+        mock_module.expects(:run_cargo).with('rustc', '--', '-C', 'link-args=foo bar').once
+      end
+      mock_module.run_cargo_rustc('debug')
     end
 
     def test_inform_user_about_cargo_exception

data/test/lib/thermite/custom_binary_test.rb

@@ -26,6 +26,7 @@ module Thermite
       Net::HTTP.stubs(:get_response).returns('location' => 'redirect')
       mock_module.stubs(:http_get).returns('tarball')
       mock_module.expects(:unpack_tarball).once
+      mock_module.expects(:prepare_downloaded_library).once
 
       assert mock_module.download_binary_from_custom_uri
     end

data/test/lib/thermite/github_release_binary_test.rb

@@ -56,6 +56,7 @@ module Thermite
       Net::HTTP.stubs(:get_response).returns('location' => 'redirect')
       mock_module.stubs(:http_get).returns('tarball')
       mock_module.expects(:unpack_tarball).once
+      mock_module.expects(:prepare_downloaded_library).once
 
       assert mock_module.download_binary_from_github_release
     end
@@ -67,6 +68,7 @@ module Thermite
       Net::HTTP.stubs(:get_response).returns('location' => 'redirect')
       mock_module.stubs(:http_get).returns('tarball')
       mock_module.expects(:unpack_tarball).once
+      mock_module.expects(:prepare_downloaded_library).once
 
       assert mock_module.download_binary_from_github_release
     end
@@ -114,6 +116,7 @@ module Thermite
       stub_releases_atom
       mock_module.stubs(:download_versioned_github_release_binary).returns(StringIO.new('tarball'))
       mock_module.expects(:unpack_tarball).once
+      mock_module.expects(:prepare_downloaded_library).once
 
       assert mock_module.download_binary_from_github_release
     end
@@ -131,6 +134,7 @@ module Thermite
       stub_releases_atom
       mock_module.stubs(:download_versioned_github_release_binary).returns(nil)
       mock_module.expects(:unpack_tarball).never
+      mock_module.expects(:prepare_downloaded_library).never
 
       assert !mock_module.download_binary_from_github_release
     end

data/thermite.gemspec

@@ -3,7 +3,7 @@ require 'English'
 
 Gem::Specification.new do |s|
   s.name        = 'thermite'
-  s.version     = '0.9.0'
+  s.version     = '0.10.0'
   s.summary     = 'Rake helpers for Rust+Ruby'
   s.description = 'A Rake-based helper for building and distributing Rust-based Ruby extensions'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thermite
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Mark Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake