rocket-server 0.0.2 → 0.0.3

data/Rakefile

@@ -1,43 +1,9 @@
 # -*- ruby -*-
-$:.unshift(File.expand_path('../lib', __FILE__))
-$:.unshift(File.expand_path('../../rocket/lib', __FILE__))
-require 'rspec/core/rake_task'
-require 'rake/rdoctask'
+require File.expand_path('../../load_paths', __FILE__)
 require 'rocket/version'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = %q[-I../rocket-core/lib -I../rocket/lib -Ilib -c -b]
-end
+$LIB_BASENAME = "rocket-server"
+$LIB_FULLNAME = "#{$LIB_BASENAME}-#{Rocket.version}"
+$LIB_TITLE    = "Rocket Server #{Rocket.version}"
 
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.rcov = true
-  t.rspec_opts = %q[-I../rocket-core/lib -I../rocket/lib -Ilib -c -b]
-  t.rcov_opts = %q[-I../rocket-core/lib -I../rocket/lib -Ilib -T -x "spec"]
-end
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.title = "Rocket Server #{Rocket.version}"
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Build current version as a rubygem"
-task :build do
-  sh "gem build rocket-server.gemspec"
-  sh "mkdir -p pkg"
-  sh "mv rocket-server-*.gem pkg/"
-end
-
-desc "Relase current version to rubygems.org"
-task :release => :build do
-  sh "gem push pkg/rocket-server-#{Rocket.version}.gem"
-end
-
-desc "Perform installation via rubygems"
-task :install => :build do
-  sh "gem install pkg/rocket-server-#{Rocket.version}.gem"
-end
-
-task :default => :spec
+load File.expand_path('../../Rakefile.common', __FILE__)

data/lib/rocket/server.rb

@@ -1,3 +1,11 @@
+begin
+  require 'fastthread'
+rescue LoadError
+  puts "WARNING: You don't have fastthread gem installed. It's recommended" +
+       "to use it for better performance."
+  require 'thread'
+end
+
 require "konfigurator"
 require 'eventmachine'
 require 'em-websocket'
@@ -28,8 +36,8 @@ module Rocket
     disable :verbose
     disable :quiet
     disable :daemon
-    set :pid, nil
-    set :log, nil
+    set :pid, "/var/run/rocket/server.pid"
+    set :log, "/var/log/rocket/server.log"
     set :tls_options, {}
     set :apps, []
     set :plugins, []

data/lib/rocket/server/cli.rb

@@ -8,29 +8,30 @@ module Rocket
       
       desc "Show used version of Rocket server"
       def version
-        puts "Rocket v#{Rocket.version}"
+        puts "Rocket Server v#{Rocket.version}"
       end
       
       desc "Start Rocket server on given host and port"
-      opt "config",  :short_name => "c", :default => "/etc/rocket/default.yml",    :desc => "Path to configuration file" 
-      opt "host",    :short_name => "h", :default => "localhost",                  :desc => "Specify server host"
-      opt "port",    :short_name => "p", :default => 9772,                         :desc => "Specify server port"
-      opt "plugins", :short_name => "r", :default => [],                           :desc => "Require ruby extensions at runtime"
-      opt "secure",  :short_name => "s", :default => false,                        :desc => "Switch between wss/ws modes"
-      opt "verbose", :short_name => "v", :default => false,                        :desc => "Increase verbosity"
-      opt "quiet",   :short_name => "q", :default => false,                        :desc => "Decrease verbosity"
-      opt "debug",   :short_name => "D", :default => false,                        :desc => "Run server in debug mode"
-      opt "daemon",  :short_name => "d", :default => false,                        :desc => "Run server as a daemon"
-      opt "pid",     :short_name => "P", :default => "/var/run/rocket/server.pid", :desc => "Path to PID file (only when daemonized)"
-      opt "log",     :short_name => "l", :default => nil,                          :desc => "Path to log file"
+      opt "config",  :short_name => "c", :desc => "Path to configuration file" 
+      opt "host",    :short_name => "h", :desc => "Specify server host"
+      opt "port",    :short_name => "p", :desc => "Specify server port"
+      opt "plugins", :short_name => "r", :desc => "Require ruby extensions at runtime"
+      opt "secure",  :short_name => "s", :desc => "Switch between wss/ws modes"
+      opt "verbose", :short_name => "v", :desc => "Increase verbosity"
+      opt "quiet",   :short_name => "q", :desc => "Decrease verbosity"
+      opt "debug",   :short_name => "D", :desc => "Run server in debug mode"
+      opt "daemon",  :short_name => "d", :desc => "Run server as a daemon"
+      opt "pid",     :short_name => "P", :desc => "Path to PID file (only when daemonized)"
+      opt "log",     :short_name => "l", :desc => "Path to log file"
       def start
-        Rocket::Server.load_settings(params.delete('config'), symbolize_keys(params))
+        config_file = params.delete('config') || '/etc/rocket/default.yml'
+        Rocket::Server.load_settings(config_file, symbolize_keys(params))
         Rocket::Server::Runner.new(Rocket::Server.settings).start!
       end
       
       desc "Stop daemonized instance of Rocket server"
-      opt "config",  :short_name => "c", :default => "/etc/rocket/default.yml",    :desc => "Path to configuration file" 
-      opt "pid",     :short_name => "P", :default => "/var/run/rocket/server.pid", :desc => "Path to PID file (only when daemonized)"
+      opt "config",  :short_name => "c", :desc => "Path to configuration file" 
+      opt "pid",     :short_name => "P", :desc => "Path to PID file (only when daemonized)"
       def stop
         Rocket::Server.load_settings(params.delete('config'), symbolize_keys(params))
         

data/lib/rocket/server/runner.rb

@@ -56,7 +56,7 @@ module Rocket
           Process.kill(9, pid)
           pid
         end
-      rescue => e
+      rescue Object => e
         # nothing to show
       end
       
@@ -68,7 +68,7 @@ module Rocket
       def save_pid
         FileUtils.mkdir_p(File.dirname(pidfile))
         File.open(pidfile, "w+"){|f| f.write("#{Process.pid}\n")}
-      rescue => e
+      rescue Object => e
         puts e.to_s
         exit 1
       end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'rubygems'
+require File.expand_path("../../../load_paths", __FILE__)
+
 require 'mocha'
 require 'rspec'
 require 'fileutils'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rocket-server
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Araneo Ltd.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2010-11-29 00:00:00 +01:00
 default_executable: rocket-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 0
-        - 2
-        version: 0.0.2
+        - 3
+        version: 0.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency