ffi-nats-core 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0739b94d694330a419e7c94ed995d510f2c90873'
-  data.tar.gz: 404c5a0b2384b649053f8825eeec14ec03368e42
+  metadata.gz: 043c01bc38fc465f9821578a42577235e5ab4991
+  data.tar.gz: ed03d81c41b868b9c694800364cd2b0ceef7739c
 SHA512:
-  metadata.gz: 1d49077b5e2bc33b4650ae9dcad9affa2ad56d3f44caaf2cda167284786c15372c1b63454b1652c02bf8e0693b9c6c194326fd70751afd62cb45a16e28c7f2e0
-  data.tar.gz: a281d0491bbee938863efc3a4be445a07b0c12b8cb080f2b7fe4d3c5078c81e5c01a51bd90c49afb359facb1838dd22a00381fc4c5de48cfcb1f74d56072d128
+  metadata.gz: 136c51044e57100eabc6357e48795185058a9006ba057dde970786fb35d6aaccaff4605511cb131b8807b9b27636c0a5cddccc46bc5860cce696f69d5b0b85a0
+  data.tar.gz: 51460c9f09582ef1f9eae1120cee8054150d5a424e3adf91b834a16d991cf72a05787f81f89d4b71e0cc715e8603ed64c4e07490df0981c9bf18c640768e6652

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/cnats"]
+	path = vendor/cnats
+	url = git@github.com:nats-io/cnats.git

data/Rakefile

@@ -1,10 +1,27 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+import "ext/ffi/nats/core/Rakefile"
+
+namespace :cnats do
+  desc "build cnats"
+  task :compile do
+    Rake::Task[:compile_cnats].invoke
+  end
+
+  desc "checkout cnats source"
+  task :checkout do
+    unless ::File.directory?("vendor/cnats/build")
+      sh "git submodule update --init"
+    end
+  end
+end
+Rake::Task["cnats:compile"].prerequisites.insert(0, "cnats:checkout")
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/**/*_test.rb']
 end
+Rake::Task[:test].prerequisites << "cnats:compile"
 
 task :default => :test

data/ext/ffi/nats/core/Rakefile

@@ -0,0 +1,66 @@
+require "rubygems"
+require "fileutils"
+require "ffi"
+
+# Copied fom mkmf
+def find_executable(bin, path = nil)
+  executable_file = proc do |name|
+    begin
+      stat = File.stat(name)
+    rescue SystemCallError
+    else
+      next name if stat.file? and stat.executable?
+    end
+  end
+
+  if File.expand_path(bin) == bin
+    return bin if executable_file.call(bin)
+    return nil
+  end
+  if path ||= ENV['PATH']
+    path = path.split(File::PATH_SEPARATOR)
+  else
+    path = %w[/usr/local/bin /usr/ucb /usr/bin /bin]
+  end
+  file = nil
+  path.each do |dir|
+    return file if executable_file.call(file = File.join(dir, bin))
+  end
+  nil
+end
+
+def sys(cmd)
+  puts " -- #{cmd}"
+  unless ret = system(cmd)
+    raise "ERROR: '#{cmd}' failed"
+  end
+  ret
+end
+
+desc "Build the cnats shared lib"
+task :compile_cnats do
+  # Do not attempt to install if we want to use the system nats lib
+  next if ENV.key?("NATS_USE_SYSTEM_LIB")
+
+  if !find_executable("cmake")
+    abort "ERROR: CMake is required to build ffi-nats-core."
+  end
+
+  CWD = ::File.expand_path(::File.dirname(__FILE__))
+  CNATS_DIR = ::File.join(CWD, "..", "..", "..", "..", "vendor", "cnats")
+
+  ::Dir.chdir(CNATS_DIR) do
+    ::Dir.mkdir("build") unless ::Dir.exists?("build")
+
+    ::Dir.chdir("build") do
+      sys("cmake ..")
+      sys("make nats")
+    end
+  end
+
+  unless ::File.exist?(::File.join(CNATS_DIR, "build", "src", "libnats.#{::FFI::Platform::LIBSUFFIX}"))
+    abort "ERROR: Failed to build nats"
+  end
+end
+
+task :default => :compile_cnats

data/ffi-nats-core.gemspec

@@ -17,13 +17,14 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = "exe"
+  spec.extensions    = "ext/ffi/nats/core/Rakefile"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "ffi"
 
   spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/ffi/nats/core.rb

@@ -27,7 +27,8 @@ module FFI
       begin
         # bias the library discovery to a path inside the gem first, then
         # to the usual system paths
-        inside_gem = File.join(File.dirname(__FILE__), '..', '..', '..', 'ext')
+        gem_base = File.join(File.dirname(__FILE__), '..', '..', '..')
+        inside_gem = File.join(gem_base, 'ext')
         local_path = FFI::Platform::IS_WINDOWS ? ENV['PATH'].split(';') : ENV['PATH'].split(':')
         env_path = [ ENV['NATS_LIB_PATH'] ].compact
         rbconfig_path = RbConfig::CONFIG["libdir"]
@@ -51,9 +52,18 @@ module FFI
         ENV['RUBYOPT'] = rubyopt
 
         # Search for libnats in the following order...
-        NATS_LIB_PATHS = ([inside_gem] + env_path + local_path + [rbconfig_path] + [
-          '/usr/local/lib', '/opt/local/lib', homebrew_path, '/usr/lib64'
-        ]).compact.map{|path| "#{path}/libnats.#{FFI::Platform::LIBSUFFIX}"}
+        nats_lib_paths =
+          if ENV.key?("NATS_USE_SYSTEM_LIB")
+            [inside_gem] + env_path + local_path + [rbconfig_path] + [
+             '/usr/local/lib', '/opt/local/lib', homebrew_path, '/usr/lib64'
+            ]
+          else
+            [File.join(gem_base, "vendor/cnats/build/src")]
+          end
+
+        NATS_LIB_PATHS = nats_lib_paths.
+          compact.map{|path| "#{path}/libnats.#{FFI::Platform::LIBSUFFIX}"}
+
         ffi_lib(NATS_LIB_PATHS + %w{libnats})
 
       rescue LoadError => error

data/lib/ffi/nats/core/version.rb

@@ -1,7 +1,7 @@
 module FFI
   module Nats
     module Core
-      VERSION = "0.2.2"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-nats-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -39,61 +39,64 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
 description: " core ffi bindings for ffi-nats "
 email:
 - brandonsdewitt@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/ffi/nats/core/Rakefile
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- ext/ffi/nats/core/Rakefile
 - ffi-nats-core.gemspec
 - lib/ffi/nats/core.rb
 - lib/ffi/nats/core/version.rb