Skip to content

Commit

Permalink
use websocket-eventmachine-server gem, replace em-websocket #8
Browse files Browse the repository at this point in the history
fix test  #8
  • Loading branch information
shokai committed Oct 20, 2014
1 parent 3236bc3 commit 83373b1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
13 changes: 8 additions & 5 deletions Gemfile.lock
Expand Up @@ -8,23 +8,26 @@ PATH
GEM
remote: https://rubygems.org/
specs:
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
event_emitter (0.2.5)
eventmachine (1.0.3)
http_parser.rb (0.6.0)
minitest (5.4.2)
rake (10.3.2)
websocket (1.2.1)
websocket-eventmachine-base (1.1.0)
eventmachine (~> 1.0)
websocket (~> 1.0)
websocket-native (~> 1.0)
websocket-eventmachine-server (1.0.1)
websocket-eventmachine-base (~> 1.0)
websocket-native (1.0.0)

PLATFORMS
ruby

DEPENDENCIES
bundler (~> 1.3)
em-websocket
eventmachine
minitest
rake
websocket-client-simple!
websocket-eventmachine-server
5 changes: 3 additions & 2 deletions sample/echo_server.rb
@@ -1,14 +1,15 @@
#!/usr/bin/env ruby
require 'eventmachine'
require 'em-websocket'
require 'websocket-eventmachine-server'

PORT = (ARGV.shift || 8080).to_i

EM::run do
@channel = EM::Channel.new

puts "start websocket server - port:#{PORT}"
EM::WebSocket.start(:host => "0.0.0.0", :port => PORT) do |ws|

WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => PORT) do |ws|
ws.onopen do
sid = @channel.subscribe do |mes|
ws.send mes
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper.rb
Expand Up @@ -3,6 +3,6 @@
require 'minitest/autorun'
require 'websocket-client-simple'
require 'eventmachine'
require 'em-websocket'
require 'websocket-eventmachine-server'

$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
2 changes: 1 addition & 1 deletion test/test_websocket_client_simple.rb
Expand Up @@ -15,7 +15,7 @@ def test_echo
@channel = EM::Channel.new

## echo server
EM::WebSocket.start(:host => "0.0.0.0", :port => port) do |ws|
WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => port) do |ws|
ws.onopen do
sid = @channel.subscribe do |mes|
ws.send mes
Expand Down
2 changes: 1 addition & 1 deletion websocket-client-simple.gemspec
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rake"
spec.add_development_dependency "minitest"
spec.add_development_dependency "em-websocket"
spec.add_development_dependency "websocket-eventmachine-server"
spec.add_development_dependency "eventmachine"

spec.add_dependency "websocket"
Expand Down

0 comments on commit 83373b1

Please sign in to comment.