or-tools 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a0f8aa2b4faeff8c2a61e3332e6e38aefd9fe725bf70cb8978539a5d154c8da
-  data.tar.gz: 58fe4cdd6c5f533631dc609a86e161efdbe3fc391f88e73a1e196da6bc40726b
+  metadata.gz: 4377b9acdd93be666c700e05fb56cf01e59f088cf149f345ab888ef018c82d04
+  data.tar.gz: f32d95eb857cf479db372f4c0c27b18590bb9137aa72a9b6e478789830b7ea68
 SHA512:
-  metadata.gz: a75cd806954d0b3cff7cbef96ffd4a83b22a6176eb4f5c40261aed09b988c04fa845b6568d5acd5a9ec3b2efe0deb852828e478a075800a5fcbe7a53acc12a42
-  data.tar.gz: 70c9e5c5eff1d0f1f5b6763c3b8bed5a6cada93e3430f46284505336643ff01afc35244ce338452244401ea23c9e417fe353653cc6e6ab071ca76798f6bcc49e
+  metadata.gz: ab952c566d3f84c57cce0b843c27ad6e3fa9c06f4e85b273af2c82564403cd6bb88e8f8ae1d39c21f5732e4d3415729b8d4bd87418a34f0d02c588d816ab9d49
+  data.tar.gz: 95a03e432680341c029e21ae2148385c1628a7df127ea8707991a47d087f37cd5ebb4288518f16b1cfd7c84c03a254c0cf8c26c5c8d574b949c3ed3901ca9cfe

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0 (2020-05-22)
+
+- No longer need to download the OR-Tools C++ library separately on Mac, Ubuntu 18.04, Ubuntu 16.04, Debian 10, and CentOS 8
+
 ## 0.1.5 (2020-04-23)
 
 - Added support for OR-Tools 7.6

data/README.md

@@ -6,18 +6,14 @@
 
 ## Installation
 
-Download the [OR-Tools C++ library](https://developers.google.com/optimization/install/cpp). Then run:
-
-```sh
-bundle config build.or-tools --with-or-tools-dir=/path/to/or-tools
-```
-
 Add this line to your application’s Gemfile:
 
 ```ruby
 gem 'or-tools'
 ```
 
+Installation can take a few minutes as OR-Tools downloads and builds.
+
 ## Getting Started
 
 Linear Optimization
@@ -1951,7 +1947,7 @@ To get started with development:
 git clone https://github.com/ankane/or-tools.git
 cd or-tools
 bundle install
-bundle exec rake compile -- --with-or-tools-dir=/path/to/or-tools
+bundle exec rake compile
 bundle exec rake test
 ```
 

data/ext/or-tools/extconf.rb

@@ -1,6 +1,6 @@
 require "mkmf-rice"
 
-abort "Missing stdc++" unless have_library("stdc++")
+raise "Missing stdc++" unless have_library("stdc++")
 
 $CXXFLAGS << " -std=c++11 -DUSE_CBC"
 
@@ -8,15 +8,28 @@ $CXXFLAGS << " -std=c++11 -DUSE_CBC"
 $CXXFLAGS << " -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-ignored-qualifiers"
 
 inc, lib = dir_config("or-tools")
-
-inc ||= "/usr/local/include"
-lib ||= "/usr/local/lib"
+if inc || lib
+  inc ||= "/usr/local/include"
+  lib ||= "/usr/local/lib"
+  rpath = lib
+else
+  # download
+  require_relative "vendor"
+
+  inc = "#{$vendor_path}/include"
+  lib = "#{$vendor_path}/lib"
+
+  # make rpath relative
+  # use double dollar sign and single quotes to escape properly
+  rpath_prefix = RbConfig::CONFIG["host_os"] =~ /darwin/ ? "@loader_path" : "$$ORIGIN"
+  rpath = "'#{rpath_prefix}/../../tmp/or-tools/lib'"
+end
 
 $INCFLAGS << " -I#{inc}"
 
-$LDFLAGS << " -Wl,-rpath,#{lib}"
+$LDFLAGS << " -Wl,-rpath,#{rpath}"
 $LDFLAGS << " -L#{lib}"
-$LDFLAGS << " -lortools"
+raise "OR-Tools not found" unless have_library("ortools")
 
 Dir["#{lib}/libabsl_*.a"].each do |lib|
   $LDFLAGS << " #{lib}"

data/ext/or-tools/vendor.rb

@@ -0,0 +1,95 @@
+require "digest"
+require "fileutils"
+require "net/http"
+require "tmpdir"
+
+version = "7.6.7691"
+
+if RbConfig::CONFIG["host_os"] =~ /darwin/i
+  filename = "or-tools_MacOsX-10.15.4_v#{version}.tar.gz"
+  checksum = "39e26ba27b4d3a1c194c1478e864cd016d62cf516cd9227a9f23e6143e131572"
+else
+  os = %x[lsb_release -is].chomp rescue nil
+  os_version = %x[lsb_release -rs].chomp rescue nil
+  if os == "Ubuntu" && os_version == "18.04"
+    filename = "or-tools_ubuntu-18.04_v#{version}.tar.gz"
+    checksum = "79ef61dfc63b98133ed637f02e837f714a95987424332e511a3a87edd5ce17dc"
+  elsif os == "Ubuntu" && os_version == "16.04"
+    filename = "or-tools_ubuntu-16.04_v#{version}.tar.gz"
+    checksum = "a25fc94c0f0d16abf1f6da2a054040c21ef3cbf618a831a15afe21bf14f2d1fb"
+  elsif os == "Debian" && os_version == "10"
+    filename = "or-tools_debian-10_v#{version}.tar.gz "
+    checksum = "158c44038aebc42b42b98e8f3733ba83bf230e8a0379803cc48aafbb2f7bdf5a"
+  elsif os == "CentOS" && os_version == "8"
+    filename = "or-tools_centos-8_v#{version}.tar.gz"
+    checksum = "a2b800d4e498561e5b1fe95ee1e64c867be496038883f4f7b199499bf71a0eed"
+  else
+    # there is a binary download for Windows
+    # however, it's compiled with Visual Studio rather than MinGW (which RubyInstaller uses)
+    raise <<~MSG
+      Binary installation not available for this platform.
+
+      Build the OR-Tools C++ library from source, then run:
+      bundle config build.or-tools --with-or-tools-dir=/path/to/or-tools
+
+    MSG
+  end
+end
+
+short_version = version.split(".").first(2).join(".")
+url = "https://github.com/google/or-tools/releases/download/v#{short_version}/#{filename}"
+
+$stdout.sync = true
+
+def download_file(url, download_path)
+  uri = URI(url)
+  location = nil
+
+  Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+    request = Net::HTTP::Get.new(uri)
+    http.request(request) do |response|
+      case response
+      when Net::HTTPRedirection
+        location = response["location"]
+      when Net::HTTPSuccess
+        i = 0
+        File.open(download_path, "wb") do |f|
+          response.read_body do |chunk|
+            f.write(chunk)
+
+            # print progress
+            putc "." if i % 50 == 0
+            i += 1
+          end
+        end
+        puts # newline
+      else
+        raise "Bad response"
+      end
+    end
+  end
+
+  # outside of Net::HTTP block to close previous connection
+  download_file(location, download_path) if location
+end
+
+# download
+download_path = "#{Dir.tmpdir}/#{filename}"
+unless File.exist?(download_path)
+  puts "Downloading #{url}..."
+  download_file(url, download_path)
+end
+
+# check integrity - do this regardless of if just downloaded
+download_checksum = Digest::SHA256.file(download_path).hexdigest
+raise "Bad checksum: #{download_checksum}" if download_checksum != checksum
+
+# extract - can't use Gem::Package#extract_tar_gz from RubyGems
+# since it limits filenames to 100 characters (doesn't support UStar format)
+path = File.expand_path("../../tmp/or-tools", __dir__)
+FileUtils.mkdir_p(path)
+tar_args = Gem.win_platform? ? ["--force-local"] : []
+system "tar", "zxf", download_path, "-C", path, "--strip-components=1", *tar_args
+
+# export
+$vendor_path = path

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -93,6 +93,7 @@ files:
 - README.md
 - ext/or-tools/ext.cpp
 - ext/or-tools/extconf.rb
+- ext/or-tools/vendor.rb
 - lib/or-tools.rb
 - lib/or_tools/bool_var.rb
 - lib/or_tools/comparison.rb
@@ -100,7 +101,6 @@ files:
 - lib/or_tools/cp_model.rb
 - lib/or_tools/cp_solver.rb
 - lib/or_tools/cp_solver_solution_callback.rb
-- lib/or_tools/ext.bundle
 - lib/or_tools/int_var.rb
 - lib/or_tools/knapsack_solver.rb
 - lib/or_tools/linear_expr.rb