thermite 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9902385f6d7c70426db6c25fabe306a29034e7fc
-  data.tar.gz: 4618e00a6dfb06afef4ab73675b9f45bdf892b7b
+  metadata.gz: f5be6d2dadd7ecc7511529c5c02bc2a8b818b2c2
+  data.tar.gz: 93507f6f71a4135fb8a26d9188a59bfe7ae9e02f
 SHA512:
-  metadata.gz: 68aa59bb0dc5129afc1cd63d56ccf6e10de7ea30199dddda075edcc2d3320563ab6a0dc73ef86862cbd49e02664e07cc90ce3060ffa115f635124a8c0eddb708
-  data.tar.gz: 0391dce454f1da154121078fb9edf3ffbadecc11294e443a2dbcf09ec2a7a2056e366cf61ec6a54b6ed7e80ed323cd23236b9dfcbc55a0427d211a2270b0c9c2
+  metadata.gz: fd95587e1e64983ca41e37bf597ed87564a6f929f5fcd05d5972fd59348bc871995c02e6328c02bd619f7b7914020ea016b5987198e02dedca28598b5917caa0
+  data.tar.gz: 6480dbe2896f46ff2126cf650049e239caaf8171999390fa6f1480c57e21fc6e1e96a4f24b6fdbe687f5ba728aed3c7bf5c6ef0a85e9dcbe79368136ff1d6836

data/.travis.yml

@@ -2,11 +2,14 @@ language: ruby
 os:
 - linux
 - osx
+dist: trusty
+sudo: false
 osx_image: xcode8
 rvm:
 - 2.1.10
 - 2.2.5
-- 2.3.1
+- 2.3.3
+- 2.4.0
 cache: bundler
 after_success:
 - bundle exec codeclimate-test-reporter

data/NEWS.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## [0.9.0] - 2017-01-18
+
+### Fixed
+
+* The library name is consistent with how Cargo handles hyphens (#19)
+* Raise error if using GitHub Releases & repository not in `Cargo.toml` (#18)
+
 ## [0.8.0] - 2016-12-05
 
 ### Added
@@ -95,6 +102,8 @@
 
 Initial release.
 
+[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
 [0.6.0]: https://github.com/malept/thermite/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/malept/thermite/compare/v0.4.0...v0.5.0

data/lib/thermite/config.rb

@@ -99,13 +99,12 @@ module Thermite
     #
     # The name of the library compiled by Rust.
     #
+    # Due to the way that Cargo works, all hyphens in library names are replaced with underscores.
+    #
     def library_name
       @library_name ||= begin
-        if toml[:lib] && toml[:lib][:name]
-          toml[:lib][:name]
-        else
-          toml[:package][:name]
-        end
+        base = toml[:lib] && toml[:lib][:name] ? toml[:lib] : toml[:package]
+        base[:name].tr('-', '_') if base[:name]
       end
     end
 

data/lib/thermite/github_release_binary.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 #
-# Copyright (c) 2016 Mark Lee and contributors
+# 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,
@@ -83,7 +83,13 @@ module Thermite
     end
 
     def github_uri
-      @github_uri ||= config.toml[:package][:repository]
+      @github_uri ||= begin
+        unless (repository = config.toml[:package][:repository])
+          raise KeyError, 'No repository found in Config.toml'
+        end
+
+        repository
+      end
     end
 
     def github_download_uri(tag, version)

data/test/lib/thermite/config_test.rb

@@ -41,6 +41,16 @@ module Thermite
       assert_equal 'barbaz', config.library_name
     end
 
+    def test_library_name_from_cargo_lib_has_no_hyphens
+      config.stubs(:toml).returns(lib: { name: 'foo-bar' }, package: { name: 'bar-baz' })
+      assert_equal 'foo_bar', config.library_name
+    end
+
+    def test_library_name_from_cargo_package_has_no_hyphens
+      config.stubs(:toml).returns(lib: {}, package: { name: 'bar-baz' })
+      assert_equal 'bar_baz', config.library_name
+    end
+
     def test_shared_library
       config.stubs(:library_name).returns('foobar')
       config.stubs(:shared_ext).returns('ext')

data/test/lib/thermite/github_release_binary_test.rb

@@ -1,3 +1,23 @@
+# -*- encoding: utf-8 -*-
+# 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/github_release_binary'
@@ -51,9 +71,23 @@ module Thermite
       assert mock_module.download_binary_from_github_release
     end
 
-    def test_download_cargo_version_from_github_release_with_client_error
+    def test_download_cargo_version_from_github_release_with_no_repository
       mock_module(github_releases: true)
       mock_module.config.stubs(:toml).returns(package: { version: '4.5.6' })
+
+      assert_raises KeyError do
+        mock_module.download_binary_from_github_release
+      end
+    end
+
+    def test_download_cargo_version_from_github_release_with_client_error
+      mock_module(github_releases: true)
+      mock_module.config.stubs(:toml).returns(
+        package: {
+          repository: 'test/test',
+          version: '4.5.6'
+        }
+      )
       Net::HTTP.stubs(:get_response).returns(Net::HTTPClientError.new('1.1', 403, 'Forbidden'))
 
       assert !mock_module.download_binary_from_github_release
@@ -61,7 +95,12 @@ module Thermite
 
     def test_download_cargo_version_from_github_release_with_server_error
       mock_module(github_releases: true)
-      mock_module.config.stubs(:toml).returns(package: { version: '4.5.6' })
+      mock_module.config.stubs(:toml).returns(
+        package: {
+          repository: 'test/test',
+          version: '4.5.6'
+        }
+      )
       server_error = Net::HTTPServerError.new('1.1', 500, 'Internal Server Error')
       Net::HTTP.stubs(:get_response).returns(server_error)
 

data/thermite.gemspec

@@ -3,7 +3,7 @@ require 'English'
 
 Gem::Specification.new do |s|
   s.name        = 'thermite'
-  s.version     = '0.8.0'
+  s.version     = '0.9.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.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mark Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake