thermite 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e1fdf35d72e4e54a4fb1f473bc907cac1369b3
-  data.tar.gz: 587855f223d66731edfcc00ef37c9cf9ef1619a1
+  metadata.gz: 1fdbea9d416375c6831c8dc80d9966cb6cf20eea
+  data.tar.gz: a2029b606d18db0b23dc9a3c34f894af351d3d75
 SHA512:
-  metadata.gz: 7360723b5236c7142c5875ef9c695c67eea913bcaa3e532d035fbcdbca634e47ecc5e56807a6c608847c521c9866e94e5fbc4bb4bdccd75174d2974ecd5d0059
-  data.tar.gz: f8189cb6cbee4bd8e7cf523a5327d74a824f7444fdd1c968170617326d7fbc8f0f121249b85712840f21edfa73bb30248d738522e713101b175328f5f356bdd3
+  metadata.gz: e3a6cd74b197901582b2e04ef4a99eabea6b9a636712fcaee488c402f7f6e46a6f89043af8ab9d54e2c75b112686750d347af2688a606079848df2d31dee5b06
+  data.tar.gz: ec981b8bc75da63d8deedf273d2c4df8bc18c69dc027ef681eb478ee75c8982185168976ef97c97f3fdb72279be4a93ea9c0f2457c8ec5f780e56db2fe3933e8

data/.travis.yml

@@ -4,3 +4,10 @@ rvm:
 - 2.2.5
 - 2.3.1
 cache: bundler
+after_success: ci/after_success.py
+env:
+  global:
+  # TRAVIS_TOKEN
+  - secure: Ia4faKtCVBGN6z5jFrnBsCJX/Hg3Hs+pGll+lczDE+UFM0Io7LT/upQdre5JUftM0IiynwCw/XS4dz6h/ZZWS28pSFm12NvHHmO22NAaX/xQjKvBhWz8OblnNjybPNSdt0bBa4XnssW7SiPSH5moO3PEnRfbaVrAppHWw+VL0449RnFwu33J9663Gvsf48cE9f3ZeX/NUowqe9Gr3Y1edKsE5btK2vgW+VrwCCbf3PIF60SveClcivB823IrjHsBN76n8C6/Hx6zngZXYN8GfBN5c9JGMP9UP0fSE81jqmDo2poX1MdVch3kf3ylllOrOP/Z5hzZ3aYv+sOTDR68si+sLx1mlrY8ImX6sK/uDbGx0CYOGvmZO9OqREOBEBLg98KQAOsdxIXe2CTfUSQbj7pVppba72tTVqPrM8mroEIl+Dk6rPB5x0makMj1xQ8UyyyCgsiEcfkRrUjefPBIw5aczxXGoqg+SEnRdqQu94z5V0UeGtbZ2BqBuP6E/XINr90nm9fmpI2nDgMde8MCjPfHz8nbXM/l/1nkQ4l7d0Dob+vUZtTwr4CBW1oWp4w46Iv0mBSr5js0b7fhh95rMN1/CYZaaNsraXnqACsP70WRMBuHSDZ6mk4DQG0D7BjIckt/GplUoo3I7Z5tPjBgejk+VhoLdQGAu9CGutSGkTk=
+  # APPVEYOR_TOKEN
+  - secure: Qvw49LusnruOfYYL0SpcV3PhK1Fm15y9wtZK+YEscvkNw6LZ+xziD+1+f2nuR+zQkHmG/izqpA+NMoGqJvB8JsI+8N6S7YORJJ5e/TVjVq7voQXohNRMldUPn38IIVfBSR8Wzmqw7t+g7Eg6WWnbiRHO7RGlHuGwLeG4Cgl9gPNYt9gZpuditAIk/jmuOaTMbp4gRB02CERIMInrH8+52fcAWJCTQzLecD116c33xa3LUCC1hS49Wu6ku0O8OsuOAcpWTUuxAhScdCSYf8iy7WP83mNkbuIPN8OsOz6wS0pO1cJ5opdIvDWNPnYinhVOXbyP1FEXj5GtlDzt+5eIslp3BBAf90czc/TpYQS+9HBXZTD81l0xslneC/eAc0/bPlF98qLdhPByAZpjJFHM1tiijFVyIzqHLNXL4c2NUcOZONquCwKkroyL/Ze2w7pwttP8hC5TUEoRexMgE3ULAPKITKSmkrq2UxRdRB4Ln6uXaK5zfxLfJOgwqmcD7W/34pfQ/X+f/wymEYG2FwORewGVH//UtYklN6J8ivQDmJ1eyECSJmfHWgKWX729pfAuKLkc+iVOvZZ736plcN2GbmznyplevhjScaBpZHzjF1Iz/A7JEJHYoQIdecn67iIY2p5ULKklBJP8vqrI24YqtNl4Ly/8/kRn0DjyPVauQ1o=

data/NEWS.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## [0.4.0] - 2016-07-12
+
+### Added
+
+* Write debug output to file, if the `THERMITE_DEBUG_FILENAME` environment variable is set
+
+### Changed
+
+* Relaxed rake version requirement
+* Ruby version (major + minor) is considered when generating tarball names
+
+### Fixed
+
+* The library path in the generated tarballs is relative
+
+## [0.3.0] - 2016-07-03
+
 ### Added
 
 * `github_release_type`, to add `'cargo'` releases via `Cargo.toml` (default) in addition to the
@@ -32,5 +49,7 @@
 
 Initial release.
 
+[0.4.0]: https://github.com/malept/thermite/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/malept/thermite/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/malept/thermite/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/malept/thermite/releases/tag/v0.1.0

data/README.md

@@ -67,6 +67,11 @@ repository contains an example of using Thermite with [ruru](https://github.com/
 to provide a `String.blank?` speedup extension. While the example uses ruru, this gem should be
 usable with any method of integrating Rust and Ruby that you choose.
 
+### Troubleshooting
+
+Debug statements can be written to a file specified by the `THERMITE_DEBUG_FILENAME` environment
+variable.
+
 ## FAQ
 
 ### Why is it named Thermite?

data/ci/after_success.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+import httplib
+import json
+import os
+
+JSON = 'application/json'
+
+def trigger_appveyor_build():
+    payload = {
+        'accountName': 'malept',
+        'projectSlug': 'rusty-blank',
+        'branch': 'master',
+    }
+
+    headers = {
+        'Accept': JSON,
+        'Authorization': 'Bearer {}'.format(os.environ['APPVEYOR_TOKEN']),
+        'Content-Type': JSON,
+    }
+
+    http = httplib.HTTPSConnection('ci.appveyor.com')
+    http.request('POST', '/api/builds', json.dumps(payload), headers)
+    print(http.getresponse().read())
+
+def trigger_travis_build():
+    msg = "Triggered by {}@{} ({})".format(os.environ['TRAVIS_REPO_SLUG'],
+                                           os.environ['TRAVIS_BRANCH'],
+                                           os.environ['TRAVIS_COMMIT'])
+    payload = {
+        "request": {
+            "branch": "master",
+            "message": msg,
+        }
+    }
+
+    headers = {
+        'Accept': JSON,
+        'Authorization': 'token {}'.format(os.environ['TRAVIS_TOKEN']),
+        'Content-Type': JSON,
+        'Travis-Api-Version': '3',
+    }
+
+    http = httplib.HTTPSConnection('api.travis-ci.org')
+    http.request('POST', '/repo/malept%2Frusty_blank/requests', json.dumps(payload), headers)
+    print(http.getresponse().read())
+
+if __name__ == '__main__':
+    if os.environ['TRAVIS_RUBY_VERSION'].startswith('2.3.'):
+        trigger_appveyor_build()
+        trigger_travis_build()

data/lib/thermite/config.rb

@@ -36,6 +36,13 @@ module Thermite
       @options = options
     end
 
+    #
+    # Location to emit debug output, if not `nil`. Defaults to `nil`.
+    #
+    def debug_filename
+      @debug_filename ||= ENV['THERMITE_DEBUG_FILENAME']
+    end
+
     #
     # The file extension of the compiled shared Rust library.
     #
@@ -52,10 +59,13 @@ module Thermite
     end
 
     #
-    # Alias for `RbConfig::CONFIG['target_os']`.
+    # The major and minor version of the Ruby interpreter that's currently running.
     #
-    def target_os
-      @target_os ||= RbConfig::CONFIG['target_os']
+    def ruby_version
+      @ruby_version ||= begin
+        version_info = RbConfig::CONFIG['ruby_version'].split('.')
+        "ruby#{version_info[0]}#{version_info[1]}"
+      end
     end
 
     #
@@ -65,6 +75,13 @@ module Thermite
       @target_arch ||= RbConfig::CONFIG['target_cpu']
     end
 
+    #
+    # Alias for `RbConfig::CONFIG['target_os']`.
+    #
+    def target_os
+      @target_os ||= RbConfig::CONFIG['target_os']
+    end
+
     #
     # The name of the library compiled by Rust.
     #
@@ -94,7 +111,7 @@ module Thermite
     # package `version`.
     #
     def tarball_filename(version)
-      "#{library_name}-#{version}-#{target_os}-#{target_arch}.tar.gz"
+      "#{library_name}-#{version}-#{ruby_version}-#{target_os}-#{target_arch}.tar.gz"
     end
 
     #

data/lib/thermite/github_release_binary.rb

@@ -58,7 +58,9 @@ module Thermite
     def download_cargo_version_from_github_release
       version = config.toml[:package][:version]
       tag = options.fetch(:git_tag_format, 'v%s') % version
-      if (tgz = download_binary_from_github_release(github_download_uri(tag, version), version))
+      uri = github_download_uri(tag, version)
+      if (tgz = download_binary_from_github_release(uri, version))
+        debug "Unpacking GitHub release from Cargo version: #{File.basename(uri)}"
         unpack_tarball(tgz)
         true
       end
@@ -73,6 +75,7 @@ module Thermite
       each_github_release(github_uri) do |version, download_uri|
         tgz = download_binary_from_github_release(download_uri, version)
         next unless tgz
+        debug "Unpacking GitHub release: #{File.basename(download_uri)}"
         unpack_tarball(tgz)
         installed_binary = true
         break
@@ -123,6 +126,7 @@ module Thermite
       tar.each do |entry|
         path = entry.header.name
         next if path.end_with?('/')
+        debug "Unpacking file: #{path}"
         File.open(path, 'wb') do |f|
           f.write(entry.read)
         end

data/lib/thermite/package.rb

@@ -32,7 +32,10 @@ module Thermite
     def build_package
       filename = config.tarball_filename(config.toml[:package][:version])
       tgz = Zlib::GzipWriter.new(File.open(filename, 'wb'))
-      Archive::Tar::Minitar.pack(config.ruby_extension_path, tgz)
+      relative_library_path = config.ruby_extension_path.sub("#{config.ruby_toplevel_dir}/", '')
+      Dir.chdir(config.ruby_toplevel_dir) do
+        Archive::Tar::Minitar.pack(relative_library_path, tgz)
+      end
     end
   end
 end

data/lib/thermite/tasks.rb

@@ -24,6 +24,7 @@ require 'thermite/cargo'
 require 'thermite/config'
 require 'thermite/github_release_binary'
 require 'thermite/package'
+require 'thermite/util'
 
 #
 # Helpers for Rust-based Ruby extensions.
@@ -41,6 +42,7 @@ module Thermite
     include Thermite::Cargo
     include Thermite::GithubReleaseBinary
     include Thermite::Package
+    include Thermite::Util
 
     #
     # The configuration used for the Rake tasks.

data/lib/thermite/util.rb

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+#
+# Copyright (c) 2016 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.
+
+module Thermite
+  #
+  # Utility methods
+  #
+  module Util
+    def debug(msg)
+      # Should probably replace with a Logger
+      if config.debug_filename
+        @debug ||= File.open(config.debug_filename, 'w')
+        @debug.write("#{msg}\n")
+      end
+    end
+  end
+end

data/thermite.gemspec

@@ -3,7 +3,7 @@ require 'English'
 
 Gem::Specification.new do |s|
   s.name        = 'thermite'
-  s.version     = '0.3.0'
+  s.version     = '0.4.0'
   s.summary     = 'Rake helpers for Rust+Ruby'
   s.description = 'A Rake-based helper for building and distributing Rust-based Ruby extensions'
 
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   # Mostly due to tomlrb
   s.required_ruby_version = '>= 2.0.0'
-  s.add_runtime_dependency 'rake', '~> 11'
+  s.add_runtime_dependency 'rake', '>= 10'
   s.add_runtime_dependency 'minitar', '~> 0.5'
   s.add_runtime_dependency 'tomlrb', '~> 1.2'
   s.add_development_dependency 'rdoc', '~> 4.2'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: thermite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -97,11 +97,13 @@ files:
 - NEWS.md
 - README.md
 - Rakefile
+- ci/after_success.py
 - lib/thermite/cargo.rb
 - lib/thermite/config.rb
 - lib/thermite/github_release_binary.rb
 - lib/thermite/package.rb
 - lib/thermite/tasks.rb
+- lib/thermite/util.rb
 - thermite.gemspec
 homepage: https://github.com/malept/thermite
 licenses: