thermite 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793a74182e39e247bbb7221e701d6b99bea33c52
-  data.tar.gz: fcf59fa118b126b009d28f752ab1744dd8c4eaa3
+  metadata.gz: f93bbe221fed24e3b544f9235ff61cf4e0a945de
+  data.tar.gz: 11dddf0b1358d1065a7a9c81ced8bd3c2bf8ff28
 SHA512:
-  metadata.gz: a111565723d14b441c270e3d12b0e2003442e2a9dac08d2edbe25e0e2df9716c8d9c48bbf54c470a488ead4aea8d12c7b9a3f8d3dd6f71d85a7b6b1c3e85f8f4
-  data.tar.gz: 13a9b543d8bbd755f0cfdb0d9be1b919b8cd1eee24a8549a8cbecd8d3bc10152099eacbe91916bc5cd75df02cbfd159a9aeaebda8a6a450f94f52c8628637cc3
+  metadata.gz: f83ab5c15e48d85ff0dc4f6b5cf76844a78f768bbafd64bbac55c8bb2262907aeba64c6935f7e88fa5dcfea3c95d450e90a7931ff317be63ba113e7501eeecf5
+  data.tar.gz: 6e1cd593d6a80ce7d87dbc7398ee4be6e1a1cc971754b60686fb125d8b3609a09ca283bd87c2e1de644dcaed3e4ebde4d626e765002a5e4eacf133e6fa98a88c

data/.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
   - 'vendor/**/*'
   TargetRubyVersion: 2.1
 
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
 Lint/EndAlignment:
   Enabled: true
   EnforcedStyleAlignWith: variable
@@ -25,9 +28,6 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 20
 
-Style/EmptyLineAfterMagicComment:
-  Enabled: false
-
 # When support for Ruby < 2.3 is dropped, re-enable
 Style/IndentHeredoc:
   Enabled: false

data/Gemfile

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
 source 'https://rubygems.org'

data/NEWS.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## [0.13.0] - 2017-10-05
+
+### Added
+
+* Support for building static libraries (#22, #41):
+
+### Fixed
+
+* Always pass `--lib` to `cargo with `link-args` (#40)
+
 ## [0.12.1] - 2017-04-06
 
 ### Fixed
@@ -146,6 +156,7 @@
 
 Initial release.
 
+[0.13.0]: https://github.com/malept/thermite/compare/v0.12.1...v0.13.0
 [0.12.1]: https://github.com/malept/thermite/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/malept/thermite/compare/v0.11.1...v0.12.0
 [0.11.1]: https://github.com/malept/thermite/compare/v0.11.0...v0.11.1

data/Rakefile

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors

data/lib/thermite/cargo.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors
@@ -86,12 +85,12 @@ module Thermite
     # `require_severity` is the verb that indicates how important Rust is to the library.
     #
     def cargo_msg(require_severity)
-      <<EOM
+      <<MESSAGE
 ****
 Rust's Cargo is #{require_severity} to build this extension. Please install
 Rust and put it in the PATH, or set the CARGO environment variable appropriately.
 ****
-EOM
+MESSAGE
     end
 
     #
@@ -111,16 +110,16 @@ EOM
     private
 
     def cargo_rustc_args
-      args = []
-      unless config.dynamic_linker_flags == '' || config.target_os == 'mingw32'
-        args.push(
+      if config.dynamic_linker_flags == '' || config.target_os == 'mingw32'
+        []
+      else
+        [
+          '--lib',
           '--',
           '-C',
           "link-args=#{config.dynamic_linker_flags}"
-        )
+        ]
       end
-
-      args
     end
   end
 end

data/lib/thermite/config.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors
@@ -109,22 +108,31 @@ module Thermite
     end
 
     #
-    # The basename of the Rust shared library.
+    # The basename of the shared library built by Cargo.
     #
-    def shared_library
-      @shared_library ||= begin
+    def cargo_shared_library
+      @cargo_shared_library ||= begin
         filename = "#{library_name}.#{shared_ext}"
         filename = "lib#{filename}" unless Gem.win_platform?
         filename
       end
     end
 
+    #
+    # The basename of the Rust shared library, as installed in the {#ruby_extension_path}.
+    #
+    def shared_library
+      @shared_library ||= "#{library_name}.so"
+    end
+
     #
     # Return the basename of the tarball generated by the `thermite:tarball` Rake task, given a
     # package `version`.
     #
     def tarball_filename(version)
-      "#{library_name}-#{version}-#{ruby_version}-#{target_os}-#{target_arch}.tar.gz"
+      static = static_extension? ? '-static' : ''
+
+      "#{library_name}-#{version}-#{ruby_version}-#{target_os}-#{target_arch}#{static}.tar.gz"
     end
 
     #
@@ -262,6 +270,13 @@ module Thermite
       @dynamic_linker_flags ||= RbConfig::CONFIG['DLDFLAGS'].strip
     end
 
+    #
+    # Whether to use a statically linked extension.
+    #
+    def static_extension?
+      ENV.key?('RUBY_STATIC') || RbConfig::CONFIG['ENABLE_SHARED'] == 'no'
+    end
+
     private
 
     def dlext

data/lib/thermite/custom_binary.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors

data/lib/thermite/fiddle.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors

data/lib/thermite/github_release_binary.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016, 2017 Mark Lee and contributors

data/lib/thermite/package.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors
@@ -24,7 +23,7 @@ require 'zlib'
 
 module Thermite
   #
-  # Helpers to package the Rust library, using FPM.
+  # Helpers to package the Rust library into a gzipped tarball.
   #
   module Package
     #

data/lib/thermite/tasks.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors
@@ -123,8 +122,8 @@ module Thermite
         if cargo
           profile = ENV.fetch('CARGO_PROFILE', 'release')
           run_cargo_rustc(profile)
-          FileUtils.cp(config.cargo_target_path(profile, config.shared_library),
-                       config.ruby_path('lib'))
+          FileUtils.cp(config.cargo_target_path(profile, config.cargo_shared_library),
+                       config.ruby_extension_path)
         elsif !download_binary_from_custom_uri && !download_binary_from_github_release
           inform_user_about_cargo
         end

data/lib/thermite/util.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016 Mark Lee and contributors

data/test/lib/thermite/cargo_test.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+#
+# Copyright (c) 2016, 2017 Mark Lee and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'test_helper'
 require 'thermite/cargo'
 
@@ -46,7 +65,7 @@ module Thermite
       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
+        mock_module.expects(:run_cargo).with('rustc', '--lib', '--', '-C', 'link-args=foo bar').once
       end
       mock_module.run_cargo_rustc('debug')
     end

data/test/lib/thermite/config_test.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+#
+# Copyright (c) 2016, 2017 Mark Lee and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'test_helper'
 
 module Thermite
@@ -55,24 +74,40 @@ module Thermite
       config.stubs(:library_name).returns('foobar')
       config.stubs(:shared_ext).returns('ext')
       Gem.stubs(:win_platform?).returns(false)
-      assert_equal 'libfoobar.ext', config.shared_library
+      assert_equal 'foobar.so', config.shared_library
     end
 
     def test_shared_library_windows
       config.stubs(:library_name).returns('foobar')
       config.stubs(:shared_ext).returns('ext')
       Gem.stubs(:win_platform?).returns(true)
-      assert_equal 'foobar.ext', config.shared_library
+      assert_equal 'foobar.so', config.shared_library
     end
 
-    def test_tarball_filename
+    def test_cargo_shared_library
       config.stubs(:library_name).returns('foobar')
-      config.stubs(:ruby_version).returns('ruby12')
-      config.stubs(:target_os).returns('c64')
-      config.stubs(:target_arch).returns('z80')
+      config.stubs(:shared_ext).returns('ext')
+      Gem.stubs(:win_platform?).returns(false)
+      assert_equal 'libfoobar.ext', config.cargo_shared_library
+    end
+
+    def test_cargo_shared_library_windows
+      config.stubs(:library_name).returns('foobar')
+      config.stubs(:shared_ext).returns('ext')
+      Gem.stubs(:win_platform?).returns(true)
+      assert_equal 'foobar.ext', config.cargo_shared_library
+    end
+
+    def test_tarball_filename
+      stub_tarball_filename_params(false)
       assert_equal 'foobar-0.1.2-ruby12-c64-z80.tar.gz', config.tarball_filename('0.1.2')
     end
 
+    def test_tarball_filename_with_static_extension
+      stub_tarball_filename_params(true)
+      assert_equal 'foobar-0.1.2-ruby12-c64-z80-static.tar.gz', config.tarball_filename('0.1.2')
+    end
+
     def test_default_ruby_toplevel_dir
       FileUtils.stubs(:pwd).returns('/tmp/foobar')
       assert_equal '/tmp/foobar', config.ruby_toplevel_dir
@@ -161,6 +196,21 @@ module Thermite
       assert_equal expected, config(cargo_project_path: fixtures_path('config')).toml_config
     end
 
+    def test_static_extension_sans_env_var
+      ENV.stubs(:key?).with('RUBY_STATIC').returns(false)
+      RbConfig::CONFIG.stubs(:[]).with('ENABLE_SHARED').returns('yes')
+      refute config.static_extension?
+
+      RbConfig::CONFIG.stubs(:[]).with('ENABLE_SHARED').returns('no')
+      assert config.static_extension?
+    end
+
+    def test_static_extension_with_env_var
+      ENV.stubs(:key?).with('RUBY_STATIC').returns(true)
+      RbConfig::CONFIG.stubs(:[]).with('ENABLE_SHARED').returns('yes')
+      assert config.static_extension?
+    end
+
     private
 
     def config(options = {})
@@ -170,5 +220,13 @@ module Thermite
     def described_class
       Thermite::Config
     end
+
+    def stub_tarball_filename_params(static_extension)
+      config.stubs(:library_name).returns('foobar')
+      config.stubs(:ruby_version).returns('ruby12')
+      config.stubs(:target_os).returns('c64')
+      config.stubs(:target_arch).returns('z80')
+      config.stubs(:static_extension?).returns(static_extension)
+    end
   end
 end

data/test/lib/thermite/custom_binary_test.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+#
+# Copyright (c) 2016, 2017 Mark Lee and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'tmpdir'
 require 'test_helper'
 require 'thermite/custom_binary'
@@ -21,7 +40,7 @@ module Thermite
     end
 
     def test_download_binary_from_custom_uri
-      mock_module(binary_uri_format: 'http://example.com/download/%{version}/%{filename}')
+      mock_module(binary_uri_format: 'http://example.com/download/%<version>s/%<filename>s')
       mock_module.config.stubs(:toml).returns(package: { version: '4.5.6' })
       Net::HTTP.stubs(:get_response).returns('location' => 'redirect')
       mock_module.stubs(:http_get).returns('tarball')

data/test/lib/thermite/github_release_binary_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
 # Copyright (c) 2016, 2017 Mark Lee and contributors

data/test/lib/thermite/package_test.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+#
+# Copyright (c) 2016, 2017 Mark Lee and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'fileutils'
 require 'tmpdir'
 require 'test_helper'

data/test/lib/thermite/util_test.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+#
+# Copyright (c) 2016, 2017 Mark Lee and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'tempfile'
 require 'test_helper'
 require 'thermite/util'

data/test/test_helper.rb

@@ -1,3 +1,22 @@
+# frozen_string_literal: true
+#
+# Copyright (c) 2016, 2017 Mark Lee and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'simplecov'
 SimpleCov.start do
   load_profile 'test_frameworks'

data/thermite.gemspec

@@ -3,7 +3,7 @@ require 'English'
 
 Gem::Specification.new do |s|
   s.name        = 'thermite'
-  s.version     = '0.12.1'
+  s.version     = '0.13.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.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Mark Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake