msgpack-rpc 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0da1908e24088da49a61b9d3363060c718ff6ff
-  data.tar.gz: ead8cc22d9eee71ec837b429aca6db7b0f496c17
+  metadata.gz: d045c3cc7b197d5c2fbc9f3d52d7b34b94799923
+  data.tar.gz: 90668ed8b722d5a89ee80c02e980d8caf6b84ee7
 SHA512:
-  metadata.gz: 645452d04668397df6993f80be101a6afc04b7e95cc47e04f8af340fabed0a315da69956bdbcb8770f50630b29dea56c7a7923072ccec7e3ce4c9e3e164d86ee
-  data.tar.gz: 0fa6b2f8952448f0d389a3092cdadf23b99a86d9e38866a54dfd38f21287704c0b0145cfc9475f4e18fdd702c26bc23f81b9651eac6497d7cb95a8ae12937d18
+  metadata.gz: 7bf6330d0b9599962f5e98fc6ef8d6fb4a1f413c3110f57a47ae6397c188bdd3e54f5004eb3f32b5853246157003c8155f137c8c3b6f75ba3f921926ed7b2b22
+  data.tar.gz: ba253b3503217866173bffa96c3f474f47192e9a5c205b2456c17fd38e4c80acac6ebdb3e94c9aabbba3d99fc018ef58bab3e55e1730820da2e1a73e23f82062

data/.gitignore

@@ -0,0 +1,2 @@
+.bundle
+Gemfile.lock

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format d

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+sudo: false
+rvm:
+  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2
+
+script: bundle exec rake test
+
+notifications:
+  email:
+    on_success: change

data/ChangeLog

@@ -1,3 +1,8 @@
+2015-01-13 version 0.5.3
+
+  * Upgrade cool.io-1.2.4 for Ruby 2.2
+  * Upgrade msgpack-0.5.10
+
 2013-01-22 version 0.5.2
 
   * Upgrade msgpack-0.5.8 for Ruby 2.0

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Rakefile

@@ -1,11 +1,21 @@
-require 'rake'
+require 'bundler'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
 require 'rake/testtask'
 require 'rake/clean'
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
 task :default => [:build]
 
-task :test => ['test:unit','spec:unit']
-load 'tasks/msgpack_rpc_tasks.rake'
+task :test => ["spec", "test:unit"]
+
+namespace :test do
+  desc "run test"
+  Rake::TestTask.new(:unit) do |t|
+    t.libs << 'lib'
+    t.pattern = 'test/*_test.rb'
+    t.verbose = true
+  end
+end

data/lib/msgpack-rpc.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), 'msgpack', 'rpc')
+require 'msgpack/rpc'

data/lib/msgpack/rpc/version.rb

@@ -1,7 +1,7 @@
 module MessagePack
 module RPC
 
-VERSION = '0.5.2'
+VERSION = '0.5.3'
 
 end
 end

data/msgpack-rpc.gemspec

@@ -7,16 +7,17 @@ Gem::Specification.new do |s|
   s.authors = ["FURUHASHI Sadayuki", "Shuzo Kashihara"]
   s.email = ["frsyuki@users.sourceforge.jp", "suma@users.sourceforge.jp"]
   s.files = `git ls-files`.split("\n")
-  s.test_files = ["test/test_helper.rb"]
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.license = "Apache 2.0"
   s.homepage = "http://msgpack.org/"
   s.require_paths = ["lib"]
-  s.rubyforge_project = "msgpack"
   s.summary = "MessagePack-RPC, asynchronous RPC library using MessagePack"
 
-  s.add_runtime_dependency "msgpack", ["~> 0.5.8"]
-  s.add_runtime_dependency "cool.io", ["~> 1.1.1"]
-  s.add_development_dependency "rspec", [">= 0"]
+  s.add_runtime_dependency "msgpack", ["~> 0.5.10"]
+  s.add_runtime_dependency "cool.io", ["~> 1.2.4"]
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "test-unit"
   s.add_development_dependency 'bundler', ["~> 1.0"]
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+require 'msgpack'
+require 'msgpack/rpc'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+
+    expectations.syntax = [:should, :expect]
+  end
+
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  config.order = :random
+
+  # config.disable_monkey_patching!
+  # config.warnings = true
+end

data/spec/unit/client_spec.rb

@@ -1,5 +1,6 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper.rb')
-require File.join(File.expand_path(File.dirname(__FILE__)), 'my_server.rb')
+require 'spec_helper'
+require_relative './my_server'
+
 include MyServerTest
 
 describe 'MessagePack::RPC::Client test' do
@@ -23,7 +24,7 @@ describe 'MessagePack::RPC::Client test' do
 	 
 	 it 'should return "ok" and "3" when you call with call_async' do
 	    req1 = @client.call_async(:hello)
-	    req2 = @client.call_async(:sum,1,2)
+	    req2 = @client.call_async(:sum, 1, 2)
 	    req1.join
 	    req1.result.should include("ok")
 	    req1.error.should be_nil
@@ -34,23 +35,27 @@ describe 'MessagePack::RPC::Client test' do
 	 end
 
 	 it 'should return "ok" when you set callback(:hello)' do
-	    @client.callback(:hello) do |error, result|
+	    req = @client.callback(:hello) do |error, result|
 	    	result.should include("ok")
 		error.should be_nil
 	    end
+	    req.join
 	 end
 
 	 it 'should return "3" when you set callback(:sum)' do
 
-	    @client.callback(:sum) do |error, result|
-	    	result.shouble equal 3
+	    req = @client.callback(:sum, 1, 2) do |error, result|
+	    	result.should equal 3
 		error.should be_nil
 	    end
+	    req.join
 	 end
 
 	 it 'should return nil values when you call notify' do
-	    @client.notify(:hello).should be_nil
-	    @client.notify(:sum,1,2).should be_nil
+	    @client.call(:count).should eq 0
+	    @client.notify(:increase_count).should be_nil
+      sleep 0.5
+	    @client.call(:count).should eq 1
 	 end
 
 	 it 'should return error when you call private method' do
@@ -88,16 +93,16 @@ end
 describe "MessagePack::RPC::TimeoutError test"  do
 
 	 before(:each)do
-	    @client = start_client
+	    @client = start_client(PortHelper.find_port)
 	    @lsock = TCPServer.new("0.0.0.0",@client.port)
 	    @client.timeout = 1
 	 end
 	 
 	 it 'should return MessagePack::RPC::TimoutError' do
 	    lambda{@client.call(:hello)}.should raise_error(MessagePack::RPC::TimeoutError)
-	 end	 
+	 end
 
-	 after(:all)do
+	 after(:each)do
 	 	     @client.close
 		     @lsock.close
 	 end
@@ -117,8 +122,6 @@ describe "MessagePack::RPC::Loop testing" do
 	end
 
 	 it "should return correct values when you use MessagePack::RPC::Loop" do
-		count = 0
-
 		@cli.callback(:hello) do |error, result|
 			result.should include("ok")
 			error.should be_nil

data/spec/unit/my_server.rb

@@ -6,6 +6,7 @@
 
 		def initialize(svr)
 			@svr = svr
+			@count = 0
 		end
 
 		def hello
@@ -16,6 +17,14 @@
 			a + b
 		end
 
+		def count
+			@count
+		end
+
+		def increase_count
+			@count += 1
+		end
+
 		def exception
 			raise "raised"
 		end
@@ -36,10 +45,6 @@
 			as
 		end
 
-		def self.next_port
-			@port += 1
-		end
-
 		def self.port
 			@port
 		end
@@ -54,26 +59,25 @@
 
 
 	module MyServerTest
-		def start_client
-			cli = MessagePack::RPC::Client.new("127.0.0.1", MyServer.port)
+		def start_client(port)
+			cli = MessagePack::RPC::Client.new("127.0.0.1", port)
 			cli.timeout = 10
 			return cli
 		end
 
 		def start_server
-			port = MyServer.next_port
+			port = PortHelper.find_port
 			svr = MessagePack::RPC::Server.new
 			svr.listen("0.0.0.0", port, MyServer.new(svr))
 			Thread.start do
 				     svr.run
 				     svr.close
 			end
-			return svr, start_client
+			return svr, start_client(port)
 		end
 
 		def server_start_loop
-
-		    port =MyServer.next_port
+		    port = PortHelper.find_port
 
 		    loop = MessagePack::RPC::Loop.new
 		    svr =MessagePack::RPC::Server.new(loop)
@@ -84,6 +88,14 @@
 
 		return svr,cli
 		end
-
-
 	end
+
+module PortHelper
+  def self.find_port
+    s = TCPServer.new('127.0.0.1', 0)
+    port = s.addr[1]
+    port
+  ensure
+    s.close
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack-rpc
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - FURUHASHI Sadayuki
@@ -9,62 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.4
+- !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: test-unit
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: 
@@ -75,8 +103,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - AUTHORS
 - ChangeLog
+- Gemfile
 - NOTICE
 - README
 - Rakefile
@@ -99,11 +131,9 @@ files:
 - lib/msgpack/rpc/transport/unix.rb
 - lib/msgpack/rpc/version.rb
 - msgpack-rpc.gemspec
-- spec/spec.opts
+- spec/spec_helper.rb
 - spec/unit/client_spec.rb
 - spec/unit/my_server.rb
-- spec/unit/spec_helper.rb
-- tasks/msgpack_rpc_tasks.rake
 - test/msgpack_rpc_test.rb
 - test/test_helper.rb
 homepage: http://msgpack.org/
@@ -116,19 +146,23 @@ 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: msgpack
-rubygems_version: 2.2.1
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MessagePack-RPC, asynchronous RPC library using MessagePack
 test_files:
+- spec/spec_helper.rb
+- spec/unit/client_spec.rb
+- spec/unit/my_server.rb
+- test/msgpack_rpc_test.rb
 - test/test_helper.rb

data/spec/spec.opts

@@ -1,7 +0,0 @@
---colour
---format
---progress
---loadby
---mtime
---reverse
-

data/spec/unit/spec_helper.rb

@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'spec'
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib')))
-require 'msgpack'
-require 'msgpack/rpc'

data/tasks/msgpack_rpc_tasks.rake

@@ -1,25 +0,0 @@
-# desc "Explaing what task does"
-
-begin
-  require 'spec'
-  require 'spec/rake/spectask'
-  namespace :spec do
-    desc 'run unit core testing'
-    Spec::Rake::SpecTask.new(:unit) do |t|
-      spec_dir = File.join(File.dirname(__FILE__), '..', 'spec')
-      t.spec_opts = File.read(File.join(spec_dir, 'spec.opts')).split
-      t.spec_files = FileList[File.join(spec_dir, 'unit', '**', '*_spec.rb')]
-    end
-  end
-rescue LoadError
-  warn "Rspec is not installed. Please install Rspec with gems and --pre"
-end
-
-namespace :test do
-	  desc "run test"
-	  Rake::TestTask.new(:unit) do |t|
-	  t.libs << 'lib'
-	  t.pattern = 'test/*_test.rb'
-	  t.verbose = true
-	  end
-end