vrowser 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/vrowser

@@ -59,12 +59,16 @@ hoge
         Trollop::die "unknown subcommand: #{cmd.inspect}"
       end
     end
+    return execute_sub_commands(cmd, cmd_opts)
+  end
 
-    if sub_commands.include? cmd
+  def execute_sub_commands(cmd, cmd_opts)
+    if self.class.sub_commands.include? cmd
       self.send("command_" +  cmd, cmd_opts)
       return 0
     else
       cmd_opts.help.display
+      return 1
     end
   end
 
@@ -86,6 +90,13 @@ hoge
     end
   end
 
+  def command_fetch(options)
+    Vrowser.load_file(options[:config_file]) do |vrowser|
+      vrowser.fetch
+      vrowser.clear
+    end
+  end
+
   def command_update(options)
     Vrowser.load_file(options[:config_file]) do |vrowser|
       vrowser.update

data/lib/vrowser.rb

@@ -6,11 +6,21 @@ require 'retry-handler'
 require 'active_support/core_ext'
 require 'yaml'
 require 'json'
+require 'time'
 
 module VrowserModel
   def self.connect(options={})
-    Sequel::Model.plugin(:schema)
-    Sequel.connect(options)
+    logger = options.delete(:logger)
+
+    Sequel::Model.plugin :schema
+    Sequel::Model.plugin :timestamps, :update_on_create => true
+    Sequel::Model.plugin :force_encoding, 'utf-8'
+    if logger
+      Sequel.connect(options, :loggers => [logger])
+    else
+      Sequel.connect(options)
+    end
+
     self.define_models
     Servers.plugin :timestamps, :create=>:created_at, :update=>:updated_at
   end
@@ -21,16 +31,16 @@ module VrowserModel
         unless table_exists?
           set_schema do
             primary_key :id
-            string :name
-            string :host, :unique => true
-            string :status
-            integer :ping
-            string :num_players
-            string :type
-            string :map
-            string :players
-            timestamp :created_at
-            timestamp :updated_at
+            String :name
+            String :host, :unique => true
+            String :status
+            Integer :ping
+            String :num_players
+            String :type
+            String :map
+            String :players
+            timestamp :created_at, :default => nil, :null => true
+            timestamp :updated_at, :default => nil, :null => true
           end
           create_table
         end
@@ -99,8 +109,8 @@ class Vrowser
         self.update(server.host, protocol)
         updated += 1
       }
-    rescue
-      @@logger.error $!
+    #rescue => ex
+    #  @@logger.error "#{ex.inspect}"
     ensure
       @@logger.info "updated #{updated} servers"
     end
@@ -114,8 +124,8 @@ class Vrowser
         self.update_info(server.host, protocol)
         updated += 1
       }
-    rescue
-      @@logger.error $!
+    rescue => ex
+      @@logger.error "#{ex.inspect}"
     ensure
       @@logger.info "updated #{updated} servers"
     end
@@ -210,7 +220,7 @@ class Vrowser
       return QStat.query_serverlist(host, gametype, gamename, maxping)
     }.retry(:accept_exception => StandardError, :logger => @@logger)
   rescue => ex
-    @@logger.error "error: #{ex}"
+    @@logger.error "#{ex.inspect}"
     return []
   end
 

data/public_html/css/main.css

@@ -1,10 +1,7 @@
 body{
   font-size: 16px;
   color: black;
-  /*font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;*/
   font-family: 'メイリオ',Meiryo,Tahoma,Arial,Verdana,sans-serif;
-  /*background-color: #090909;*/
-  /*background-color: white;*/
 }
 
 pre{
@@ -25,7 +22,6 @@ header{
   top: 0;
   left: 0;
   width: 100%;
-  /*height: 100%;*/
 }
 
 del{
@@ -49,6 +45,7 @@ h1{
   border-width: 0 0 1px 0;
   text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.5);
   padding: 0;margin: 0;
+  padding-left: 10px;
 }
 
 h1 > a{
@@ -64,14 +61,6 @@ h2{
   text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.5);
 }
 
-section{
-  margin-left: 50px;
-}
-
-section p{
-  margin-left: 20px;
-}
-
 body{
   background-color: white;
   color: black;
@@ -79,10 +68,6 @@ body{
   padding: 0px;
 }
 
-section{
-  margin-left: 24px;
-}
-
 #toolbar{
   padding-top: 5px;
   background-color: #333;
@@ -106,10 +91,6 @@ section{
 #main_icon{
   position: absolute;
 }
-section{
-  margin-left: 50px;
-  margin-right: 80px;
-}
 section > h1{
   margin-top: 10px;
 }
@@ -128,25 +109,7 @@ footer{
   -moz-box-shadow: 0px 10px 10px 10px gray;
 }
 
-/*
-section > ul > ul > li{
-  border: solid 1px pink;*
-  padding: 10px;
-  width: 300px;
-  height: 250px;
-  float: left;
-  list-style: none;
-  overflow: hidden;
-}
-
-section{
-  clear: both;
-}
-  */
-
 td,th{
-  /*border: solid 1px black;*/
-  /*border-width: 1px 1px 0 0;*/
   padding: 5px;
   margin: 0;
 }

data/public_html/index.html

@@ -11,11 +11,17 @@
     <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" />
+    <title>Vrowser</title>
    </head>
 
    <body>
      <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>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - kimoto
@@ -83,7 +83,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: mysql
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false