thermite 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d13d93b823cb59cfaee97258a453554c37776b
-  data.tar.gz: 6b43c2078ca42b9968f66de7eb8c1f195d8344c3
+  metadata.gz: 1d002cb267d9a1d645dd17f2367d51085c89bf04
+  data.tar.gz: 4d1d9325d79676569e8cf2289c627d3211da672f
 SHA512:
-  metadata.gz: 2751b4bfd2bfba6a2e1a8819216a434d24ef3e5b8b52fe941684316d39a5fc0738f1ae9327c7ce7507f4cbbd6e45b2d825516414750c4eee5f1fff3ac741fab3
-  data.tar.gz: 84708d23d5cbd0ee9ef48cf24fef94b99ab1b25b3d1ab717ff8682c1a7d1d13768fdb848027043ac4bbb903afe80cac4029c6ca8b41bee1e8ede2ad37d933c95
+  metadata.gz: 108c54cafd7afe98df4f3bbfeb332f5dea0b00b159c0d684a25a7f8b64fea8f99174029d075a76fb6b4be9de3280bb635e29aeeb62651d2fa0c5379f9e78a683
+  data.tar.gz: 7becbcb989abedc663104d9fc5f024929833468dc801863a6585fd02b3a506302903cb867e77b5b3c5b76501f3deb61538107008407e1d4aeee3651314866af9

data/.rubocop.yml

@@ -3,6 +3,10 @@ AllCops:
   - 'vendor/**/*'
   TargetRubyVersion: 2.1
 
+Lint/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
 Metrics/AbcSize:
   Max: 20
 

data/NEWS.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [0.11.0] - 2017-02-03
+
+### Added
+
+* Add support for Cargo workspaces (#30)
+
 ## [0.10.0] - 2017-01-22
 
 ### Fixed
@@ -114,6 +120,7 @@
 
 Initial release.
 
+[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
 [0.8.0]: https://github.com/malept/thermite/compare/v0.7.0...v0.8.0

data/README.md

@@ -76,7 +76,10 @@ Possible options:
   Example: `https://example.com/download/%{version}/%{filename}`. Replacement variables:
     - `filename` - The value of `Config.tarball_filename`
     - `version` - the crate version from `Cargo.toml`
-* `cargo_project_path` - the path to the Cargo project. Defaults to the current working directory.
+* `cargo_project_path` - the path to the top-level Cargo project. Defaults to the current working
+  directory.
+* `cargo_workspace_member` - if set, the relative path to the Cargo workspace member. Usually used
+  when it is part of a repository containing multiple crates.
 * `github_releases` - whether to look for Rust binaries via GitHub releases when installing
   the gem, and `cargo` is not found. Defaults to `false`.
 * `github_release_type` - when `github_releases` is `true`, the mode to use to download the Rust

data/lib/thermite/cargo.rb

@@ -55,6 +55,10 @@ 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 << '--release' if target == 'release'
       cargo_args.push(*cargo_rustc_args)
       run_cargo(*cargo_args)

data/lib/thermite/config.rb

@@ -168,6 +168,27 @@ module Thermite
       File.join(rust_toplevel_dir, *path_components)
     end
 
+    #
+    # If run in a multi-crate environment, the Cargo workspace member that contains the
+    # Ruby extension.
+    #
+    def cargo_workspace_member
+      @cargo_workspace_member ||= @options[:cargo_workspace_member]
+    end
+
+    #
+    # The absolute path to the `Cargo.toml` file. The path depends on the existence of the
+    # `cargo_workspace_member` configuration option.
+    #
+    def cargo_toml_path
+      @cargo_toml_path ||= begin
+        components = ['Cargo.toml']
+        components.unshift(cargo_workspace_member) if cargo_workspace_member
+
+        rust_path(*components)
+      end
+    end
+
     #
     # Path to the Rust shared library in the context of the Ruby project.
     #
@@ -198,7 +219,7 @@ module Thermite
     # Parsed TOML object (courtesy of `tomlrb`).
     #
     def toml
-      @toml ||= Tomlrb.load_file(rust_path('Cargo.toml'), symbolize_keys: true)
+      @toml ||= Tomlrb.load_file(cargo_toml_path, symbolize_keys: true)
     end
 
     #

data/lib/thermite/tasks.rb

@@ -63,6 +63,8 @@ module Thermite
     #     - `version` - the crate version from the `Cargo.toml` file
     # * `cargo_project_path` - the path to the Cargo project. Defaults to the current
     #   working directory.
+    # * `cargo_workspace_member` - if set, the relative path to the Cargo workspace member. Usually
+    #   used when it is part of a repository containing multiple crates.
     # * `github_releases` - whether to look for rust binaries via GitHub releases when installing
     #   the gem, and `cargo` is not found. Defaults to `false`.
     # * `github_release_type` - when `github_releases` is `true`, the mode to use to download the

data/test/lib/thermite/cargo_test.rb

@@ -34,6 +34,13 @@ module Thermite
       mock_module.run_cargo_rustc('release')
     end
 
+    def test_run_cargo_rustc_with_workspace_member
+      mock_module.config.stubs(:dynamic_linker_flags).returns('')
+      mock_module.config.stubs(:cargo_workspace_member).returns('foo/bar')
+      mock_module.expects(:run_cargo).with('rustc', '--manifest-path', 'foo/bar/Cargo.toml').once
+      mock_module.run_cargo_rustc('debug')
+    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'

data/test/lib/thermite/config_test.rb

@@ -109,6 +109,12 @@ module Thermite
       assert_equal '/tmp/foobar/baz/quux', config.rust_path('baz', 'quux')
     end
 
+    def test_cargo_toml_path_with_workspace_member
+      FileUtils.stubs(:pwd).returns('/tmp/foobar')
+      config(cargo_workspace_member: 'baz')
+      assert_equal '/tmp/foobar/baz/Cargo.toml', config.cargo_toml_path
+    end
+
     def test_default_git_tag_regex
       assert_equal described_class::DEFAULT_TAG_REGEX, config.git_tag_regex
     end

data/thermite.gemspec

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