sinatra-websocketio 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c6c4b999cc5f41c0d7b92d13210c4ffe23c4d00
-  data.tar.gz: 4e242742fecca0a5fb5559ff3474221c6c134582
+  metadata.gz: 2aeb86ceb60a32d99a1a13cd3b6e88b2d76995d5
+  data.tar.gz: 156c9919c8e5511b6699371e9055ea05e2a8861b
 SHA512:
-  metadata.gz: f2ef63db595352e7ea52a40e7798e4317e298502a30921ff033333b9b6977da2a4e54fd10a026dd2034d88d391f05d5984aaf3246f923d09242ae622cad1d8e5
-  data.tar.gz: a579d3cccba11b9cd7a5ebb9b29a31809e774cdbbeb7097b2147b0c29a970da52c32d22ec07ba1e290436bab81bce9b470f92152503e3317c1dd7f77a300ad19
+  metadata.gz: 9e6ab780c22189e92198d65e485886b6c46f5443bc5b59b9d386f7eaa3fd0262d738b6499b3c8d9b5092923b6abfb450bcfdee1bfd65cb84385eaf3e149642b8
+  data.tar.gz: f9c019deadfde5e9745cdffdf32b960ecc1eb14c3039da6f040ec35e2f32fbdfc442ec3fdccc8c9985e10f53fec0d3b6ae1f26bbd09c30d86dc1d5d7599316b7

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.4.0 2013-10-05
+
+* MIT License
+* bugfix ruby-client
+* fix tests
+
 === 0.4.0 2013-10-04
 
 * bugfix of message push

data/README.md

@@ -181,9 +181,13 @@ Test
 
     % gem install bundler
     % bundle install
-    % export PORT=5000
-    % export WS_PORT=9000
-    % export PID_FILE=/tmp/sinatra-websocketio-test.pid
+
+start server
+
+    % rake test_server
+
+run test
+
     % rake test
 
 

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/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/sinatra/websocketio/client.rb

@@ -85,7 +85,7 @@ module Sinatra
 
       def close
         @running = false
-        @websocket.close
+        @websocket.close if @websocket
       end
 
       def push(type, data)

data/sinatra-websocketio.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{WebSocket component for Sinatra RocketIO}
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/shokai/sinatra-websocketio"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/).reject{|i| i=="Gemfile.lock" }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/app.rb

@@ -16,46 +16,15 @@ class App
     "ws://localhost:#{ws_port}"
   end
 
-  def self.pid_file
-    ENV['PID_FILE'] || "/tmp/sinatra-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/config.ru

@@ -6,6 +6,4 @@ $:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
 require 'sinatra/websocketio'
 require File.dirname(__FILE__)+'/main'
 
-set :websocketio, :port => ENV['WS_PORT'].to_i
-
 run TestApp

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_helper.rb

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

data/test/test_websocketio.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,7 +245,8 @@ files:
 - test/test_helper.rb
 - test/test_websocketio.rb
 homepage: https://github.com/shokai/sinatra-websocketio
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []