vrowser 0.0.9 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/bin/vrowser

@@ -1,63 +1,133 @@
-#!/usr/bin/env ruby
+#!/bin/env ruby
 # encoding: utf-8
 # Author: kimoto
+require 'trollop'
+require 'pathname'
 require 'vrowser'
-require 'optparse'
 require 'vrowser/http_daemon'
 require 'fileutils'
 
-options = {
-  :host => 'localhost',
-  :port => '3000',
-  :document_root => File.expand_path(File.join(File.dirname(__FILE__), '../public_html'))
-}
-parser = OptionParser.new{ |opts|
-  opts.banner = "Usage: #{File.basename($0)}"
-  opts.on("-f", "--config-file=PATH", "specify config file"){ |v|
-    options[:config_path] = v
-  }
-
-  opts.on("-h", "--host=HOST", "host"){ |v| options[:host] = v }
-  opts.on("-p", "--port=PORT", "port"){ |v| options[:port] = v }
-  opts.on("-r", "--document-root=PATH", "root"){ |v| options[:document_root] = v }
-
-}
-parser.parse!
-
-if ARGV.first == "sample"
-  sample_config = File.expand_path(File.join(File.dirname(__FILE__), "../examples/config.yml"))
-  FileUtils.cp(sample_config, "./config.yml", :verbose => true)
-  exit(0)
-end
+class VrowserCLI
+  def self.run(argv)
+    self.new.parse(argv)
+  end
 
-if options[:config_path].nil?
-  parser.help.display
-  exit(1)
-end
+  # get subcommand names
+  def self.sub_commands
+    self.instance_methods.map(&:to_s).grep(/command_/).map{ |command_symbol| 
+      command_symbol.to_s.gsub(/^command_/, "")
+    }
+  end
+
+  def initialize
+  end
+
+  def parse(argv)
+    @argv = argv
+    sub_commands = self.class.sub_commands
+
+    global_opts = Trollop::options do
+      banner <<-EOS
+Usage: #{File.basename($0)} [#{sub_commands.join(',')}]
+hoge
+      EOS
+      version File.read(Pathname.new(__FILE__).dirname.realpath + "../VERSION")
+      stop_on sub_commands
+    end
+
+    cmd = @argv.shift
+    cmd_opts = Trollop::options do
+      case cmd
+      when "sample"
+        opt :output_path, "output path", :short => "-o", :type => String, :default => "./config.yml"
+      when "list"
+        opt :config_file, "config file path", :short => "-f", :type => String, :required => true
+      when "fetch"
+        opt :config_file, "config file path", :short => "-f", :type => String, :required => true
+      when "update"
+        opt :config_file, "config file path", :short => "-f", :type => String, :required => true
+      when "json"
+        opt :config_file, "config file path", :short => "-f", :type => String, :required => true
+      when "server", "daemon"
+        opt :config_file, "config file path", :short => "-f", :type => String, :required => true
+        opt :port, "port number", :short => "-p", :type => String, :default => '3000'
+        opt :host, "host or ip address", :short => "-h", :type => String, :default => 'localhost'
+        opt :log_path, "log file path", :short => "-l", :default => STDERR
+        opt :document_root, "document root path", :short => "-d", :type => String,
+          :default => (Pathname.new(__FILE__).dirname.realpath + '../public_html').to_s
+      else
+        Trollop::die "unknown subcommand: #{cmd.inspect}"
+      end
+    end
+
+    if sub_commands.include? cmd
+      self.send("command_" +  cmd, cmd_opts)
+      return 0
+    else
+      cmd_opts.help.display
+    end
+  end
+
+  ### define sub commands
+  def command_list(options)
+    Vrowser.load_file(options[:config_file]) do |vrowser|
+      puts vrowser.active_servers.map(&:name).join($/)
+    end
+  end
+
+  def command_sample(options)
+    sample_config_path = (Pathname.new(__FILE__).dirname + "../examples/config.yml").realpath
+    output_path = options[:output_path]
+    if File.exist? output_path
+      STDERR.puts "Already file exists!: #{output_path}"
+    else
+      FileUtils.cp(sample_config_path, options[:output_path])
+      STDOUT.puts "Generated sample config file: #{output_path}"
+    end
+  end
+
+  def command_update(options)
+    Vrowser.load_file(options[:config_file]) do |vrowser|
+      vrowser.update
+      vrowser.clear
+    end
+  end
+
+  def command_json(options)
+    Vrowser.load_file(options[:config_file]) do |vrowser|
+      greped = vrowser.active_servers.select(:name, :host, :ping, :num_players, :type, :map, :players)
+      ordered = greped.order(:host)
+      ordered.map(&:values).to_json.display
+    end
+  end
+
+  def command_server(options)
+    execute_as_server(options.merge({:damonize => false}))
+  end
 
-Vrowser.load_file(options[:config_path]) do |vrowser|
-  case sub_command = ARGV.shift
-  when "fetch"
-    vrowser.fetch
-  when "update"
-    vrowser.update
-    vrowser.clear
-  when "list"
-    puts vrowser.servers.map(&:name).join($/)
-  when "json"
-    vrowser.active_servers.select(:name, :host, :ping, :num_players, :type, :map, :players).order(:host).map(&:values).to_json.display
-  when "daemon"
-    unless options[:host] and options[:port] and options[:document_root]
-      raise ArgumentError
-    end
-
-    Vrowser::HTTPDaemon.start(
-      :Host => options[:host],
-      :Port => options[:port],
-      :DocumentRoot => options[:document_root],
-      :config_path => options[:config_path])
-  else
-    raise ArgumentError(sub_command)
+  def command_daemon(options)
+    execute_as_server(options.merge({:daemonize => true}))
+  end
+
+  private 
+  def execute_as_server(options)
+    Vrowser::HTTPDaemon.new(
+      :config_path  => Pathname.new(options[:config_file]).realpath,
+      :BindAddress  => options[:host],
+      :Port         => options[:port],
+      :DocumentRoot => Pathname.new(options[:document_root]).realpath,
+      # :Logger       => logger 
+    ) do |vrowser|
+      if options[:daemonize]
+        vrowser.daemonize!
+        vrowser.start
+      else
+        vrowser.start
+      end
+    end
   end
 end
 
+Vrowser.logger = Logger.new(STDERR)
+exit VrowserCLI.run(ARGV)
+

data/lib/vrowser/http_daemon.rb

@@ -36,6 +36,10 @@ class Vrowser::HTTPDaemon
     @server.start
   end
 
+  def daemonize!
+    Process.daemon
+  end
+
   def stop
     @server.shutdown if @server
     Thread.kill(@th) if @th

data/public_html/index.html

@@ -2,15 +2,15 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <script src="/js/jquery.min.js"></script>
-    <script src="/js/jquery-ui-1.8.16.custom.min.js"></script>
-    <script src="/js/jquery.tmpl.min.js"></script>
-    <script src="/js/jquery.dataTables.nightly.min.js"></script>
-    <script src="/js/vrowser.js"></script>
-    <link rel="StyleSheet" href="/css/main.css" />
-    <link rel="StyleSheet" href="/css/demo_page.css" />
-    <link rel="StyleSheet" href="/css/demo_table.css" />
-    <link rel="StyleSheet" href="/css/demo_table_jui.css" />
+    <script src="./js/jquery.min.js"></script>
+    <script src="./js/jquery-ui-1.8.16.custom.min.js"></script>
+    <script src="./js/jquery.tmpl.min.js"></script>
+    <script src="./js/jquery.dataTables.nightly.min.js"></script>
+    <script src="./js/vrowser.js"></script>
+    <link rel="StyleSheet" href="./css/main.css" />
+    <link rel="StyleSheet" href="./css/demo_page.css" />
+    <link rel="StyleSheet" href="./css/demo_table.css" />
+    <link rel="StyleSheet" href="./css/demo_table_jui.css" />
    </head>
 
    <body>

data/public_html/js/vrowser.js

@@ -1,7 +1,7 @@
 var server_browser = null;
 var get_new_data = null;
 $(document).ready(function(){
-  $.getJSON("/api/connected/json", function(data){
+  $.getJSON("./api/connected/json", function(data){
     $("#myTemplate").tmpl(data).appendTo("#servers");
 
     $("#servers tbody tr").live("dblclick", function(){
@@ -43,7 +43,7 @@ $(document).ready(function(){
     get_new_data = function(){
       $.ajax({
         'dataType': 'json',
-        'url': '/api/updated/json',
+        'url': './api/updated/json',
         'cache': true,
         'success': function(data){
           server_browser.fnClearTable(false);

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - kimoto