couchbase 1.3.14 → 1.3.15

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDQ4OGNiNDdhYWZhOWNlY2Q0YzZhMTljNTBmZDc5NTkzMTAzMTBmNA==
-  data.tar.gz: !binary |-
-    ZmJhYmIxMmZjNDBjNzYwYzRkN2FmMTc0MTk3YWJjZmQ5YzVlZWEyNQ==
+SHA1:
+  metadata.gz: c0d6efd71b9ea3e23af0bda3f0d50474b85a181f
+  data.tar.gz: 6c85b03195aa54932020062b62c152b214687a27
 SHA512:
-  metadata.gz: !binary |-
-    ZDlmNThjYzgyYmYwOTg0YjA3NjhlZWM3ODA1MTRhMGZhYWFkYWQxNjVlOGU5
-    OWZmNzM3MTAxMjM3ZDFkMzI1ZjViZmQxMWE4OGZjZjczYzdhZTI0MDQzYmE5
-    NDIxMzc5MDUyNjIzYzIzYTk1YWY0MWU4OTRlZTI3ZGRmMzNjYmU=
-  data.tar.gz: !binary |-
-    NWY3ZDEzZWY2MGQ2MWU2NmFjNzQ5OWUwMjkyYTBjMjhjM2YxZjdlODA1NGZl
-    MTRmZTgwY2Q5NTBiMTQ2MWM5ZTU2MzMzYzUxMDY0MDk2YzhmODJlMzE5NjY1
-    ODlmY2NhYjU5Mjc2Zjg4NDk1MzVhOGM0MzE1NDA1ZmQyNmRhMTM=
+  metadata.gz: 2e99d16e7b3ebc8ff8ffa48599646fcb603b3d6adef03357bfc83ed7535af569d8b6b07cf2ebf8135eef846c0fc2ad9114902a6b66b6a11a524f03d37fcfab33
+  data.tar.gz: '019a289e770897a58d3c48fefede1bbcd3d23e7119efe8d0fc83a2ef52b59e6d714db4c962088f1547144c0b8a249b1e045852f7e0354025653fa241421000ea'

data/couchbase.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.version     = Couchbase::VERSION
   s.author      = 'Couchbase'
   s.email       = 'support@couchbase.com'
-  s.license     = 'ASL-2'
+  s.license     = 'Apache-2.0'
   s.homepage    = 'http://couchbase.org'
   s.summary     = %q{Couchbase ruby driver}
   s.description = %q{The official client library for use with Couchbase Server.}

data/ext/couchbase_ext/arguments.c

@@ -17,6 +17,7 @@
 
 #include "couchbase_ext.h"
 
+
 #define _alloc_data_for_s(type, _type, size, items, ptr) do {\
     lcb_size_t ii; \
     \

data/ext/couchbase_ext/couchbase_ext.h

@@ -17,26 +17,28 @@
 #ifndef COUCHBASE_EXT_H
 #define COUCHBASE_EXT_H
 
+#include "couchbase_config.h"
+
+#if defined(_WIN32) && defined(__cplusplus)
+#define __STDC_LIMIT_MACROS
+#include <cstdint>
+#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #include <ruby.h>
 #ifndef RUBY_ST_H
 #include <st.h>
 #endif
 
-#ifdef HAVE_RUBY_THREAD_H
-#include <ruby/thread.h>
-#endif
-
-#include "couchbase_config.h"
 #if defined(HAVE_RB_FIBER_YIELD) && !defined(_WIN32)
 #define BUILD_EVENTMACHINE_PLUGIN
 #endif
-#if defined(_WIN32) && defined(__cplusplus)
-#define __STDC_LIMIT_MACROS
-#include <cstdint>
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
+#ifdef HAVE_RUBY_THREAD_H
+#include <ruby/thread.h>
 #endif
+
 #ifndef HAVE_GETHRTIME
 typedef uint64_t hrtime_t;
 extern hrtime_t gethrtime(void);

data/ext/couchbase_ext/extconf.rb

@@ -172,7 +172,7 @@ end
 have_library('couchbase', 'lcb_iops_wire_bsd_impl2(NULL, 0)', 'libcouchbase/couchbase.h') || die(install_notice)
 have_header('mach/mach_time.h')
 have_header('stdint.h') || die('Failed to locate stdint.h')
-have_header('sys/time.h')
+have_header('sys/time.h') unless RbConfig::CONFIG['target_os'] =~ /mingw32/
 have_header('fcntl.h')
 have_header('sys/socket.h')
 have_header('errno.h')

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = '1.3.14'
+  VERSION = '1.3.15'
 end

data/tasks/compile.rake

@@ -22,7 +22,7 @@ def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../../couchbase.gemspec', __FILE__)))
 end
 
-version_router = lambda do |t|
+version_router = proc do |t|
   File.open(t.name, 'wb') do |f|
     f.write <<-RUBY
       require "couchbase/\#{RUBY_VERSION.sub(/\\.\\d+$/, '')}/couchbase_ext"
@@ -54,11 +54,10 @@ class Platform
   end
 end
 
-recent = '2.0.0-p353'
 CROSS_PLATFORMS = [
-  Platform.new(:name => 'x64-mingw32', :host => 'x86_64-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0)),
-  Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0))
-]
+  Platform.new(name: 'x64-mingw32', host: 'x86_64-w64-mingw32', versions: %w(2.4.0 2.3.0 2.2.2 2.1.6 2.0.0-p645)),
+  Platform.new(name: 'x86-mingw32', host: 'i686-w64-mingw32', versions: %w(2.4.0 2.3.0 2.2.2 2.1.6 2.0.0-p645))
+].freeze
 
 # Setup compile tasks.  Configuration can be passed via ENV.
 # Example:
@@ -72,13 +71,11 @@ CROSS_PLATFORMS = [
 Rake::ExtensionTask.new('couchbase_ext', gemspec) do |ext|
   ext.cross_compile = true
   ext.cross_platform = ENV['TARGET']
-  if ENV['RUBY_CC_VERSION']
-    ext.lib_dir = 'lib/couchbase'
-  end
+  ext.lib_dir = 'lib/couchbase' if ENV['RUBY_CC_VERSION']
   ext.cross_compiling do |spec|
     spec.files.delete('lib/couchbase/couchbase_ext.so')
-    spec.files.push('lib/couchbase_ext.rb', Dir['lib/couchbase/*/couchbase_ext.so'])
-    spec.files.push(Dir['lib/couchbase/*/couchbase_ext.so'])
+    spec.files.push('lib/couchbase_ext.rb')
+    spec.files.push(*Dir['lib/couchbase/*/couchbase_ext.so'])
     file "#{ext.tmp_dir}/#{ext.cross_platform}/stage/lib/couchbase_ext.rb", &version_router
   end
 
@@ -104,7 +101,7 @@ require 'mini_portile'
 require 'rake/extensioncompiler'
 
 class MiniPortile
-  alias_method :cook_without_checkpoint, :cook
+  alias cook_without_checkpoint cook
   def cook
     checkpoint = "ports/.#{name}-#{version}-#{host}.installed"
     return if File.exist?(checkpoint)
@@ -137,7 +134,7 @@ task 'package:windows' => ['package', 'lib/couchbase_ext.rb'] do
     ENV['TARGET'] = platform.name
     rm_rf('tmp/ ports/')
     mkdir_p('ports')
-    recipe = MiniPortile.new('libcouchbase', '2.5.3')
+    recipe = MiniPortile.new('libcouchbase', '2.7.0')
     recipe.host = platform.host
     recipe.files << "http://packages.couchbase.com/clients/c/libcouchbase-#{recipe.version}.tar.gz"
     recipe.configure_options.push('--disable-cxx',
@@ -146,11 +143,11 @@ task 'package:windows' => ['package', 'lib/couchbase_ext.rb'] do
     recipe.cook
     recipe.activate
     platform.each_version do |long, short|
-      sh("env RUBY_CC_VERSION=#{short} RBENV_VERSION=#{long} rbenv exec rake cross compile")
+      sh("env RUBY_CC_VERSION=#{short} rake cross compile")
     end
     vars.each do |k, v|
       ENV[k] = v
     end
-    sh("env RUBY_CC_VERSION=#{platform.short_versions.join(':')} RBENV_VERSION=#{recent} rbenv exec rake cross native gem")
+    sh("env RUBY_CC_VERSION=#{platform.short_versions.join(':')} rake cross native gem")
   end
 end

metadata

@@ -1,203 +1,203 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
 platform: ruby
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The official client library for use with Couchbase Server.
@@ -207,9 +207,9 @@ extensions:
 - ext/couchbase_ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CONTRIBUTING.markdown
 - Gemfile
 - LICENSE
@@ -300,7 +300,7 @@ files:
 - test/test_version.rb
 homepage: http://couchbase.org
 licenses:
-- ASL-2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -308,41 +308,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Couchbase ruby driver
-test_files:
-- test/profile/.gitignore
-- test/profile/Gemfile
-- test/profile/benchmark.rb
-- test/setup.rb
-- test/test_arithmetic.rb
-- test/test_async.rb
-- test/test_bucket.rb
-- test/test_cas.rb
-- test/test_couchbase.rb
-- test/test_couchbase_connection_pool.rb
-- test/test_couchbase_rails_cache_store.rb
-- test/test_delete.rb
-- test/test_errors.rb
-- test/test_eventmachine.rb
-- test/test_format.rb
-- test/test_get.rb
-- test/test_stats.rb
-- test/test_store.rb
-- test/test_timer.rb
-- test/test_touch.rb
-- test/test_unlock.rb
-- test/test_utils.rb
-- test/test_version.rb
+test_files: []