jschat 0.1.1 → 0.1.2

data/README.textile

@@ -43,6 +43,21 @@ The web app must be run alongside the server.  The web app must be started in pr
 
 The web app currently has no database dependencies, it's a wrapper that links cookies to JsChat server proxies.  You can run it on port 80 by configuring Rack or an Apache proxy.  I have Apache set up this way on "jschat.org":http://jschat.org.
 
+h3. Configuration files
+
+These are the default locations of the configuration files.  You can override them with <code>--config=PATH</code>:
+
+* Client: <code>~/.jschat/config.json</code>
+* Server: <code>/etc/jschat/config.json</code>
+
+The web app will use the same configuration file as the server so it can find out where the server is.
+
+The file format is JSON, like this:
+
+<pre>
+{ "port": 3001 }
+</pre>
+
 h3. Client Commands
 
 * Change name or identify: <code>/nick name</code>

data/bin/jschat-server

@@ -2,17 +2,8 @@
 
 require 'logger'
 require 'jschat/server'
-
-logger = Logger.new(STDERR)
-logger = Logger.new(STDOUT)
-
-ServerConfig = {
-  :port => 6789,
-  :ip => '0.0.0.0',
-  :logger => logger,
-  :max_message_length => 500
-}
+require 'jschat/server-options'
 
 EM.run do
-  EM.start_server ServerConfig[:ip], ServerConfig[:port], JsChat
+  EM.start_server ServerConfig['ip'], ServerConfig['port'], JsChat
 end

data/lib/jschat/client.rb

@@ -6,13 +6,14 @@ require 'optparse'
 require 'time'
 
 options = {}
-
+default_config_file = '~/.jschat/config.json'
 ARGV.clone.options do |opts|
   script_name = File.basename($0)
   opts.banner = "Usage: #{$0} [options]" 
 
   opts.separator ""
 
+  opts.on("-c", "--config=PATH", String, "Configuration file location (#{default_config_file})") { |o| options['config'] = o }
   opts.on("-h", "--hostname=host", String, "JsChat server hostname") { |o| options['hostname'] = o }
   opts.on("-p", "--port=port", String, "JsChat server port number") { |o| options['port'] = o }
   opts.on("-r", "--room=#room", String, "Channel to auto-join: remember to escape the hash") { |o| options['room'] = o }
@@ -22,6 +23,18 @@ ARGV.clone.options do |opts|
   opts.parse!
 end
 
+# Command line options will overrides these
+def load_options(path)
+  path = File.expand_path path
+  if File.exists? path
+    JSON.parse(File.read path)
+  else
+    {}
+  end
+end
+
+options = load_options(options['config'] || default_config_file).merge options
+
 ClientConfig = {
   :port => options['port'] || '6789',
   :ip => options['hostname'] || '0.0.0.0',

data/lib/jschat/http/jschat.rb

@@ -3,16 +3,12 @@ require 'sinatra'
 require 'sha1'
 require 'json'
 require 'sprockets'
+require 'jschat/server-options'
 
 set :public, File.join(File.dirname(__FILE__), 'public')
 set :views, File.join(File.dirname(__FILE__), 'views')
 
 module JsChat
-  Config = {
-    :ip   => '0.0.0.0',
-    :port => 6789
-  }
-
   class ConnectionError < Exception ; end
 end
 
@@ -90,7 +86,7 @@ class JsChat::Bridge
   def send_json(h, get_results = true)
     response = nil
     h[:cookie] = @cookie if cookie_set?
-    c = TCPSocket.open(JsChat::Config[:ip], JsChat::Config[:port])
+    c = TCPSocket.open(ServerConfig['ip'], ServerConfig['port'])
     c.send(h.to_json + "\n", 0)
     if get_results
       response = c.gets

data/lib/jschat/server-options.rb

@@ -0,0 +1,45 @@
+require 'optparse'
+
+logger = nil
+
+if Object.const_defined? :Logger
+  logger = Logger.new(STDERR)
+  logger = Logger.new(STDOUT)
+end
+
+ServerConfigDefaults = {
+  'port' => 6789,
+  'ip' => '0.0.0.0',
+  'logger' => logger,
+  'max_message_length' => 500
+}
+
+# Command line options will overrides these
+def load_options(path)
+  path = File.expand_path path
+  if File.exists? path
+    JSON.parse(File.read path)
+  else
+    {}
+  end
+end
+
+options = {}
+default_config_file = '/etc/jschat/config.json'
+
+ARGV.clone.options do |opts|
+  script_name = File.basename($0)
+  opts.banner = "Usage: #{$0} [options]" 
+
+  opts.separator ""
+
+  opts.on("-c", "--config=PATH", String, "Configuration file location (#{default_config_file}") { |o| options['config'] = o }
+  opts.on("-p", "--port=port", String, "Port number") { |o| options['port'] = o }
+  opts.on("--help", "-H", "This text") { puts opts; exit 0 }
+
+  opts.parse!
+end
+
+options = load_options(options['config'] || default_config_file).merge options
+
+ServerConfig = ServerConfigDefaults.merge options

data/lib/jschat/server.rb

@@ -388,11 +388,11 @@ module JsChat
   end
 
   def log(level, message)
-    if Object.const_defined? :ServerConfig and ServerConfig[:logger]
+    if Object.const_defined? :ServerConfig and ServerConfig['logger']
       if @user
         message = "#{@user.name} (#{@user.ip}): #{message}"
       end
-      ServerConfig[:logger].send level, message
+      ServerConfig['logger'].send level, message
     end
   end
 
@@ -434,7 +434,7 @@ module JsChat
     response = ''
     disconnect_lagged_users
 
-    if data and data.size > ServerConfig[:max_message_length]
+    if data and data.size > ServerConfig['max_message_length']
       raise JsChat::Errors::MessageTooLong.new(:message_too_long, 'Message too long')
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alex R. Young
@@ -183,6 +183,7 @@ files:
 - lib/jschat/http/views/iphone.erb
 - lib/jschat/http/views/layout.erb
 - lib/jschat/http/views/message_form.erb
+- lib/jschat/server-options.rb
 - lib/jschat/server.rb
 - test/server_test.rb
 - test/stateless_test.rb