couchbase 1.3.14-x86-mingw32 → 1.3.15-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d30afb95ed40c595f302204969fefbe6d01d1da
-  data.tar.gz: 653f63e827b25d001df6a3e01e1ac0c0302ab675
+  metadata.gz: e7026598ae66e81e8ebd1b7dfceda7a597238733
+  data.tar.gz: 211f2f968d214e762b6b01bd70f0f4ea99667d22
 SHA512:
-  metadata.gz: 5c42b5664fae4fab3e4ba1318d7bb75dd77ee44512501d44d6388dcec18a6611a2e75cd799356249682e170309000c72d34e12758d682099d1f866a0b11d1807
-  data.tar.gz: 194a05df4372ff72257da152e82bb95e895556bc82c426cdf48893603b40597243c9cd18fa6b96f0c1593c8161e21fc160be1078ef5260b0701278e0a991580d
+  metadata.gz: bc183b1520f75ede12fb0267124bf0775d4b53c15552d8c1f12ebcae8376a483aa14f6c62a9660b69e2b659d51189757ea860caa83e651606e18e333ab55368e
+  data.tar.gz: '065128663ce3efc8fd4079c2843c919e406b3882b5a6743e7738234ecfb806572dfa1f69c840b0a3b90146af66cf6410c3f77b6907685821512d85b4441b3b7a'

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
 platform: x86-mingw32
 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
@@ -257,9 +257,11 @@ files:
 - lib/action_dispatch/middleware/session/couchbase_store.rb
 - lib/active_support/cache/couchbase_store.rb
 - lib/couchbase.rb
-- lib/couchbase/1.9/couchbase_ext.so
 - lib/couchbase/2.0/couchbase_ext.so
 - lib/couchbase/2.1/couchbase_ext.so
+- lib/couchbase/2.2/couchbase_ext.so
+- lib/couchbase/2.3/couchbase_ext.so
+- lib/couchbase/2.4/couchbase_ext.so
 - lib/couchbase/bucket.rb
 - lib/couchbase/cluster.rb
 - lib/couchbase/connection_pool.rb
@@ -303,7 +305,7 @@ files:
 - test/test_version.rb
 homepage: http://couchbase.org
 licenses:
-- ASL-2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -313,7 +315,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -321,31 +326,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+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: []