roma-client 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9bf98250d1cdace281868bb804e5b6ff0f8967ba
+  data.tar.gz: b509fa06dc3c6e732a0f3c472c5641f93ee0dff4
+SHA512:
+  metadata.gz: 6df5d76cfb1a9ff408fc930a0b33b883a558a8da3764cb483914430cf064cb08d95b39c9312fb87adad1359578f9f9d3c4ef42dd2c01324c4c382f5345bad3cc
+  data.tar.gz: de2c9ed944175faa9db14b203840f9ac9f406ad202befa783a9c0338ad49c9faddbe89d0d46e4f2e36c5a6ef8ce1106a05dd9f950b54cdd623592804b17d5f6c

data/CHANGELOG

@@ -1,2 +1,12 @@
-= 0.4.0
-- support ClientPool
+* 0.4.2 (Mar 31 2015)
+
+* Add gemspec and convert "should" to "expect" on rspec tests. [Hiroki Matsue] 4c7c465
+* modify to reproduce environment with Gemfile [tarr1124] 2205ed7
+
+* 0.4.1 (Feb 20 2012)
+
+* add client plugin files. [junji torii] caa2201
+
+* 0.4.0
+
+* support ClientPool

data/Gemfile

@@ -1,8 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem "rake"
-gem "rspec"
-gem "rr"
-
-# add rdoc for darkfish format
-gem "rdoc"
+gemspec

data/Gemfile.lock

@@ -1,20 +1,30 @@
+PATH
+  remote: .
+  specs:
+    roma-client (0.4.2)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    json (1.6.1)
-    rake (0.9.2.2)
-    rdoc (3.11)
+    diff-lcs (1.2.5)
+    json (1.8.2)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    rr (1.0.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    rr (1.1.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
 
 PLATFORMS
   ruby
@@ -22,5 +32,6 @@ PLATFORMS
 DEPENDENCIES
   rake
   rdoc
+  roma-client!
   rr
   rspec

data/Rakefile

@@ -1,11 +1,4 @@
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'rake'
-require 'rubygems/package_task'
-
-if File.exist?(File.expand_path('Gemfile', File.dirname(__FILE__)))
-  require 'bundler/setup'
-end
+require "bundler/gem_tasks"
 
 begin
   require 'rdoc/task'
@@ -14,33 +7,11 @@ rescue LoadError
 end
 
 RDOC_OPTIONS = [
-                '--line-numbers',
-                '--inline-source',
-                "--main", "README",
-                "-c UTF-8",
-               ]
-
-# gem tasks
-PKG_FILES = FileList[
-  '[A-Z]*',
-  'bin/**/*',
-  'lib/**/*.rb',
-  'test/**/*.rb',
-  'spec/**/*.rb',
-  'doc/**/*',
-  'examples/**/*',
-                    ]
-
-require File.expand_path(File.join("lib", "roma", "client", "version"),
-                         File.dirname(__FILE__))
-
-VER_NUM = Roma::Client::VERSION::STRING
-
-if VER_NUM =~ /([0-9.]+)$/
-  CURRENT_VERSION = $1
-else
-  CURRENT_VERSION = "0.0.0"
-end
+  '--line-numbers',
+  '--inline-source',
+  "--main", "README",
+  "-c UTF-8",
+]
 
 begin
   require 'rspec/core'
@@ -48,40 +19,19 @@ begin
 rescue LoadError
   puts "no rspec"
 else
+  require 'rspec'
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.ruby_opts=""
-    t.rcov = false
+    #t.rcov = false
   end
   task :default => :spec
 end
 
-SPEC = Gem::Specification.new do |s|
-  s.authors = ["Muga Nishizawa", "Junji Torii"]
-  s.name = "roma-client"
-  s.version = CURRENT_VERSION
-  s.summary = "ROMA client library"
-  s.description = <<-EOF
-    ROMA client library
-  EOF
-  s.files = PKG_FILES.to_a
-
-  s.require_path = 'lib'                         # Use these for libraries.
-
-  s.has_rdoc = true
-  s.rdoc_options.concat RDOC_OPTIONS
-  s.extra_rdoc_files = ["README", "CHANGELOG"]
-end
-
-package_task = Gem::PackageTask.new(SPEC) do |pkg|
-end
-
-
-Rake::RDocTask.new("doc") { |rdoc|
+Rake::RDocTask.new("doc") do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title = "ROMA documents"
   rdoc.options.concat RDOC_OPTIONS
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.include("README")
   rdoc.rdoc_files.include("CHANGELOG")
-}
-
+end

data/lib/roma/client/client_pool.rb

@@ -35,7 +35,9 @@ module Roma
 
       # release all pool
       def self.release_all
-        @@client_pools = {}
+        @@client_pools.each do |k,v|
+          v.release
+        end
       end
 
       # get RomaClient instance

data/lib/roma/client/version.rb

@@ -13,7 +13,7 @@ module Roma #:nodoc:
 
         MINOR = 4
 
-        TINY  = 1
+        TINY  = 2
 
         STRING = [MAJOR, MINOR, TINY].join('.')
       end

data/spec/roma/client/client_pool_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require File.expand_path(File.join('..', '..', 'spec_helper'), File.dirname(__FILE__))
 
 describe Roma::Client::ClientPool do
@@ -9,15 +8,15 @@ describe Roma::Client::ClientPool do
   context "Singleton" do
     subject { Roma::Client::ClientPool.instance(:test) }
     it {
-      subject.class.should == Roma::Client::ClientPool
+      expect(subject.class).to eq(Roma::Client::ClientPool)
     }
 
     it {
-      subject.should be_equal Roma::Client::ClientPool.instance(:test)
+      expect(subject).to be_equal Roma::Client::ClientPool.instance(:test)
     }
 
     it {
-      subject.should_not be_equal Roma::Client::ClientPool.instance(:test2)
+      expect(subject).not_to be_equal Roma::Client::ClientPool.instance(:test2)
     }
 
     it {
@@ -30,37 +29,45 @@ describe Roma::Client::ClientPool do
 
   context "max pool size of default" do
     subject{ Roma::Client::ClientPool.instance(:test) }
-    its(:max_pool_size) {
-      should == 1
-    }
+
+    describe '#max_pool_size' do
+      subject { super().max_pool_size }
+      it {
+        is_expected.to eq(1)
+      }
+    end
   end
 
   context "set max pool size " do
     it do
       pool = Roma::Client::ClientPool.instance(:test)
-      pool.max_pool_size.should == 1
+      expect(pool.max_pool_size).to eq(1)
       pool.max_pool_size = 3
-      pool.max_pool_size.should == 3
+      expect(pool.max_pool_size).to eq(3)
 
       pool2 = Roma::Client::ClientPool.instance(:test2)
-      pool2.max_pool_size.should == 1
+      expect(pool2.max_pool_size).to eq(1)
     end
   end
 
   context "servers default" do
     subject { Roma::Client::ClientPool.instance(:test) }
-    its(:servers) { should be_nil }
+
+    describe '#servers' do
+      subject { super().servers }
+      it { is_expected.to be_nil }
+    end
   end
 
   context "servers set" do
     it {
       pool = Roma::Client::ClientPool.instance(:test_servers_set)
-      pool.servers.should be_nil
+      expect(pool.servers).to be_nil
       nodes = get_nodes
       pool.servers = nodes
-      pool.servers.should == nodes
+      expect(pool.servers).to eq(nodes)
 
-      Roma::Client::ClientPool.instance(:test_ini_nodes_set2).servers.should be_nil
+      expect(Roma::Client::ClientPool.instance(:test_ini_nodes_set2).servers).to be_nil
     }
   end
 
@@ -71,15 +78,15 @@ describe Roma::Client::ClientPool do
       pool
     end
 
-    it { pending 'TODO: startup or mock roma server'}
-    it { subject.pool_count.should == 0 }
+    it { skip 'TODO: startup or mock roma server'}
+    it { expect(subject.pool_count).to eq(0) }
     it {
       client = subject.client
-      client.class.should == Roma::Client::RomaClient
+      expect(client.class).to eq(Roma::Client::RomaClient)
       subject.push_client(client)
-      subject.pool_count.should == 1
+      expect(subject.pool_count).to eq(1)
     }
-    it { pending "TODO: check nodes" }
+    it { skip "TODO: check nodes" }
   end
 
   context "client multi pool" do
@@ -90,21 +97,21 @@ describe Roma::Client::ClientPool do
     end
 
     it {
-      subject.pool_count.should == 0
+      expect(subject.pool_count).to eq(0)
       client  = subject.client
-      client.should_not be_nil
+      expect(client).not_to be_nil
 
       client2 = subject.client
-      client2.should_not be_nil
+      expect(client2).not_to be_nil
 
       subject.push_client(client)
-      subject.pool_count.should == 1
+      expect(subject.pool_count).to eq(1)
 
       subject.push_client(client2)
-      subject.pool_count.should == 1
+      expect(subject.pool_count).to eq(1)
 
-      client.should be_equal subject.client
-      subject.pool_count.should == 0
+      expect(client).to be_equal subject.client
+      expect(subject.pool_count).to eq(0)
     }
   end
 
@@ -115,7 +122,7 @@ describe Roma::Client::ClientPool do
       end
     end
 
-     module TestPlugin2
+    module TestPlugin2
       def test_plugin2
         "test_plugin2"
       end
@@ -123,20 +130,20 @@ describe Roma::Client::ClientPool do
 
     it {
       pool = Roma::Client::ClientPool.instance(:pm_test)
-      pool.plugin_modules.should be_nil
+      expect(pool.plugin_modules).to be_nil
 
       pool.add_plugin_module(TestPlugin)
-      pool.plugin_modules.should_not be_nil
-      pool.plugin_modules.size.should == 1
+      expect(pool.plugin_modules).not_to be_nil
+      expect(pool.plugin_modules.size).to eq(1)
       pool.plugin_modules[0] == TestPlugin
     }
 
     it {
       pool = Roma::Client::ClientPool.instance(:pms_test)
-      pool.plugin_modules.should be_nil
+      expect(pool.plugin_modules).to be_nil
 
       pool.plugin_modules = [TestPlugin, TestPlugin2]
-      pool.plugin_modules.size.should == 2
+      expect(pool.plugin_modules.size).to eq(2)
       pool.plugin_modules[0] == TestPlugin
       pool.plugin_modules[1] == TestPlugin2
     }
@@ -144,21 +151,21 @@ describe Roma::Client::ClientPool do
     it {
       pool = Roma::Client::ClientPool.instance(:pms_test2)
       pool.servers = get_nodes
-      pool.plugin_modules.should be_nil
+      expect(pool.plugin_modules).to be_nil
 
       pool.plugin_modules = [TestPlugin, TestPlugin2]
       client = pool.client
-      client.should_not be_nil
-      client.test_plugin.should == "test_plugin"
-      client.test_plugin2.should == "test_plugin2"
+      expect(client).not_to be_nil
+      expect(client.test_plugin).to eq("test_plugin")
+      expect(client.test_plugin2).to eq("test_plugin2")
     }
   end
 
   context "default type" do
     subject { Roma::Client::ClientPool.instance }
-    it { should_not be_nil }
-    it { subject.class.should == Roma::Client::ClientPool }
-    it { subject.should be_equal Roma::Client::ClientPool.instance(:default) }
+    it { is_expected.not_to be_nil }
+    it { expect(subject.class).to eq(Roma::Client::ClientPool) }
+    it { expect(subject).to be_equal Roma::Client::ClientPool.instance(:default) }
   end
 
   context "support hash name" do
@@ -172,15 +179,15 @@ describe Roma::Client::ClientPool do
       pool
     }
 
-    it { subject.default_hash_name.should == 'roma' }
+    it { expect(subject.default_hash_name).to eq('roma') }
     it {
       subject.default_hash_name = 'new_name'
-      subject.default_hash_name.should == 'new_name'
-      Roma::Client::ClientPool.instance.default_hash_name.should == 'new_name'
-      Roma::Client::ClientPool.instance(:other).default_hash_name.should == 'roma'
+      expect(subject.default_hash_name).to eq('new_name')
+      expect(Roma::Client::ClientPool.instance.default_hash_name).to eq('new_name')
+      expect(Roma::Client::ClientPool.instance(:other).default_hash_name).to eq('roma')
 
       client = subject.client
-      client.default_hash_name.should == 'new_name'
+      expect(client.default_hash_name).to eq('new_name')
     }
   end
 
@@ -192,13 +199,13 @@ describe Roma::Client::ClientPool do
     }
 
     it {
-      subject.pool_count.should == 0
+      expect(subject.pool_count).to eq(0)
       subject.client do |client|
       end
 
-      subject.pool_count.should == 1
-      subject.release.should be_true
-      subject.pool_count.should == 0
+      expect(subject.pool_count).to eq(1)
+      expect(subject.release).to be_truthy
+      expect(subject.pool_count).to eq(0)
     }
   end
 
@@ -215,27 +222,27 @@ describe Roma::Client::ClientPool do
     }
 
     it "use block"do
-      subject.pool_count.should == 0
+      expect(subject.pool_count).to eq(0)
       subject.client do |client|
-        client.set("test", "value").should == "STORED"
+        expect(client.set("test", "value")).to eq("STORED")
       end
-      subject.pool_count.should == 1
+      expect(subject.pool_count).to eq(1)
     end
 
     it "raise exception in block, but pool certainly" do
-      subject.pool_count.should == 0
+      expect(subject.pool_count).to eq(0)
       subject.client do |client|
-        client.set("test", "value").should == "STORED"
+        expect(client.set("test", "value")).to eq("STORED")
       end
-      subject.pool_count.should == 1
+      expect(subject.pool_count).to eq(1)
 
-      lambda {
+      expect {
         subject.client do |client|
           raise "test error"
         end
-      }.should raise_error RuntimeError, "test error"
+      }.to raise_error RuntimeError, "test error"
 
-      subject.pool_count.should == 1
+      expect(subject.pool_count).to eq(1)
     end
   end
 
@@ -247,8 +254,8 @@ describe Roma::Client::ClientPool do
       pool.client do |c|
       end
 
-      pool.pool_count.should == 1
-      Thread.list.length.should == old_thread_count + 1
+      expect(pool.pool_count).to eq(1)
+      expect(Thread.list.length).to eq(old_thread_count + 1)
     }
 
     it {
@@ -259,8 +266,8 @@ describe Roma::Client::ClientPool do
       pool.client do |c|
       end
 
-      pool.pool_count.should == 1
-      Thread.list.length.should == old_thread_count
+      expect(pool.pool_count).to eq(1)
+      expect(Thread.list.length).to eq(old_thread_count)
     }
   end
 
@@ -270,18 +277,21 @@ describe Roma::Client::ClientPool do
       pool.servers = get_nodes
       pool.client do |c|
       end
-      Roma::Client::ClientPool.instance(:release_all_1).pool_count.should == 1
+      expect(Roma::Client::ClientPool.instance(:release_all_1).pool_count).to eq(1)
 
       pool = Roma::Client::ClientPool.instance(:release_all_2)
       pool.servers = get_nodes
       pool.client do |c|
       end
-      pool.pool_count.should == 1
-      Roma::Client::ClientPool.instance(:release_all_2).pool_count.should == 1
+      expect(pool.pool_count).to eq(1)
+      expect(Roma::Client::ClientPool.instance(:release_all_2).pool_count).to eq(1)
 
       Roma::Client::ClientPool.release_all
-      Roma::Client::ClientPool.instance(:release_all_1).pool_count.should == 0
-      Roma::Client::ClientPool.instance(:release_all_2).pool_count.should == 0
+      expect(Roma::Client::ClientPool.instance(:release_all_1).pool_count).to eq(0)
+      expect(Roma::Client::ClientPool.instance(:release_all_2).pool_count).to eq(0)
+
+      expect(Roma::Client::ClientPool.instance(:release_all_1).servers).to eq(get_nodes)
+      expect(Roma::Client::ClientPool.instance(:release_all_2).servers).to eq(get_nodes)
     }
   end
 end

data/spec/roma/client/version_spec.rb

@@ -3,9 +3,10 @@ require File.expand_path(File.join('..', '..', 'spec_helper'), File.dirname(__FI
 
 describe Roma::Client::VERSION do
   it 'should string' do
-    Roma::Client::VERSION::STRING.should ==
+    expect(Roma::Client::VERSION::STRING).to eq(
       "#{Roma::Client::VERSION::MAJOR}." +
       "#{Roma::Client::VERSION::MINOR}." +
       "#{Roma::Client::VERSION::TINY}"
+    )
   end
 end

metadata

@@ -1,98 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: roma-client
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Muga Nishizawa
 - Junji Torii
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-20 00:00:00 Z
-dependencies: []
-
-description: "    ROMA client library\n"
+date: 2015-03-31 00:00:00.000000000 Z
+dependencies:
+- !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: rspec
+  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: rr
+  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: rdoc
+  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: ROMA client library
 email: 
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - CHANGELOG
-files: 
-- README
-- Rakefile
+files:
 - CHANGELOG
+- Gemfile
 - Gemfile.lock
 - LICENSE
-- Gemfile
-- bin/showbalance
+- README
+- Rakefile
 - bin/rcdaemon
 - bin/sample
+- bin/showbalance
 - lib/roma-client.rb
-- lib/roma/client/proxy/version.rb
-- lib/roma/client/proxy/daemon.rb
-- lib/roma/client/con_pool.rb
-- lib/roma/client/version.rb
-- lib/roma/client/rlogger.rb
+- lib/roma/client.rb
 - lib/roma/client/client_pool.rb
-- lib/roma/client/routing/routing_data.rb
-- lib/roma/client/sender.rb
+- lib/roma/client/client_rttable.rb
+- lib/roma/client/con_pool.rb
+- lib/roma/client/plugin/alist.rb
 - lib/roma/client/plugin/map.rb
 - lib/roma/client/plugin/mapcount.rb
-- lib/roma/client/plugin/alist.rb
+- lib/roma/client/proxy/daemon.rb
+- lib/roma/client/proxy/version.rb
 - lib/roma/client/rclient.rb
-- lib/roma/client/client_rttable.rb
+- lib/roma/client/rlogger.rb
+- lib/roma/client/routing/routing_data.rb
+- lib/roma/client/sender.rb
 - lib/roma/client/tools/showbalance.rb
-- lib/roma/client.rb
+- lib/roma/client/version.rb
 - spec/roma/client/client_pool_spec.rb
 - spec/roma/client/version_spec.rb
 - spec/spec_helper.rb
-homepage: 
-licenses: []
-
+homepage: http://roma-kvs.org/
+licenses:
+- GPL-3.0
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --main
+rdoc_options:
+- "--line-numbers"
+- "--inline-source"
+- "--main"
 - README
-- -c UTF-8
-require_paths: 
+- "-c UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ROMA client library
 test_files: []
-