sparsam 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2c1375a7b3b2819de7f3ee0ad85fa964fc86345ab6ae109e18a033be94178c
-  data.tar.gz: f47b19af1fc8810c9e06864a11c6bbfd6b78635c430c9ba2e10d578d4f3f01c4
+  metadata.gz: 34cdf5f3a73cda371b8a1275369af0063e525d0951f44c23a12e02e6dfa3c519
+  data.tar.gz: f5d7efaf6389491e9ceab33839b828fb26757d8b84b8cc3ba9cf87b509716e13
 SHA512:
-  metadata.gz: 978c4060ced319ba2d1a24462d1c3bc917bd42f049ea591f67023631895467df7c1917734b461b9ec7c2f210f014cce5b9cd95a820a74e9d432492c80ec133fa
-  data.tar.gz: 948ae683123165a6e4c85537b252f882fd10e1c6f481b3641799d0635067804aaf47743aecfaca267a764bd2a4ca4ec3495a5a294871e65ab7c953efd8d6d2cb
+  metadata.gz: c2482ca31e496f3e1fb2597eaf7eb8f83e2f5545d7b2f8165840c5b394b4f63ce522bff6c2d18e11287803cc739ad279b97cf45f97efa1bbdd2f29c5594c8fc2
+  data.tar.gz: 62c14e98d040e76fdf6d9a886c0b138e25f0e8b9b901445b000f6c9fed12947c7537749a24f5601fc84d4e920b6b18b816fbcbe946aa525242de57d269698abd

data/ext/extconf.rb

@@ -7,12 +7,70 @@ if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
   $CPPFLAGS += $CXXFLAGS
 end
 
+brew = find_executable('brew')
+
+# Automatically use homebrew to discover thrift package if it is
+# available and not disabled via --disable-homebrew.
+use_homebrew = enable_config('homebrew', brew)
+
+if use_homebrew
+  $stderr.puts "Using #{brew} to locate thrift and boost packages"
+  $stderr.puts '(disable Homebrew integration via --disable-homebrew)'
+
+  thrift_package = with_config('homebrew-thrift-package', 'thrift@0.9')
+  $stderr.puts "looking for Homebrew thrift package '#{thrift_package}'"
+  $stderr.puts '(change Homebrew thrift package name via --with-homebrew-thrift-package=<package>)'
+
+  thrift_prefix = `#{brew} --prefix #{thrift_package}`.strip
+
+  unless File.exists?(thrift_prefix)
+    $stderr.puts "#{thrift_prefix} does not exist"
+    $stderr.puts "To resolve, `brew install #{thrift_package}` or pass"
+    $stderr.puts '--with-homebrew-thrift-package=<package> to this build to specify'
+    $stderr.puts 'an alternative thrift package to build against. e.g.:'
+    $stderr.puts
+    $stderr.puts '  $ bundle config --global build.sparsam --with-homebrew-thrift-package=mythrift'
+
+    raise "Homebrew package #{thrift_package} not installed"
+  end
+
+  $stderr.puts "using Homebrew thrift at #{thrift_prefix}"
+  $CFLAGS << " -I#{thrift_prefix}/include"
+  $CXXFLAGS << " -I#{thrift_prefix}/include"
+  $CPPFLAGS << " -I#{thrift_prefix}/include"
+  $LDFLAGS << " -L#{thrift_prefix}/lib"
+
+  # Also add boost to the includes search path if it is installed.
+  boost_package = with_config('homebrew-boost-package', 'boost')
+  $stderr.puts "looking for Homebrew boost package '#{boost_package}'"
+  $stderr.puts '(change Homebrew boost package name via --with-homebrew-boost-package=<package>)'
+
+  boost_prefix = `#{brew} --prefix #{boost_package}`.strip
+
+  if File.exists?(boost_prefix)
+    $stderr.puts("using Homebrew boost at #{boost_prefix}")
+    $CFLAGS << " -I#{boost_prefix}/include"
+    $CXXFLAGS << " -I#{boost_prefix}/include"
+    $CPPFLAGS << " -I#{boost_prefix}/include"
+  else
+    $stderr.puts 'Homebrew boost not found; assuming boost is in default search paths'
+  end
+end
+
 have_func("strlcpy", "string.h")
-have_library("thrift")
+
+unless have_library("thrift")
+  raise 'thrift library not found; aborting since compile would fail'
+end
+
 libs = ['-lthrift']
 
 libs.each do |lib|
   $LOCAL_LIBS << "#{lib} "
 end
 
+# Ideally we'd validate boost as well. But boost is header only and
+# mkmf's have_header() doesn't work with C++ headers.
+# https://bugs.ruby-lang.org/issues/4924
+
 create_makefile 'sparsam_native'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparsam
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Airbnb Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Apache Thrift