sinatra-cometio 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d493ba15d44c94753f78b0c236125f775fb6b61
-  data.tar.gz: b5944b12327e36182514f61491077f80777ec8de
+  metadata.gz: a4c765b3c03f7d0d9f4119ee6eaeca36412039e1
+  data.tar.gz: c796d5fbfba6045eb227f2c1c5e57aadc79b28d5
 SHA512:
-  metadata.gz: 9691dfab15f2e4211c0159585f026bd6cabb2ebb8316bccc519381245d7b8529f50c8d3ac9fc39c41eea3fe44a3fa80654e46f29038a029cd253cd3fcd178b3c
-  data.tar.gz: 1c63eb1aab0634faef1ec4c1e1235596b13c219714ef16ef4ac34a3df7c6e249914a75e71ed377a40f8bdb2c638fc8c0f10de71c19a882600a79120a537d888c
+  metadata.gz: 1497b9122f45e9ce82e494c321411249d76102403ea46ce4ef7c1ddb068121f4e757a4a5ef470072e4e7a205b234a8c0996a2120b68f8971b6588c2aa4bb8365
+  data.tar.gz: 0e3d08e27a8d18fcbe380e8bad85d88105b3ee39c3540a7f41a321a6e1888c167766f2af9cfaca23545d4d4da4a909b70cd0e41896bc47b0fdb9b40b4aaa0816

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.0 2013-10-05
+
+* set MIT License
+
 === 0.5.9 2013-08-06
 
 * store REMOTE_ADDR into CometIO.sessions

data/README.md

@@ -158,8 +158,13 @@ Test
 
     % gem install bundler
     % bundle install
-    % export PORT=5000
-    % export PID_FILE=/tmp/sinatra-cometio-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-cometio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module CometIO
-    VERSION = '0.5.9'
+    VERSION = '0.6.0'
   end
 end

data/sinatra-cometio.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Comet component for Sinatra RocketIO}
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/shokai/sinatra-cometio"
+  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

@@ -8,50 +8,23 @@ class App
     ENV['PORT'] || 5000
   end
 
-  def self.cometio_url
-    "http://localhost:#{port}/cometio/io"
+  def self.url
+    "http://localhost:#{port}"
   end
 
-  def self.pid_file
-    ENV['PID_FILE'] || "/tmp/sinatra-cometio-testapp.pid"
+  def self.cometio_url
+    "http://localhost:#{port}/cometio/io"
   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} rackup config.ru -p #{port} > /dev/null 2>&1"
-    end
+    return if running
     @running = true
-    100.times do
-      if File.exists? pid_file
-        sleep 0.1
-        return true
-      end
-      sleep 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} && bundle exec 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-cometio-test-pid"
-File.open(pid_file, "w+") do |f|
-  f.write Process.pid.to_s
-end
-
 class TestApp < Sinatra::Base
   register Sinatra::CometIO
 

data/test/test_cometio.rb

@@ -2,14 +2,6 @@ require File.expand_path 'test_helper', File.dirname(__FILE__)
 
 class TestCometio < MiniTest::Test
 
-  def setup
-    App.start
-  end
-
-  def teardown
-    App.stop
-  end
-
   def test_simple
     client = Sinatra::CometIO::Client.new(App.cometio_url).connect
     post_data = {:time => Time.now.to_s, :msg => 'hello!!'}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cometio
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,7 +217,8 @@ files:
 - test/test_cometio.rb
 - test/test_helper.rb
 homepage: https://github.com/shokai/sinatra-cometio
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -235,7 +236,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: Comet component for Sinatra RocketIO