couchbase-jruby-model 0.1.0-java → 0.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8593657f00069e9c81f94cee9e61f5c0042a2feb
-  data.tar.gz: a07ff9ff2b95fa68862932a82c909779d6c330fc
+  metadata.gz: 8e2345b2e7a2ccbf80591d61f657c9f177ab1e3f
+  data.tar.gz: 5fd51b30461a58bef0e65b16fad0882d8e436246
 SHA512:
-  metadata.gz: a266fbd9fd7e762f7ce3a86ba4cae0fa793e50d13024d5b78060093f5ac6299407010deb9f06d8039f7668faa8932ae1e12dc691a82c8185fe7d26d0392b7930
-  data.tar.gz: a250ab271e7f162b5bcd73e467636383a4a9b51d57c22c69fc7ffea19c5dade0fbe39e38a8bdfad4f0090fd77e579dca2d5fc3c8200b1d9fc03c8c7cac3eda02
+  metadata.gz: d3cf894a10e755286545346a532fe3a237932b7cc499b9113fe1a145d1eed27d85e8e4bab2014b2a66cc96854aeddd4733007ae3be18748668a582fb6a4df231
+  data.tar.gz: 3524ce4467da9db06adca8d32e739ed1809f920edbb7dc02520da217225516ea1c72d17640b4d2c61564cc874e0c9feb9e1c6b14cd14fdfdf8bd6672132d01df

data/couchbase-jruby-model.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'couchbase-jruby-client', '~> 0.1.4'
+  s.add_runtime_dependency 'couchbase-jruby-client', '~> 0.1.8'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'
-  s.add_development_dependency 'activesupport'
-  s.add_development_dependency 'activemodel'
+  s.add_development_dependency 'activesupport', '>= 4.0.2'
+  s.add_development_dependency 'activemodel',   '>= 4.0.2'
+  s.add_development_dependency 'pry'
 end

data/lib/couchbase/model/version.rb

@@ -19,7 +19,7 @@ module Couchbase
 
   class Model
 
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 
   end
 

data/tasks/test.rake

@@ -19,7 +19,7 @@ require 'rake/testtask'
 require 'rake/clean'
 
 rule 'test/CouchbaseMock.jar' do |task|
-  jar_path = "0.5-SNAPSHOT/CouchbaseMock-0.5-20120726.220757-19.jar"
+  jar_path = "0.6-SNAPSHOT/CouchbaseMock-0.6-20130903.160518-3.jar"
   sh %{wget -q -O test/CouchbaseMock.jar http://files.couchbase.com/maven2/org/couchbase/mock/CouchbaseMock/#{jar_path}}
 end
 

data/test/setup.rb

@@ -21,6 +21,7 @@ require 'couchbase/model'
 
 require 'socket'
 require 'open-uri'
+require 'pry'
 
 class CouchbaseServer
   attr_accessor :host, :port, :num_nodes, :buckets_spec
@@ -30,7 +31,7 @@ class CouchbaseServer
   end
 
   def initialize(params = {})
-    @host, @port = ['localhost', 8091] #ENV['COUCHBASE_SERVER'].split(':')
+    @host, @port = ENV['COUCHBASE_SERVER'].split(':')
     @port = @port.to_i
 
     if @host.nil? || @host.empty? || @port == 0
@@ -57,7 +58,11 @@ class CouchbaseServer
   def stop; end
 end
 
+require 'java'
+require "#{File.dirname(__FILE__)}/CouchbaseMock.jar"
+
 class CouchbaseMock
+
   Monitor = Struct.new(:pid, :client, :socket, :port)
 
   attr_accessor :host, :port, :buckets_spec, :num_nodes, :num_vbuckets
@@ -67,9 +72,9 @@ class CouchbaseMock
   end
 
   def initialize(params = {})
-    @host = '127.0.0.1'
-    @port = 0
-    @num_nodes = 10
+    @host = 'localhost'
+    @port = 8091
+    @num_nodes = 1
     @num_vbuckets = 4096
     @buckets_spec = 'default:'  # "default:,protected:secret,cache::memcache"
     params.each do |key, value|
@@ -82,29 +87,13 @@ class CouchbaseMock
   end
 
   def start
-    @monitor = Monitor.new
-    @monitor.socket = TCPServer.new(nil, 0)
-    @monitor.socket.listen(10)
-    _, @monitor.port, _, _ = @monitor.socket.addr
-    trap('CLD') do
-      puts 'CouchbaseMock.jar died unexpectedly during startup'
-      exit(1)
-    end
-    @monitor.pid = fork
-    if @monitor.pid.nil?
-      rc = exec(command_line("--harakiri-monitor=:#{@monitor.port}"))
-    else
-      trap('CLD', 'SIG_DFL')
-      @monitor.client, _ = @monitor.socket.accept
-      @port = @monitor.client.recv(100).to_i
-    end
+    @mock = Java::OrgCouchbaseMock::CouchbaseMock.new(@host, @port, @num_nodes, @num_vbuckets, @buckets_spec)
+    @mock.start
+    @mock.waitForStartup
   end
 
   def stop
-    @monitor.client.close
-    @monitor.socket.close
-    Process.kill('TERM', @monitor.pid)
-    Process.wait(@monitor.pid)
+    @mock.stop
   end
 
   def failover_node(index, bucket = 'default')
@@ -114,26 +103,13 @@ class CouchbaseMock
   def respawn_node(index, bucket = 'default')
     @monitor.client.send("respawn,#{index},#{bucket}", 0)
   end
-
-  protected
-
-  def command_line(extra = nil)
-    cmd = "java -jar #{File.dirname(__FILE__)}/CouchbaseMock.jar"
-    cmd << " --host #{@host}" if @host
-    cmd << " --port #{@port}" if @port
-    cmd << " --nodes #{@num_nodes}" if @num_nodes
-    cmd << " --vbuckets #{@num_vbuckets}" if @num_vbuckets
-    cmd << " --buckets #{@buckets_spec}" if @buckets_spec
-    cmd << " #{extra}"
-    cmd
-  end
 end
 
 class MiniTest::Unit::TestCase
 
   def start_mock(params = {})
     mock = nil
-    if true # ENV['COUCHBASE_SERVER']
+    if ENV['COUCHBASE_SERVER']
       mock = CouchbaseServer.new(params)
       if (params[:port] && mock.port != params[:port]) ||
         (params[:host] && mock.host != params[:host]) ||
@@ -163,6 +139,9 @@ class MiniTest::Unit::TestCase
   end
 
   def uniq_id(*suffixes)
-    [caller.first[/.*[` ](.*)'/, 1], suffixes].join('_')
+    test_id = [caller.first[/.*[` ](.*)'/, 1], suffixes].compact.join('_')
+    @ids ||= {}
+    @ids[test_id] ||= Time.now.to_f
+    [test_id, @ids[test_id]].join('_')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-model
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: java
 authors:
 - Couchbase
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase-jruby-client
@@ -17,12 +17,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.8
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.8
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -59,16 +59,30 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: activemodel
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='