thermite 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46ed87fb7a828cd7419b99e0b72497080cb706e
-  data.tar.gz: 79a9493717ca440209d37375b332e7ef5b598a01
+  metadata.gz: 45077a1b81efe633a758315d0b521b208d6467d7
+  data.tar.gz: f13423bc8bc0e57df51329dffed5e9dade52760b
 SHA512:
-  metadata.gz: acedce2b841de01077166fc765ce33e10d9d600274b4ba99c6acdbdb6990bb8f48496bc9807a645c9c7f2116a7edffdcb784c704e29b5155cf8c8f73ee66d189
-  data.tar.gz: 9c7ae1c09eff27c99ddf9525c17f68c4683af53f2917edb14df8aa54e0daf28b7b426ef0daa0765e1d06efffd0164199a2e32ebd2fd56660876ed1208d44059d
+  metadata.gz: a1f52ff2ece0053428f4dc5ea9e7fe72c7608c634a58bd211a9b9669b8d32384d60cd09702aac57d0bba919a8ea2ef465c86459a8321a932f4949cc7bd17895a
+  data.tar.gz: 5d77f221ae5889c33e4bd72c980e1300343f805be6c760a3c65fe334c2da15a73a403847a5f58c2cbc1d6a3a1dc0cd39e5f169ec5a3d88714e917a764316b86b

data/.rubocop.yml

@@ -24,3 +24,10 @@ 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/NEWS.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## [0.12.0] - 2017-04-05
+
+### Added
+
+* Support for CARGO_TARGET_DIR environment variable (#33)
+
+### Fixed
+
+* Cargo executable and arguments with paths using spaces are supported properly
+
+### Changed
+
+* CARGO_TARGET is now CARGO_PROFILE, for less confusion (#35)
+
 ## [0.11.1] - 2017-02-04
 
 ### Fixed
@@ -126,6 +140,7 @@
 
 Initial release.
 
+[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
 [0.11.0]: https://github.com/malept/thermite/compare/v0.10.0...v0.11.0
 [0.10.0]: https://github.com/malept/thermite/compare/v0.9.0...v0.10.0

data/lib/thermite/cargo.rb

@@ -19,7 +19,6 @@
 # OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'mkmf'
-require 'shellwords'
 
 module Thermite
   #
@@ -38,8 +37,7 @@ module Thermite
     #
     def run_cargo(*args)
       Dir.chdir(config.rust_toplevel_dir) do
-        shell_args = config.target_os == 'mingw32' ? args.join(' ') : Shellwords.join(args)
-        sh "#{cargo} #{shell_args}"
+        sh cargo, *args
       end
     end
 

data/lib/thermite/config.rb

@@ -30,7 +30,7 @@ module Thermite
     #
     # Creates a new configuration object.
     #
-    # `options` is the same as the `Thermite::Tasks.new` parameter.
+    # `options` is the same as the {Thermite::Tasks#initialize} parameter.
     #
     def initialize(options = {})
       @options = options
@@ -135,7 +135,7 @@ module Thermite
     end
 
     #
-    # Generate a path relative to `ruby_toplevel_dir`, given the `path_components` that are passed
+    # Generate a path relative to {#ruby_toplevel_dir}, given the `path_components` that are passed
     # to `File.join`.
     #
     def ruby_path(*path_components)
@@ -161,13 +161,22 @@ module Thermite
     end
 
     #
-    # Generate a path relative to `rust_toplevel_dir`, given the `path_components` that are
+    # Generate a path relative to {#rust_toplevel_dir}, given the `path_components` that are
     # passed to `File.join`.
     #
     def rust_path(*path_components)
       File.join(rust_toplevel_dir, *path_components)
     end
 
+    #
+    # Generate a path relative to the `CARGO_TARGET_DIR` environment variable, or
+    # {#rust_toplevel_dir} if that is not set.
+    #
+    def cargo_target_path(target, *path_components)
+      target_base = ENV.fetch('CARGO_TARGET_DIR', rust_toplevel_dir)
+      File.join(target_base, target, *path_components)
+    end
+
     #
     # If run in a multi-crate environment, the Cargo workspace member that contains the
     # Ruby extension.
@@ -178,7 +187,7 @@ module Thermite
 
     #
     # The absolute path to the `Cargo.toml` file. The path depends on the existence of the
-    # `cargo_workspace_member` configuration option.
+    # {#cargo_workspace_member} configuration option.
     #
     def cargo_toml_path
       @cargo_toml_path ||= begin

data/lib/thermite/tasks.rb

@@ -47,7 +47,7 @@ module Thermite
     include Thermite::Util
 
     #
-    # The configuration used for the Rake tasks.
+    # The configuration used for the Rake tasks. See: {Thermite::Config}
     #
     attr_reader :config
 
@@ -96,7 +96,7 @@ module Thermite
     attr_reader :options
 
     #
-    # Define the Thermite tasks with the given configuration parameters (see `options`).
+    # Define the Thermite tasks with the given configuration parameters (see {#options}).
     #
     # Example:
     #
@@ -117,13 +117,13 @@ module Thermite
     private
 
     def define_build_task
-      desc 'Build or download the Rust shared library: CARGO_TARGET controls Cargo target'
+      desc 'Build or download the Rust shared library: CARGO_PROFILE controls Cargo profile'
       task 'thermite:build' do
         # if cargo found, build. Otherwise, grab binary (when github_releases is enabled).
         if cargo
-          target = ENV.fetch('CARGO_TARGET', 'release')
-          run_cargo_rustc(target)
-          FileUtils.cp(config.rust_path('target', target, config.shared_library),
+          profile = ENV.fetch('CARGO_PROFILE', 'release')
+          run_cargo_rustc(profile)
+          FileUtils.cp(config.cargo_target_path(profile, config.shared_library),
                        config.ruby_path('lib'))
         elsif !download_binary_from_custom_uri && !download_binary_from_github_release
           inform_user_about_cargo

data/test/lib/thermite/cargo_test.rb

@@ -12,7 +12,7 @@ module Thermite
 
     def test_run_cargo_if_exists
       mock_module.stubs(:find_executable).returns('/opt/cargo-test/bin/cargo')
-      mock_module.expects(:sh).with('/opt/cargo-test/bin/cargo foo bar').once
+      mock_module.expects(:sh).with('/opt/cargo-test/bin/cargo', 'foo', 'bar').once
       mock_module.run_cargo_if_exists('foo', 'bar')
     end
 

data/test/lib/thermite/config_test.rb

@@ -109,6 +109,20 @@ module Thermite
       assert_equal '/tmp/foobar/baz/quux', config.rust_path('baz', 'quux')
     end
 
+    def test_cargo_target_path_with_env_var
+      FileUtils.stubs(:pwd).returns('/tmp/foobar')
+      ENV['CARGO_TARGET_DIR'] = 'foo'
+      assert_equal File.join('foo', 'debug', 'bar'), config.cargo_target_path('debug', 'bar')
+      ENV['CARGO_TARGET_DIR'] = nil
+    end
+
+    def test_cargo_target_path_without_env_var
+      FileUtils.stubs(:pwd).returns('/tmp/foobar')
+      ENV['CARGO_TARGET_DIR'] = nil
+      assert_equal File.join('/tmp/foobar', 'debug', 'bar'),
+                   config.cargo_target_path('debug', 'bar')
+    end
+
     def test_cargo_toml_path_with_workspace_member
       FileUtils.stubs(:pwd).returns('/tmp/foobar')
       config(cargo_workspace_member: 'baz')

data/thermite.gemspec

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