grpc 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38b1655a47e1edbbd0d48d73e566c37b1c7241dc
-  data.tar.gz: f6a98f39e718c84decc81af8cc6638e8cdac43d9
+  metadata.gz: 221227b572c4b9f61daafa02b2b58360b049af09
+  data.tar.gz: 2e9a6e8f6aef5ef48f1afc87987ecbf53c080301
 SHA512:
-  metadata.gz: 241414922a1e18924af518dba9bb5aa39bf7f526392f911da83c2d94aee5c1d1ae60c6435fef0a45e8dc8098128fc2bc6d8f609434db9944d0164f57ac48dd0b
-  data.tar.gz: 9e85cb271539ab885332570b9b38339a354c087a92b5ebc7a397439a29dc514197f5ef88aa74fa3bb9b04aab5a15a6d5f59314b0c847fa58665dcb664a7d4750
+  metadata.gz: 3b48e42e01ffa5c924308fa0fba2f891b131f94dbf257cdb1b391b46ed7087faeae72b1c1a8e7823cf46c20eedddf5191405b0ef62e8edbf699dd8fc09d8fc01
+  data.tar.gz: 79144378a34d9a4314964faa7735b30b1119ce73fed524b130b3f36fb8d6a764991c2d06bd20fc0dabbacc7db500f3689848e642385f161634feef47d2458f0d

data/ext/grpc/extconf.rb

@@ -32,29 +32,6 @@ require 'mkmf'
 LIBDIR = RbConfig::CONFIG['libdir']
 INCLUDEDIR = RbConfig::CONFIG['includedir']
 
-if ENV.key? 'GRPC_ROOT'
-  GRPC_ROOT = ENV['GRPC_ROOT']
-else
-  grpc_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
-  if File.exist?(File.join(grpc_root, 'include/grpc/grpc.h'))
-    GRPC_ROOT = grpc_root
-  else
-    GRPC_ROOT = nil
-  end
-end
-
-if ENV.key? 'CONFIG'
-  GRPC_CONFIG = ENV['CONFIG']
-else
-  GRPC_CONFIG = 'opt'
-end
-
-if (ENV.key? 'GRPC_LIB_DIR') && (!GRPC_ROOT.nil?)
-  GRPC_LIB_DIR = File.join(GRPC_ROOT, ENV['GRPC_LIB_DIR'])
-else
-  GRPC_LIB_DIR = File.join(File.join(GRPC_ROOT, 'libs'), GRPC_CONFIG)
-end
-
 HEADER_DIRS = [
   # Search /opt/local (Mac source install)
   '/opt/local/include',
@@ -77,12 +54,26 @@ LIB_DIRS = [
   LIBDIR
 ]
 
-unless GRPC_ROOT.nil?
-  HEADER_DIRS.unshift File.join(GRPC_ROOT, 'include')
-  LIB_DIRS.unshift GRPC_LIB_DIR
-  unless File.exist?(File.join(GRPC_LIB_DIR, 'libgrpc.a'))
-    system("make -C #{GRPC_ROOT} static_c CONFIG=#{GRPC_CONFIG}")
+# Check to see if GRPC_ROOT is defined or available
+grpc_root = ENV['GRPC_ROOT']
+if grpc_root.nil?
+  r = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
+  grpc_root = r if File.exist?(File.join(r, 'include/grpc/grpc.h'))
+end
+
+# When grpc_root is available attempt to build the grpc core.
+unless grpc_root.nil?
+  grpc_config = ENV['GRPC_CONFIG'] || 'opt'
+  if ENV.key?('GRPC_LIB_DIR')
+    grpc_lib_dir = File.join(grpc_root, ENV['GRPC_LIB_DIR'])
+  else
+    grpc_lib_dir = File.join(File.join(grpc_root, 'libs'), grpc_config)
+  end
+  unless File.exist?(File.join(grpc_lib_dir, 'libgrpc.a'))
+    system("make -C #{grpc_root} static_c CONFIG=#{grpc_config}")
   end
+  HEADER_DIRS.unshift File.join(grpc_root, 'include')
+  LIB_DIRS.unshift grpc_lib_dir
 end
 
 def crash(msg)

data/grpc.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license       = 'BSD-3-Clause'
 
   s.required_ruby_version = '>= 2.0.0'
-  s.requirements << 'libgrpc ~> 0.6.0 needs to be installed'
+  s.requirements << 'libgrpc ~> 0.9.1 needs to be installed'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")

data/lib/grpc/version.rb

@@ -29,5 +29,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- libgrpc ~> 0.6.0 needs to be installed
+- libgrpc ~> 0.9.1 needs to be installed
 rubyforge_project: 
 rubygems_version: 2.4.3
 signing_key: