or-tools 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1775ae46a18be137ae64fce870d29c17c3ae385c61f295f79d7ded40ed0be0bd
-  data.tar.gz: 28262f8b77a8dd0dc085e16a261005a47e1352d8f9f5c148ed524c348daec8db
+  metadata.gz: '018061d137668676a2aca20c0ea0b1bbf01cfb19e02e0f7a532e9e4d800fb735'
+  data.tar.gz: 05e1f19947935d6ccf13c551cbf24cccd4fe3aa989d9bbbb31612c15837eb837
 SHA512:
-  metadata.gz: 771d9a78ace00ce16d8f5e71f595a4523fd8613c81b8e09691d231cb1e7881ce94e8cdd0e21dd60168a58d40e0135891988cfc47fac33d511b551cf932819bae
-  data.tar.gz: 5231109d9afb080481f608bd784b3e86cdfc0b336f828d9fad714b5fa37eda0c4f02495e3718eeb9b0c05135b5b344a7084df55c7f26674ef2e73653ad7d8a3d
+  metadata.gz: 4c32d4c6171f9c67011c4be7ec730583b1ea81cff00ab4ef865185b42fc5b0b7f843305e8bad31bcf22ad054fc0f7813e4d2ef84d0416bf42612c91800df699d
+  data.tar.gz: e13cb7b42a02d010f733e7f1b12d36fc79abf1718c3a8064b5d2d97d63b93f6e80c73f54743d6a290856d014c5f6a1141328e671c78fc9679a543fcc178ee2d5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.1 (2022-01-22)
+
+- Added installation instructions for Mac ARM
+- Removed dependency on `lsb_release` for binary installation on Linux
+
 ## 0.6.0 (2021-12-16)
 
 - Updated OR-Tools to 9.2

data/README.md

@@ -12,7 +12,7 @@ Add this line to your application’s Gemfile:
 gem 'or-tools'
 ```
 
-Installation can take a few minutes as OR-Tools downloads and builds.
+Installation can take a few minutes as OR-Tools downloads and builds. For Mac ARM, also follow [these instructions](#additional-instructions).
 
 ## Higher Level Interfaces
 
@@ -2201,6 +2201,17 @@ possible_tables.each do |table|
 end
 ```
 
+## Additional Instructions
+
+### Mac ARM
+
+ARM binaries are not available for Mac yet, so use Homebrew to install OR-Tools before installing the gem.
+
+```sh
+brew install or-tools
+bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
+```
+
 ## History
 
 View the [changelog](https://github.com/ankane/or-tools-ruby/blob/master/CHANGELOG.md)

data/ext/or-tools/vendor.rb

@@ -1,3 +1,4 @@
+require "csv"
 require "digest"
 require "fileutils"
 require "net/http"
@@ -6,27 +7,46 @@ require "tmpdir"
 version = "9.2.9972"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
-  filename = "or-tools_MacOsX-12.0.1_v#{version}.tar.gz"
-  checksum = "796791a8ef84507d62e193e647cccb1c7725dae4f1474476e1777fe4a44ee3e0"
+  if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
+    raise <<~MSG
+      Binary installation not available for this platform: Mac ARM
+
+      Run:
+      brew install or-tools
+      bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
+
+    MSG
+  else
+    filename = "or-tools_MacOsX-12.0.1_v#{version}.tar.gz"
+    checksum = "796791a8ef84507d62e193e647cccb1c7725dae4f1474476e1777fe4a44ee3e0"
+  end
 else
-  os = %x[lsb_release -is].chomp rescue nil
-  os_version = %x[lsb_release -rs].chomp rescue nil
-  if os == "Ubuntu" && os_version == "20.04"
+  # try /etc/os-release with fallback to /usr/lib/os-release
+  # https://www.freedesktop.org/software/systemd/man/os-release.html
+  os_filename = File.exist?("/etc/os-release") ? "/etc/os-release" : "/usr/lib/os-release"
+
+  # for safety, parse rather than source
+  os_info = CSV.read(os_filename, col_sep: "=").to_h rescue {}
+
+  os = os_info["ID"]
+  os_version = os_info["VERSION_ID"]
+
+  if os == "ubuntu" && os_version == "20.04"
     filename = "or-tools_amd64_ubuntu-20.04_v#{version}.tar.gz"
     checksum = "985e3036eaecacfc8a0258ec2ebef429240491577d4e0896d68fc076e65451ec"
-  elsif os == "Ubuntu" && os_version == "18.04"
+  elsif os == "ubuntu" && os_version == "18.04"
     filename = "or-tools_amd64_ubuntu-18.04_v#{version}.tar.gz"
     checksum = "e36406c4fe8c111e1ace0ede9d0787ff0e98f11afd7db9cc074adfd0f55628a6"
-  elsif os == "Debian" && os_version == "11"
+  elsif os == "debian" && os_version == "11"
     filename = "or-tools_amd64_debian-11_v#{version}.tar.gz"
     checksum = "bd49ee916213b2140ab255414d35a28f19dff7caf87632309753d3fc553f85dd"
-  elsif os == "Debian" && os_version == "10"
+  elsif os == "debian" && os_version == "10"
     filename = "or-tools_amd64_debian-10_v#{version}.tar.gz"
     checksum = "b152fee584f0c8228fe2ff21b74c789870ff9b7064e42ca26305c6b5653f0064"
-  elsif os == "CentOS" && os_version == "8"
+  elsif os == "centos" && os_version == "8"
     filename = "or-tools_amd64_centos-8_v#{version}.tar.gz"
     checksum = "66ed4bb800acf92c672f7e68acdf4ea27bbfdb17bbddc02f8326cd55a97305f6"
-  elsif os == "CentOS" && os_version == "7"
+  elsif os == "centos" && os_version == "7"
     filename = "or-tools_amd64_centos-7_v#{version}.tar.gz"
     checksum = "4a5c1b1639a2828cd7e1ba82a574ef37876557b59e8aab8b81811bb750d53035"
   else

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Operations research tools for Ruby