thermite 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d002cb267d9a1d645dd17f2367d51085c89bf04
-  data.tar.gz: 4d1d9325d79676569e8cf2289c627d3211da672f
+  metadata.gz: d46ed87fb7a828cd7419b99e0b72497080cb706e
+  data.tar.gz: 79a9493717ca440209d37375b332e7ef5b598a01
 SHA512:
-  metadata.gz: 108c54cafd7afe98df4f3bbfeb332f5dea0b00b159c0d684a25a7f8b64fea8f99174029d075a76fb6b4be9de3280bb635e29aeeb62651d2fa0c5379f9e78a683
-  data.tar.gz: 7becbcb989abedc663104d9fc5f024929833468dc801863a6585fd02b3a506302903cb867e77b5b3c5b76501f3deb61538107008407e1d4aeee3651314866af9
+  metadata.gz: acedce2b841de01077166fc765ce33e10d9d600274b4ba99c6acdbdb6990bb8f48496bc9807a645c9c7f2116a7edffdcb784c704e29b5155cf8c8f73ee66d189
+  data.tar.gz: 9c7ae1c09eff27c99ddf9525c17f68c4683af53f2917edb14df8aa54e0daf28b7b426ef0daa0765e1d06efffd0164199a2e32ebd2fd56660876ed1208d44059d

data/NEWS.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [0.11.1] - 2017-02-04
+
+### Fixed
+
+* Add support for Cargo workspaces to `thermite:clean` and `thermite:test`
+
 ## [0.11.0] - 2017-02-03
 
 ### Added
@@ -120,6 +126,7 @@
 
 Initial release.
 
+[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
 [0.9.0]: https://github.com/malept/thermite/compare/v0.8.0...v0.9.0

data/README.md

@@ -59,7 +59,7 @@ Task configuration for your project can be set in two ways:
 * passing arguments to `Thermite::Tasks.new`
 * adding a `package.metadata.thermite` section to `Cargo.toml`. These settings override the
   arguments passed to the `Tasks` class. Due to the conflict, it is infeasible for
-  `cargo_project_path` to be set in this way. Example section:
+  `cargo_project_path` or `cargo_workspace_member` to be set in this way. Example section:
 
 ```toml
 [package.metadata.thermite]

data/lib/thermite/cargo.rb

@@ -55,15 +55,22 @@ module Thermite
     #
     def run_cargo_rustc(target)
       cargo_args = %w(rustc)
-      if config.cargo_workspace_member
-        manifest = File.join(config.cargo_workspace_member, 'Cargo.toml')
-        cargo_args.push('--manifest-path', manifest)
-      end
+      cargo_args.push(*cargo_manifest_path_args)
       cargo_args << '--release' if target == 'release'
       cargo_args.push(*cargo_rustc_args)
       run_cargo(*cargo_args)
     end
 
+    #
+    # If the `cargo_workspace_member` option is set, the `--manifest-path` argument to `cargo`.
+    #
+    def cargo_manifest_path_args
+      return [] unless config.cargo_workspace_member
+
+      manifest = File.join(config.cargo_workspace_member, 'Cargo.toml')
+      ['--manifest-path', manifest]
+    end
+
     #
     # Inform the user about cargo if it doesn't exist.
     #

data/lib/thermite/tasks.rb

@@ -89,7 +89,9 @@ module Thermite
     #   current working directory.
     #
     # These values can be overridden by values with the same key name in the
-    # `package.metadata.thermite` section of `Cargo.toml`, if that section exists.
+    # `package.metadata.thermite` section of `Cargo.toml`, if that section exists. The exceptions
+    # to this are `cargo_project_path` and `cargo_workspace_member`, since they are both used to
+    # find the `Cargo.toml` file.
     #
     attr_reader :options
 
@@ -133,14 +135,14 @@ module Thermite
       desc 'Clean up after thermite:build task'
       task 'thermite:clean' do
         FileUtils.rm(config.ruby_extension_path, force: true)
-        run_cargo_if_exists 'clean'
+        run_cargo_if_exists 'clean', *cargo_manifest_path_args
       end
     end
 
     def define_test_task
       desc 'Run Rust testsuite'
       task 'thermite:test' do
-        run_cargo_if_exists 'test'
+        run_cargo_if_exists 'test', *cargo_manifest_path_args
       end
     end
 

data/thermite.gemspec

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