sparsam 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c47d8f62e5244736a0f3e8e0e02f1f0104d3fb41982da0ca598940d2bfb6bc52
-  data.tar.gz: fe43b9eb4b3167adec9d435269a14ab90b08f4518f9c242875555a144fe3a689
+  metadata.gz: 34cdf5f3a73cda371b8a1275369af0063e525d0951f44c23a12e02e6dfa3c519
+  data.tar.gz: f5d7efaf6389491e9ceab33839b828fb26757d8b84b8cc3ba9cf87b509716e13
 SHA512:
-  metadata.gz: a62b9bc043e205badb26495651e918b6ff14c6ab3574b2fbf5cbdc00ca61cd1f1bbd7f44ea18ebd40673bde1fffbff57e981cd3db532ffba43451b7e8d71e3b5
-  data.tar.gz: 6d6454f006da2089124019b176d5e916b2a1ff77ff67731601e18cf64275f224afc234b9bd27a5d10ff687992163743bcf804b153cc00526d51155786eb77171
+  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'

data/ext/ruby_hooks.c

@@ -1,7 +1,7 @@
-#include "stdio.h"
 #include <ruby.h>
 #include <ruby/intern.h>
 #include "serializer.h"
+#include "stdio.h"
 
 VALUE Sparsam = Qnil;
 VALUE static_zero_array;
@@ -11,10 +11,10 @@ ID intern_for_DEFAULT_VALUES;
 ID intern_for_assign_defaults;
 ID intern_for_assign_from_arg;
 
-static void deallocate(void *data) { serializer_free(data); }
+static void deallocate(void* data) { serializer_free(data); }
 
 static VALUE allocate(VALUE klass) {
-  void *data = serializer_create();
+  void* data = serializer_create();
   return Data_Wrap_Struct(klass, NULL, deallocate, data);
 }
 
@@ -24,8 +24,8 @@ static VALUE sparsam_init_bang(VALUE self) {
 }
 
 static VALUE initialize(VALUE self, VALUE type_arg, VALUE str_arg) {
-  void *self_data = NULL;
-  void *input_string = NULL;
+  void* self_data = NULL;
+  void* input_string = NULL;
 
   Check_Type(type_arg, T_FIXNUM);
   int prot = NUM2INT(type_arg);
@@ -38,7 +38,7 @@ static VALUE initialize(VALUE self, VALUE type_arg, VALUE str_arg) {
     memcpy(input_string, StringValuePtr(str_arg), len);
   }
 
-  Data_Get_Struct(self, void *, self_data);
+  Data_Get_Struct(self, void*, self_data);
   serializer_init(self_data, prot, input_string, len);
 
   return self;
@@ -46,7 +46,8 @@ static VALUE initialize(VALUE self, VALUE type_arg, VALUE str_arg) {
 
 VALUE sparsam_struct_initialize(int argc, VALUE* argv, VALUE self) {
   if (argc > 1) {
-    rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected 0..1)", argc);
+    rb_raise(rb_eArgError,
+             "wrong number of arguments (given %d, expected 0..1)", argc);
   }
 
   VALUE defaults = rb_const_get(rb_obj_class(self), intern_for_DEFAULT_VALUES);
@@ -70,14 +71,16 @@ void Init_sparsam_native() {
   Sparsam = rb_define_module("Sparsam");
   rb_define_singleton_method(Sparsam, "init!", sparsam_init_bang, 0);
   rb_define_singleton_method(Sparsam, "cache_fields", cache_fields, 1);
-  VALUE SparsamSerializer = rb_define_class_under(Sparsam, "Serializer", rb_cObject);
+  VALUE SparsamSerializer =
+      rb_define_class_under(Sparsam, "Serializer", rb_cObject);
   SparsamNativeError =
       rb_define_class_under(Sparsam, "Exception", rb_eStandardError);
   rb_define_alloc_func(SparsamSerializer, allocate);
   rb_define_method(SparsamSerializer, "initialize", initialize, 2);
   rb_define_method(SparsamSerializer, "serialize", serializer_writeStruct, 2);
   rb_define_method(SparsamSerializer, "deserialize", serializer_readStruct, 1);
-  rb_define_method(SparsamSerializer, "deserializeUnion", serializer_readUnion, 1);
+  rb_define_method(SparsamSerializer, "deserializeUnion", serializer_readUnion,
+                   1);
   rb_define_const(Sparsam, "CompactProtocol", INT2FIX(compact));
   rb_define_const(Sparsam, "BinaryProtocol", INT2FIX(binary));
   rb_define_const(Sparsam, "UNION", INT2FIX(t_union));
@@ -90,8 +93,9 @@ void Init_sparsam_native() {
   intern_for_assign_defaults = rb_intern("assign_defaults");
   intern_for_assign_from_arg = rb_intern("assign_from_arg");
 
-
-  VALUE SparsamStructInitialization = rb_define_module_under(Sparsam, "StructInitialization");
-  rb_define_method(SparsamStructInitialization, "initialize", sparsam_struct_initialize, -1);
+  VALUE SparsamStructInitialization =
+      rb_define_module_under(Sparsam, "StructInitialization");
+  rb_define_method(SparsamStructInitialization, "initialize",
+                   sparsam_struct_initialize, -1);
   initialize_constants();
 }