thermite 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 947e1f3888fa02e99c72dc31814d37588e2e70ab
-  data.tar.gz: 623b3ca4569f631b615af1ae78405e2142b55fa9
+  metadata.gz: f7e1fdf35d72e4e54a4fb1f473bc907cac1369b3
+  data.tar.gz: 587855f223d66731edfcc00ef37c9cf9ef1619a1
 SHA512:
-  metadata.gz: c053764f561253ca63e9bf6fed628a97d7b2afea8819f2cc55039c7ce7f059b86004db47440a95982d24231f6a0752319d864cbfcf3e1b985d1aedbb5ac75523
-  data.tar.gz: 5cbd681ec63085d09863f4c95b3424c046f6fa89e1342c559775005e8ae503f2936a0efe0183a98249c91495e28777cdfbe73235e079df389900c8dca1e98f21
+  metadata.gz: 7360723b5236c7142c5875ef9c695c67eea913bcaa3e532d035fbcdbca634e47ecc5e56807a6c608847c521c9866e94e5fbc4bb4bdccd75174d2974ecd5d0059
+  data.tar.gz: f8189cb6cbee4bd8e7cf523a5327d74a824f7444fdd1c968170617326d7fbc8f0f121249b85712840f21edfa73bb30248d738522e713101b175328f5f356bdd3

data/NEWS.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+### Added
+
+* `github_release_type`, to add `'cargo'` releases via `Cargo.toml` (default) in addition to the
+  existing `'latest'` functionality
+
+### Changed
+
+* `git_tag_format` option introduced in 0.2.0 renamed to `git_tag_regex` - `git_tag_format` is
+  specific to `github_release_type: 'cargo'`, while `git_tag_regex` is specific to
+  `github_release_type: 'latest'`
+
 ## [0.2.0] - 2016-06-30
 
 ### Added

data/README.md

@@ -44,11 +44,19 @@ Possible options:
 * `cargo_project_path` - the path to the Cargo project. Defaults to the current working directory.
 * `github_releases` - whether to look for Rust binaries via GitHub releases when installing
   the gem, and `cargo` is not found. Defaults to `false`.
-* `git_tag_format` - when `github_releases` is enabled, a regular expression (expressed as a
-  `String`) that determines which tagged releases to look for precompiled Rust tarballs. One group
-  must be specified that indicates the version number to be used in the tarball filename. Defaults
-  to `vN.N.N`, where `N` is any n-digit number. In this case, the group is around the
-  entire expression.
+* `github_release_type` - when `github_releases` is `true`, the mode to use to download the Rust
+  binary from GitHub releases. `'cargo'` (the default) uses the version in `Cargo.toml`, along with
+  the `git_tag_format` option (described below) to determine the download URI. `'latest'` takes the
+  latest release matching the `git_tag_regex` option (described below) to determine the download
+  URI.
+* `git_tag_format` - when `github_release_type` is `'cargo'` (the default), the
+  [format string](http://ruby-doc.org/core/String.html#method-i-25) used to determine the tag used
+  in the GitHub download URI. Defaults to `v%s`, where `%s` is the version in `Cargo.toml`.
+* `git_tag_regex` - when `github_releases` is enabled and `github_release_type` is `'latest'`, a
+  regular expression (expressed as a `String`) that determines which tagged releases to look for
+  precompiled Rust tarballs. One group must be specified that indicates the version number to be
+  used in the tarball filename. Defaults to `vN.N.N`, where `N` is any n-digit number. In this case,
+  the group is around the entire expression.
 * `ruby_project_path` - the top-level directory of the Ruby gem's project. Defaults to the
   current working directory.
 

data/lib/thermite/config.rb

@@ -137,18 +137,18 @@ module Thermite
     #
     # The basic semantic versioning format.
     #
-    DEFAULT_TAG_FORMAT = /^(v\d+\.\d+\.\d+)$/
+    DEFAULT_TAG_REGEX = /^(v\d+\.\d+\.\d+)$/
 
     #
     # The format (as a regular expression) that git tags containing Rust binary
     # tarballs are supposed to match. Defaults to `DEFAULT_TAG_FORMAT`.
     #
-    def git_tag_format
-      @git_tag_format ||= begin
-        if @options[:git_tag_format]
-          Regexp.new(@options[:git_tag_format])
+    def git_tag_regex
+      @git_tag_regex ||= begin
+        if @options[:git_tag_regex]
+          Regexp.new(@options[:git_tag_regex])
         else
-          DEFAULT_TAG_FORMAT
+          DEFAULT_TAG_REGEX
         end
       end
     end

data/lib/thermite/github_release_binary.rb

@@ -30,19 +30,46 @@ module Thermite
   #
   module GithubReleaseBinary
     #
-    # Downloads and unpacks the latest binary from GitHub releases, given the target OS
-    # and architecture.
+    # Downloads a Rust binary from GitHub releases, given the target OS and architecture.
     #
     # Requires the `github_releases` option to be `true`. It uses the `repository` value in the
     # project's `Cargo.toml` (in the `package` section) to determine where the releases
     # are located.
     #
+    # If the `github_release_type` is `'latest'`, it will attempt to use the appropriate binary for
+    # the latest version in GitHub releases. Otherwise, it will download the appropriate binary for
+    # the crate version given in `Cargo.toml`.
+    #
     # Returns whether a binary was found and unpacked.
     #
-    def download_latest_binary_from_github_release
+    def download_binary
       return false unless options[:github_releases]
+
+      case options[:github_release_type]
+      when 'latest'
+        download_latest_binary_from_github_release
+      else # 'cargo'
+        download_cargo_version_from_github_release
+      end
+    end
+
+    private
+
+    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))
+        unpack_tarball(tgz)
+        true
+      end
+    end
+
+    #
+    # Downloads and unpacks the latest binary from GitHub releases, given the target OS
+    # and architecture.
+    #
+    def download_latest_binary_from_github_release
       installed_binary = false
-      github_uri = config.toml[:package][:repository]
       each_github_release(github_uri) do |version, download_uri|
         tgz = download_binary_from_github_release(download_uri, version)
         next unless tgz
@@ -54,7 +81,13 @@ module Thermite
       installed_binary
     end
 
-    private
+    def github_uri
+      @github_uri ||= config.toml[:package][:repository]
+    end
+
+    def github_download_uri(tag, version)
+      "#{github_uri}/releases/download/#{tag}/#{config.tarball_filename(version)}"
+    end
 
     def http_get(uri)
       Net::HTTP.get(URI(uri))
@@ -64,12 +97,11 @@ module Thermite
       releases_uri = "#{github_uri}/releases.atom"
       feed = REXML::Document.new(http_get(releases_uri))
       REXML::XPath.each(feed, '//entry/title/text()') do |tag|
-        match = config.git_tag_format.match(tag.to_s)
+        match = config.git_tag_regex.match(tag.to_s)
         next unless match
         version = match[1]
-        download_uri = "#{github_uri}/releases/download/#{tag}/#{config.tarball_filename(version)}"
 
-        yield(version, download_uri)
+        yield(version, github_download_uri(tag, version))
       end
     end
 

data/lib/thermite/tasks.rb

@@ -54,11 +54,20 @@ module Thermite
     #   working directory.
     # * `github_releases` - whether to look for rust binaries via GitHub releases when installing
     #   the gem, and `cargo` is not found. Defaults to `false`.
-    # * `git_tag_format` - when `github_releases` is enabled, a regular expression (expressed as a
-    #   `String`) that determines which tagged releases to look for precompiled Rust tarballs.
-    #   One group must be specified that indicates the version number to be used in the tarball
-    #   filename. Defaults to `vN.N.N`, where `N` is any n-digit number. In this case, the group is
-    #   around the entire expression.
+    # * `github_release_type` - when `github_releases` is `true`, the mode to use to download the
+    #   Rust binary from GitHub releases. `'cargo'` (the default) uses the version in `Cargo.toml`,
+    #   along with the `git_tag_format` option (described below) to determine the download URI.
+    #   `'latest'` takes the latest release matching the `git_tag_regex` option (described below) to
+    #   determine the download URI.
+    # * `git_tag_format` - when `github_release_type` is `'cargo'` (the default), the
+    #   [format string](http://ruby-doc.org/core/String.html#method-i-25) used to determine the
+    #   tag used in the GitHub download URI. Defaults to `v%s`, where `%s` is the version in
+    #   `Cargo.toml`.
+    # * `git_tag_regex` - when `github_releases` is enabled and `github_release_type` is
+    #   `'latest'`, a regular expression (expressed as a `String`) that determines which tagged
+    #   releases to look for precompiled Rust tarballs. One group must be specified that indicates
+    #   the version number to be used in the tarball filename. Defaults to `vN.N.N`, where `N` is
+    #   any n-digit number. In this case, the group is around the entire expression.
     # * `ruby_project_path` - the toplevel directory of the Ruby gem's project. Defaults to the
     #   current working directory.
     #
@@ -97,7 +106,7 @@ module Thermite
           run_cargo_build(target)
           FileUtils.cp(config.rust_path('target', target, config.shared_library),
                        config.ruby_path('lib'))
-        elsif !download_latest_binary_from_github_release
+        elsif !download_binary
           raise cargo_required_msg
         end
       end

data/thermite.gemspec

@@ -3,7 +3,7 @@ require 'English'
 
 Gem::Specification.new do |s|
   s.name        = 'thermite'
-  s.version     = '0.2.0'
+  s.version     = '0.3.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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake