em-websocketio-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8534916661595829b6f14ecaa8fa29ee8a7d8108
-  data.tar.gz: 8422f6f5e1bce8f06cac2f5692adf7005196476b
+  metadata.gz: 2d06291870ec93d17dc9417ed93f06321c850d01
+  data.tar.gz: 788550881b480d534b0ced4c709fa00c181dcf15
 SHA512:
-  metadata.gz: 1efcaa9a6b87760a1a471ab6268a017122a482f3b35069d464bd6834227fa26f87d7c8509342ced0fdcff32071fb3103ebf037a290408a8c976dc2bdb11ee2d3
-  data.tar.gz: 715adacd26221cfc6d9185c27e9408b087a4cdd80b3673e199a526f3769c23d421d9a6efb148cba6c962b708f1331da900114cb5ccea4dc40a10f195a3bd6d65
+  metadata.gz: 0ea2f6e5fbd88be250e8641abf6215c6a396ba5e62612a79b5ec135faccfc06a16e77db46948cb2a6a892dbe881fc67acb961a0f3b181e132522ebc1966fb14f
+  data.tar.gz: 20b995fbfa2bfeb2499fe18020fbc15f5b1505b1d28afd378c10324f643d6f05972147e9b9adfc3446ef19173139a66a71b15fb1e6ef05d34822617b826951c7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.4 2013-10-14
+
+* update for em-websocket-client v0.1.2
+
 === 0.0.3 2013-08-02
 
 * fix default websocket port 8080 -> 9000

data/README.md

@@ -68,10 +68,14 @@ Test
 
     % gem install bundler
     % bundle install
-    % export PORT=5000
-    % export WS_PORT=9000
-    % export PID_FILE=/tmp/em-websocketio-client-testapp.pid
-    % rake test
+
+start test server
+
+    % bundle exec rake test_server
+
+run test
+
+    % bundle exec rake test
 
 
 Contributing

data/Rakefile

@@ -6,3 +6,9 @@ Rake::TestTask.new do |t|
 end
 
 task :default => :test
+
+desc "Start test server"
+task :test_server do
+  require File.expand_path 'test/app', File.dirname(__FILE__)
+  App.start
+end

data/em-websocketio-client.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sinatra-websocketio"
   spec.add_development_dependency "thin"
 
-  spec.add_dependency "em-websocket-client"
+  spec.add_dependency "em-websocket-client", "0.1.2"
   spec.add_dependency "eventmachine"
   spec.add_dependency "event_emitter"
   spec.add_dependency "json"

data/lib/em-websocketio-client/client.rb

@@ -23,7 +23,7 @@ module EventMachine
         @running = true
 
         @ws.stream do |msg|
-          data = JSON.parse msg
+          data = JSON.parse msg.data
           self.emit data['type'], data['data']
         end
 

data/lib/em-websocketio-client/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
   module WebSocketIO
     class Client
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/test/app.rb

@@ -16,46 +16,15 @@ class App
     "ws://localhost:#{ws_port}"
   end
 
-  def self.pid_file
-    ENV['PID_FILE'] || "/tmp/em-websocketio-testapp.pid"
-  end
-
   def self.app_dir
     File.expand_path 'app', File.dirname(__FILE__)
   end
 
-  def self.pid
-    return unless @running
-    File.open(pid_file) do |f|
-      pid = f.gets.strip.to_i
-      return pid if pid > 0
-    end
-    return
-  end
-
   def self.start
-    return if @running
-    File.delete pid_file if File.exists? pid_file
-    Thread.new do
-      IO::popen "cd #{app_dir} && PID_FILE=#{pid_file} WS_PORT=#{ws_port} rackup config.ru -p #{port} > /dev/null 2>&1"
-    end
+    return if running
     @running = true
-    100.times do
-      if File.exists? pid_file
-        sleep 1
-        return true
-      end
-      sleep 0.1
-    end
-    @running = false
-    return false
-  end
-
-  def self.stop
-    return unless @running
-    system "kill #{pid}"
-    File.delete pid_file if File.exists? pid_file
-    @running = false
+    cmd = "cd #{app_dir} && WS_PORT=#{ws_port} rackup config.ru -p #{port}"
+    system cmd
   end
 
 end

data/test/app/main.rb

@@ -1,8 +1,3 @@
-pid_file = ENV['PID_FILE'] || "/tmp/sinatra-websocketio-test-pid"
-File.open(pid_file, "w+") do |f|
-  f.write Process.pid.to_s
-end
-
 class TestApp < Sinatra::Base
   register Sinatra::WebSocketIO
   io = Sinatra::WebSocketIO

data/test/test_em_websocketio_client.rb

@@ -2,14 +2,6 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestEmWebSocketIOClient < MiniTest::Test
 
-  def setup
-    App.start
-  end
-
-  def teardown
-    App.stop
-  end
-
   def test_simple
     post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
     res = nil

data/test/test_helper.rb

@@ -4,12 +4,3 @@ $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'minitest/autorun'
 require 'em-websocketio-client'
 require File.expand_path 'app', File.dirname(__FILE__)
-
-['SIGHUP', 'SIGINT', 'SIGKILL', 'SIGTERM'].each do |sig|
-  Kernel.trap sig do
-    App.stop
-    EM::add_timer do
-      EM::stop
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-websocketio-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: em-websocket-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Sinatra WebSocketIO client for eventmachine