vrowser 0.1.3 → 0.1.4

data/Rakefile

@@ -6,8 +6,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "vrowser"
-    gem.summary = %Q{TODO: one-line summary of your gem}
-    gem.description = %Q{TODO: longer description of your gem}
+    gem.summary = %Q{Server browser and Crawler for many games (L4D2, TF2, CS:S, KZMOD, The Ship)}
+    gem.description = %Q{Server browser and Crawler for many games (L4D2, TF2, CS:S, KZMOD, The Ship)}
     gem.email = "sub+peerler@gmail.com"
     gem.homepage = "http://github.com/kimoto/vrowser"
     gem.authors = ["kimoto"]

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app.rb

@@ -0,0 +1,29 @@
+require 'sinatra'
+require './lib/vrowser'
+
+def get_active_servers
+  Vrowser.load_file("/home/kimoto/config.yml") do |vrowser|
+    greped = vrowser.active_servers.select(:name, :host, :ping, :num_players, :type, :map, :players)
+    ordered = greped.order(:host)
+    return ordered.map(&:values)
+  end
+end
+
+def get_active_servers_nary
+  get_active_servers.map(&:values)
+end
+
+get '/api/connected/json' do
+  content_type :json
+  return get_active_servers.to_json
+end
+
+get '/api/updated/json' do
+  content_type :json
+  return get_active_servers_nary.to_json
+end
+
+get '/' do
+  redirect "index.html"
+end
+

data/bin/vrowser

@@ -49,6 +49,9 @@ hoge
       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 :log_path, "log file path", :short => "-l", :type => String
+      when "httpd"
         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'
@@ -120,8 +123,24 @@ hoge
     execute_as_server(options.merge({:daemonize => true}))
   end
 
+  def command_httpd_daemon(options)
+    execute_as_httpd_server(options.merge({:daemonize => true}))
+  end
+
   private 
   def execute_as_server(options)
+    Vrowser.logger = Logger.new(options[:log_path]) if options[:log_path]
+    Vrowser::Daemon.new(:config_path => Pathname.new(options[:config_file]).realpath) do |vrowser|
+      if options[:daemonize]
+        vrowser.daemonize!
+        vrowser.start
+      else
+        vrowser.start
+      end
+    end
+  end
+
+  def execute_as_httpd_server(options)
     Vrowser::HTTPDaemon.new(
       :config_path  => Pathname.new(options[:config_file]).realpath,
       :BindAddress  => options[:host],

data/config.ru

@@ -0,0 +1,3 @@
+require 'sinatra'
+require './app'
+run Sinatra::Application

data/lib/vrowser/http_daemon.rb

@@ -3,6 +3,55 @@
 require 'vrowser'
 require 'webrick'
 
+class Vrowser::Daemon
+  def self.start(options={})
+    self.new(options) do |instance|
+      instance.start
+    end
+  end
+
+  public
+  def initialize(options={})
+    @config_path = options[:config_path] or raise ArgumentError("config_path")
+    yield(self) if block_given?
+    self
+  end
+
+  def start
+    fetch_and_update @config_path
+    regist_stop
+  end
+
+  def daemonize!
+    Process.daemon
+  end
+
+  def stop
+  end
+
+  private
+  def regist_stop
+    trap("INT") do
+      stop
+    end
+  end
+
+  def fetch_and_update(config_path)
+    Vrowser.load_file(config_path) do |vrowser|
+      while true
+        puts "update server list"
+        vrowser.fetch
+
+        (60 / 5).times do
+          puts "try update"
+          vrowser.update
+          sleep (30 * 5)
+        end
+      end
+    end
+  end
+end
+
 class Vrowser::HTTPDaemon
   def self.start(options={})
     self.new(options) do |instance|
@@ -61,7 +110,7 @@ class Vrowser::HTTPDaemon
         (60 / 5).times do
           puts "try update"
           vrowser.update
-          sleep (60 * 5)
+          sleep (30 * 5)
         end
       end
     end

data/public_html/index.html

@@ -12,42 +12,44 @@
     <link rel="StyleSheet" href="./css/demo_table.css" />
     <link rel="StyleSheet" href="./css/demo_table_jui.css" />
     <title>Vrowser</title>
-   </head>
+  </head>
 
-   <body>
-     <section>
-     <h1 id="subject">Vrowser <a href="https://github.com/kimoto/vrowser/">(source)</a></h1>
-     <ul>
-       <li>サーバーの行でダブルクリックでログインできます</li>
-       <li>プレイヤー名で検索できます</li>
-     </ul>
+  <body>
+    <div class="container">
+      <section>
+        <h1 id="subject">Vrowser <a href="https://github.com/kimoto/vrowser/">(source)</a></h1>
+        <ul>
+          <li>サーバーの行でダブルクリックでログインできます</li>
+          <li>プレイヤー名で検索できます</li>
+        </ul>
 
-     <table id="servers" class="display">
-       <thead>
-         <tr>
-           <th>サーバー名</th>
-           <th>ホスト</th>
-           <th>Ping</th>
-           <th>人数</th>
-           <th>タイプ</th>
-           <th>マップ</th>
-           <th>プレイヤー</th>
-         </tr>
-       </thead>
-       <tbody>
-         <script id="myTemplate" type="text/x-jquery-tmpl">
-           <tr>
-             <td>${name}</td>
-             <td>${host}</td>
-             <td>${ping}</td>
-             <td>${num_players}</td>
-             <td>${type}</td>
-             <td>${map}</td>
-             <td>${players}</td>
-           </tr>
-         </script>
-       </tbody>
-     </table>
-     </section>
-   </body>
- </html>
+        <table id="servers" class="table-striped zebra-striped">
+          <thead>
+            <tr>
+              <th>サーバー名</th>
+              <th>ホスト</th>
+              <th>Ping</th>
+              <th>人数</th>
+              <th>タイプ</th>
+              <th>マップ</th>
+              <th>プレイヤー</th>
+            </tr>
+          </thead>
+          <tbody>
+            <script id="myTemplate" type="text/x-jquery-tmpl">
+              <tr>
+                <td>${name}</td>
+                <td>${host}</td>
+                <td>${ping}</td>
+                <td>${num_players}</td>
+                <td>${type}</td>
+                <td>${map}</td>
+                <td>${players}</td>
+              </tr>
+            </script>
+          </tbody>
+        </table>
+      </section>
+    </div>
+  </body>
+</html>

data/vrowser.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "vrowser"
+  s.version = "0.1.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["kimoto"]
+  s.date = "2012-03-12"
+  s.description = "Server browser and Crawler for many games (L4D2, TF2, CS:S, KZMOD, The Ship)"
+  s.email = "sub+peerler@gmail.com"
+  s.executables = ["vrowser"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "app.rb",
+    "bin/vrowser",
+    "config.ru",
+    "examples/config.yml",
+    "lib/plugins/l4d2.rb",
+    "lib/vrowser.rb",
+    "lib/vrowser/http_daemon.rb",
+    "public_html/css/demo_page.css",
+    "public_html/css/demo_table.css",
+    "public_html/css/demo_table_jui.css",
+    "public_html/css/demo_validation.css",
+    "public_html/css/main.css",
+    "public_html/css/site_jui.ccss.css",
+    "public_html/index.html",
+    "public_html/js/jquery-ui-1.8.16.custom.min.js",
+    "public_html/js/jquery.dataTables.columnFilter.js",
+    "public_html/js/jquery.dataTables.js",
+    "public_html/js/jquery.dataTables.min.js",
+    "public_html/js/jquery.dataTables.nightly.min.js",
+    "public_html/js/jquery.min.js",
+    "public_html/js/jquery.tmpl.min.js",
+    "public_html/js/vrowser.js",
+    "test/helper.rb",
+    "test/test_vrowser.rb",
+    "vrowser.gemspec"
+  ]
+  s.homepage = "http://github.com/kimoto/vrowser"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Server browser and Crawler for many games (L4D2, TF2, CS:S, KZMOD, The Ship)"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

metadata

@@ -1,183 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vrowser
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - kimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-06 00:00:00 +09:00
-default_executable: vrowser
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-qstat
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: retry-handler
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+date: 2012-03-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &96717520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: Server browser for many games (Left4Dead2, TeamFortress2, etc)
+  prerelease: false
+  version_requirements: *96717520
+description: Server browser and Crawler for many games (L4D2, TF2, CS:S, KZMOD, The
+  Ship)
 email: sub+peerler@gmail.com
-executables: 
+executables:
 - vrowser
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- app.rb
 - bin/vrowser
+- config.ru
 - examples/config.yml
 - lib/plugins/l4d2.rb
-- lib/vrowser/http_daemon.rb
 - lib/vrowser.rb
+- lib/vrowser/http_daemon.rb
+- public_html/css/demo_page.css
+- public_html/css/demo_table.css
+- public_html/css/demo_table_jui.css
+- public_html/css/demo_validation.css
+- public_html/css/main.css
+- public_html/css/site_jui.ccss.css
+- public_html/index.html
+- public_html/js/jquery-ui-1.8.16.custom.min.js
+- public_html/js/jquery.dataTables.columnFilter.js
+- public_html/js/jquery.dataTables.js
+- public_html/js/jquery.dataTables.min.js
+- public_html/js/jquery.dataTables.nightly.min.js
+- public_html/js/jquery.min.js
+- public_html/js/jquery.tmpl.min.js
+- public_html/js/vrowser.js
 - test/helper.rb
 - test/test_vrowser.rb
-- ./public_html/css/demo_page.css
-- ./public_html/css/demo_table.css
-- ./public_html/css/demo_table_jui.css
-- ./public_html/css/demo_validation.css
-- ./public_html/css/main.css
-- ./public_html/css/site_jui.ccss.css
-- ./public_html/index.html
-- ./public_html/js/jquery-ui-1.8.16.custom.min.js
-- ./public_html/js/jquery.dataTables.columnFilter.js
-- ./public_html/js/jquery.dataTables.js
-- ./public_html/js/jquery.dataTables.min.js
-- ./public_html/js/jquery.dataTables.nightly.min.js
-- ./public_html/js/jquery.min.js
-- ./public_html/js/jquery.tmpl.min.js
-- ./public_html/js/vrowser.js
-has_rdoc: true
+- vrowser.gemspec
 homepage: http://github.com/kimoto/vrowser
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Server browser for many games
-test_files: 
-- test/helper.rb
-- test/test_vrowser.rb
+summary: Server browser and Crawler for many games (L4D2, TF2, CS:S, KZMOD, The Ship)
+test_files: []

data/.gitignore

@@ -1,49 +0,0 @@
-# rcov generated
-coverage
-coverage.data
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-
-# For TextMate
-#*.tmproj
-#tmtags
-
-# For emacs:
-#*~
-#\#*
-#.\#*
-
-# For vim:
-#*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc