nofxx-god_web 0.2.3 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

data/god_web.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god_web}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Newland", "Marcos Piccinini"]
-  s.date = %q{2009-09-09}
+  s.date = %q{2009-09-11}
   s.default_executable = %q{god_web}
   s.description = %q{iPhone friendly sinatra web UI for God}
   s.email = %q{see@github.com}
@@ -32,13 +32,16 @@ Gem::Specification.new do |s|
      "lib/god_web.rb",
      "public/.DS_Store",
      "public/app.css",
+     "public/app.js",
      "public/icons/big_icon.png",
      "public/icons/bookmark.png",
+     "public/icons/cpus.png",
      "public/icons/databases.png",
      "public/icons/gear.png",
      "public/icons/groups.png",
      "public/icons/info.png",
      "public/icons/key.png",
+     "public/icons/mem.png",
      "public/icons/monitor.png",
      "public/icons/restart.png",
      "public/icons/ruby.png",
@@ -56,6 +59,7 @@ Gem::Specification.new do |s|
      "public/iui/blueButton.png",
      "public/iui/cancel.png",
      "public/iui/grayButton.png",
+     "public/iui/greenButton.png",
      "public/iui/iui-logo-touch-icon.png",
      "public/iui/iui.css",
      "public/iui/iui.js",
@@ -74,11 +78,13 @@ Gem::Specification.new do |s|
      "public/iui/toolButton.png",
      "public/iui/toolbar.png",
      "public/iui/whiteButton.png",
+     "public/iui/yellowButton.png",
      "spec/god_web_spec.rb",
      "spec/spec_helper.rb",
      "views/command.erb",
      "views/icon.erb",
      "views/status.erb",
+     "views/top.erb",
      "views/watch.erb"
   ]
   s.homepage = %q{http://github.com/nofxx/god_web}

data/lib/app.rb

@@ -13,10 +13,11 @@ get '/' do
   @statuses.each do |watch, status|
     @watches << watch.to_s
   end
-  @watches.sort!
+  @watches = @watches.group_by { |w| @statuses[w][:state].to_s }
   @groups = GODWEB.groups
   @host = `hostname`
-  @footer = "GodWeb v0.2 - #{@host}"
+  @stats = GodWeb.cpu_status
+  @footer = "GodWeb v0.2.5 - #{@host}"
   show(:status, @host)
 end
 
@@ -30,6 +31,8 @@ end
 
 get '/g/:group' do
   @watch = @group = params["group"]
+  @child = GODWEB.status.keys.each.select { |k| GODWEB.status[k][:group] == @group } #.select { |w| w["group"] = @group }
+  @child.map!{ |c| [c, GODWEB.status[c][:state]]}
   @status = nil
   @commands = GodWeb.possible_statuses(@status)
   show(:watch, "#{@group} [group]")
@@ -45,7 +48,7 @@ get '/w/:watch/:command' do
 end
 
 get '/o' do
-  @commands = %w{ quit restart }
+  @commands = %w{ true }
   show(:watch, "god itself")
 end
 
@@ -54,6 +57,11 @@ get '/i' do
   show(:icon)
 end
 
+get '/t' do
+  @text = `top -Hibn 1`.gsub("top - ", "")
+  show(:top)
+end
+
 get '/heartbeat' do
   @statuses = GODWEB.status
   'OK'

data/lib/god_web.rb

@@ -69,16 +69,28 @@ class GodWeb
   end
 
   def self.possible_statuses(status)
+    # need to check, but god doesn't have a monitored and offline state...
     case status
-    when :up
-      return %w{stop restart unmonitor}
-    when :unmonitored
-      return %w{start monitor}
-    else
-      return %w{start stop restart}
+    when :up then [true, true] #%w{start monitor}
+    when :unmonitored then [false, false] #%w{start monitor}
+    else [] # nil #[false, false] #%w{start stop restart}
     end
   end
 
+  def self.ram_status
+    mem = `free -mo`.split(" ")
+    used, free, cached, swap = mem[8], mem[9], mem[12], mem[15]
+  end
+
+  def self.cpu_status
+    #stat = `cat /proc/stat`.split(" ")
+    top = `top -bn 1`
+    info, tasks, cpus, mem, swap, *rest = *top
+    # Use array to keep order (ruby < 1.9)
+    [[:info, info.gsub(/top - |\d{2}:\d{2}(:\d{2})?(\s|,)|\saverage/, "")],
+      [:cpus, cpus.gsub("Cpu\(s\): ", "").split(", ")[0..4].join(", ")],
+      [:mem, mem.gsub("Mem:  ", "").gsub(/(\d*k)/) { ($1.to_i / 1000).to_s }]]
+  end
 
 private
 
@@ -110,6 +122,7 @@ private
   # To make it look good (no horiz scrollbars) in the iphone
   #
   def format_log(raw)
+    return "..." unless raw
     raw.split("\n").map do |l|
       # clean stuff we don't need
       l.gsub!(/I\s+|\(\w*\)|within bounds/, "") #        gsub(/\(\w*\)/, """)
@@ -121,7 +134,7 @@ private
           # take only the integer from cpu
           gsub(/cpu/, "cpu %").gsub(/(\d{1,3})\.\d*%/, "\\1").
           # show mem usage in mb
-          gsub(/memory/, "memory mb").gsub(/(\d*kb)/) { ($1.to_i / 1000).to_s }
+          gsub(/memory/, "mem mb").gsub(/(\d*kb)/) { ($1.to_i / 1000).to_s }
       else
         l.gsub(/\[\S*\s(\S*)\]\W+INFO: \w*\s(\w*)/, "<span class='gray'>\\1</span> | <span class='act'>act</span> | \\2")
       end

data/public/app.css

@@ -1,17 +1,3 @@
-body > ul > li {  padding-left: 30px; }
-li.unmonitored { background: transparent url(../icons/unmonitored.png) no-repeat scroll 8px 12px;}
-li.unmonitor   { background: transparent url(../icons/unmonitor.png) no-repeat scroll 8px 12px;}
-li.monitor { background: transparent url(../icons/monitor.png) no-repeat scroll 8px 12px;}
-li.start   { background: transparent url(../icons/start.png) no-repeat scroll 8px 12px;}
-li.stop    { background: transparent url(../icons/stop.png) no-repeat scroll 8px 12px; }
-li.quit    { background: transparent url(../icons/stop.png) no-repeat scroll 8px 12px; }
-li.restart { background: transparent url(../icons/restart.png) no-repeat scroll 8px 12px;}
-li.groups  { background: transparent url(../icons/groups.png) no-repeat scroll 8px 12px;}
-li.god     { background: transparent url(../icons/terminal.png) no-repeat scroll 8px 12px;}
-li.hicon   { background: transparent url(../icons/bookmark.png) no-repeat scroll 8px 12px;}
-li.info    { background: transparent url(../icons/info.png) no-repeat scroll 7px 7px;}
-li.up      { background: transparent url(../icons/up.png) no-repeat scroll 8px 12px;}
-
 .home_icon_div {
   padding-top: 80px;
   background: transparent url(../icons/big_icon.png) no-repeat scroll center center;
@@ -23,7 +9,38 @@ li.up      { background: transparent url(../icons/up.png) no-repeat scroll 8px 1
   text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0;
 }
 
-.info {
+fieldset > ul {
+    padding: 0px 10px;
+}
+
+fieldset > ul > li {
+    text-align: left;
+    background:#FFFFFF none repeat scroll 0 0;
+    position: relative;
+    margin: 0;
+    border-bottom: 1px solid #E0E0E0;
+    padding: 8px 0 8px 0px;
+    font-size: 20px;
+    font-weight: bold;
+    list-style: none;
+}
+
+fieldset > ul > li > a {
+    display: block;
+    margin: -8px 0 -8px -10px;
+    padding: 8px 32px 8px 10px;
+    text-decoration: none;
+    color: inherit;
+    background: url(iui/listArrow.png) no-repeat right center;
+}
+
+li img {
+  border:medium none;
+  float:left;
+  margin:4px 8px 0px 0px;
+}
+
+.tiny {
   font-size: 0.8em;
 }
 
@@ -40,4 +57,39 @@ li.up      { background: transparent url(../icons/up.png) no-repeat scroll 8px 1
 .act {
     color: #999900;
     font-weight: bold;
+}
+
+.yellowButton,
+.greenButton {
+    display: block;
+    border-width: 0 12px;
+    padding: 10px;
+    text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    text-decoration: inherit;
+    color: inherit;
+}
+
+.greenButton {
+    -webkit-border-image: url(../iui/greenButton.png) 0 12 0 12;
+    color:#fff;
+    text-shadow: #007a00 0 -1px 0;
+}
+
+.yellowButton {
+    -webkit-border-image: url(../iui/yellowButton.png) 0 12 0 12;
+    color:#fff;
+    text-shadow: #007a7a 0 -1px 0;
+}
+
+.code {
+  font-size: 14px;
+  font-family: Courier;
+  color: #33EE33;
+  background-color: #222;
+  padding-left: 15px;
+  white-space: nowrap;
+  overflow: auto;
+  padding-top: 8px;
 }

data/public/app.js

@@ -0,0 +1,28 @@
+//FIXME: grr... bug if you run once, cancel, and try to run on another watch (hate js..)
+function submitCommand(action, watch) {
+  var comm;
+  var act;
+  var s;
+
+  if (document.getElementById("toggle_" + action)) {
+    act = document.getElementById("toggle_" + action);
+    s = act.getAttribute("toggled");
+
+    if(action == "power") {
+      comm =  (s == "true") ? "start" : "stop";
+    } else {
+      comm =  (s == "true") ? "monitor" : "unmonitor";
+    }
+  } else {
+    comm = action;
+  }
+
+  if (confirm("God will " + comm + " " + watch + "..")) {
+    var res =  document.getElementById("command_result");
+    iui.showPageByHref("/w/" + watch + "/" + comm, null, null, res, null);
+  } else {
+    act.setAttribute("toggled",  (s == "true") ? "false" : "true");
+  }
+  return false;
+}
+

data/spec/god_web_spec.rb

@@ -8,9 +8,10 @@ GOD_ACT = "I [2009-09-08 05:06:19]  INFO: nginx restart: /etc/rc.d/nginx restart
 describe "GodWeb" do
 
   it "should find possible statuses" do
-    GodWeb.possible_statuses(:up).should eql(["stop", "restart", "unmonitor"])
+    GodWeb.possible_statuses(:up).should eql([true, true]) #["stop", "restart", "unmonitor"])
   end
 
+
   describe "Log formatter" do
     before do
       DRb.stub!(:start_service)
@@ -27,7 +28,7 @@ describe "GodWeb" do
 
     it "should format log mem" do
       @g.send(:format_log, GOD_MEM).should eql(
-      "<span class='gray'>02:50:42</span> | <span class='green'>ok</span> | memory mb  [23, 23, 23, 23, 23] " )
+      "<span class='gray'>02:50:42</span> | <span class='green'>ok</span> | mem mb  [23, 23, 23, 23, 23] " )
     end
 
     it "should format log move" do
@@ -42,5 +43,16 @@ describe "GodWeb" do
 
   end
 
+  # bad emacs ruby highlight.. =/
+  it "should find out used/free cpu" do
+  #  GodWeb.stub(:`).and_return("cpu  6528133 751 1130715 31204523 214784 3694 21914 0 0\ncpu0 3230410 558 557722 15169049 107745 1743 9792 0 0\ncpu1 3297722 193 572992 16035473 107039 1950 12122 0 0\nintr 655758766 681 2 0 0 0 0 3 0 1368 0 0 0 0 0 0 0 0 0 0 0 0 0 4141444 0 0 0 0 4137248 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\nctxt 1580587936\nbtime 1252305746\nprocesses 438409\nprocs_running 6\nprocs_blocked 0\n")
+    GodWeb.cpu_status.should eql(["6499", "1485", "20"])
+  end
+
+  it "should find out used/free ram" do
+    GodWeb.stub(:`).and_return("             total       used       free     shared    buffers     cached\nMem:          7984       6499       1485          0        265       3480\nSwap:         7632         20       7611\n")
+    GodWeb.ram_status.should eql(["6499", "1485", "3480", "20"])
+  end
+
 end
 

data/views/status.erb

@@ -2,14 +2,15 @@
   <head>
     <title><%= @title %></title>
     <meta name="viewport" content="width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
-    <style type="text/css" media="screen">@import "/iui/iui.css";</style>
+    <style type="text/css" media="screen">@import "/iui/iuix.css";</style>
     <style type="text/css" media="screen">@import "/app.css";</style>
-    <script type="application/x-javascript" src="/iui/iui.js"></script>
+    <script type="application/x-javascript" src="/app.js"></script>
+    <script type="application/x-javascript" src="/iui/iuix.js"></script>
     <script type="text/javascript">  iui.animOn = true;</script>
   </head>
   <body>
     <div class="toolbar">
-      <h1 id="pageTitle"><%= @title %><img src="icons/up.png"></img></h1>
+      <h1 id="pageTitle"><%= @title %></h1>
       <a id="backButton" class="button" href="#"></a>
       <a class="button" href="/" target="_self">Refresh</a>
     </div>
@@ -17,23 +18,25 @@
     <% unless @groups.empty? %>
       <li class="group">Groups</li>
         <% @groups.each do |watch| %>
-          <li id="<%= watch %>" class="groups"><a href="/g/<%= watch %>"><%= watch %></a></li>
+          <li id="<%= watch %>"><a href="/g/<%= watch %>"><img src="icons/groups.png"><%= watch %></a></li>
         <% end %>
       <% end %>
-      <li class="group">Watches</li>
-      <% @watches.each do |watch| %>
-        <li id="<%= watch %>" class="<%= @statuses[watch][:state] %>">
-        <a href="/w/<%= watch %>"><%= watch %></a></li>
+      <% @watches.each do |state, watches| %>
+        <li class="group"><%= state.capitalize %></li>
+        <% for watch in watches.sort %>
+          <li id="<%= watch %>">
+          <a href="/w/<%= watch %>"><img src="icons/<%= @statuses[watch][:state] %>.png"></img><%= watch %></a></li>
+        <% end %>
       <% end %>
       <li class="group">Extras</li>
-      <li id="home_icon" class="hicon">
-        <a href="/i">Home Icon</a>
-      </li>
-      <li id="god_opts" class="god">
-        <a href="/o">God</a>
-      </li>
+      <li id="god_opts"><a href="/o"><img src="icons/monitor.png"></img>God</a></li>
+      <li id="top_show"><a href="/t"><img src="icons/terminal.png"></img>Top</a></li>
+      <li id="home_icon"><a href="/i"><img src="icons/bookmark.png"></img>Icon</a></li>
       <li class="group">About</li>
-      <li class="info"><%= @footer %> [ok]</li>
+      <% for stat in @stats %>
+        <li class="tiny"><img src="icons/<%= stat[0] %>.png"><%= stat[1] %></li>
+      <% end %>
+      <li class="tiny"><img src="icons/ruby.png"></img><%= @footer %> [ok]</li>
     </ul>
   </body>
 </html>

data/views/top.erb

@@ -0,0 +1,8 @@
+<div class="panel" title="Top">
+  <div class="code">
+    <%= @text.gsub("\n", "<br/>") %>
+  </div>
+  <h2> TIP: Use two fingers to scroll Y </h2>
+</div>
+
+

data/views/watch.erb

@@ -1,14 +1,44 @@
-<ul id="<%= @watch %>_commands" title="<%= @title %>">
+<div id="<%= @watch %>_commands" title="<%= @title %>" class="panel">
   <% if @status %>
-    <li class="<%= @status %>"> <%= @status %> [<%= Time.now.strftime("%H:%m %m/%d") %>]</li>
-  <% end %>
-  <li class="group">Commands</li>
-  <% @commands.each do |command| %>
-    <li id="<%= command %>_<%= @watch %>" class="<%= command %>">
-    <a href="/w/<%= @watch %>/<%= command %>"><%= command %></a></li>
+    <h2> Status </h2>
+    <fieldset>
+      <div align="center"><p>
+      <b><%= @status.to_s.capitalize %></b> [<%= Time.now.strftime("%H:%m %m/%d") %>]</p></div>
+    </fieldset>
   <% end %>
   <% if @log %>
-    <li class="group">Log</li>
-    <div class="info"><p><%= @log %></p></div>
+    <h2> Log </h2>
+    <fieldset>
+      <div align='left'><%= @log %></div>
+    </fieldset>
+  <% end %>
+  <% if @child %>
+    <h2> Watches </h2>
+    <fieldset><ul>
+      <% for child in @child %>
+        <li id="<%= child[0] %>">
+        <a href="/w/<%= child[0] %>"><img src="icons/<%= child[1] %>.png"></img><%= child[0] %></a></li>
+      <% end %>
+    </ul></fieldset>
+  <% end %>
+  <h2> Commands </h2>
+  <% unless @commands.empty? %>
+  <fieldset>
+    <% ["power", "monitor"].each_with_index do |comm, i| %>
+      <div class="row">
+        <label><%= comm.capitalize %></label>
+        <div id="toggle_<%= comm %>" class="toggle" toggled="<%= @commands[i] %>" onclick="submitCommand('<%= comm %>', '<%= @watch %>')">
+          <span class="thumb"></span><span class="toggleOn">ON</span>
+          <span class="toggleOff">OFF</span>
+        </div>
+      </div>
+    <% end %>
+  </fieldset>
+  <% else %>
+    <a class="greenButton" onclick="submitCommand('start', '<%= @watch %>')">Start <%= " All" if @child %></a>
+    <a class="yellowButton" onclick="submitCommand('stop', '<%= @watch %>')">Stop <%= " All" if @child %></a>
   <% end %>
-</ul>
+  <a class="redButton" onclick="submitCommand('restart', '<%= @watch %>')">Restart <%= " All" if @child %></a>
+  <div id="command_result"></div>
+</div>
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-god_web
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jesse Newland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 -07:00
+date: 2009-09-11 00:00:00 -07:00
 default_executable: god_web
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,13 +69,16 @@ files:
 - lib/god_web.rb
 - public/.DS_Store
 - public/app.css
+- public/app.js
 - public/icons/big_icon.png
 - public/icons/bookmark.png
+- public/icons/cpus.png
 - public/icons/databases.png
 - public/icons/gear.png
 - public/icons/groups.png
 - public/icons/info.png
 - public/icons/key.png
+- public/icons/mem.png
 - public/icons/monitor.png
 - public/icons/restart.png
 - public/icons/ruby.png
@@ -93,6 +96,7 @@ files:
 - public/iui/blueButton.png
 - public/iui/cancel.png
 - public/iui/grayButton.png
+- public/iui/greenButton.png
 - public/iui/iui-logo-touch-icon.png
 - public/iui/iui.css
 - public/iui/iui.js
@@ -111,11 +115,13 @@ files:
 - public/iui/toolButton.png
 - public/iui/toolbar.png
 - public/iui/whiteButton.png
+- public/iui/yellowButton.png
 - spec/god_web_spec.rb
 - spec/spec_helper.rb
 - views/command.erb
 - views/icon.erb
 - views/status.erb
+- views/top.erb
 - views/watch.erb
 has_rdoc: false
 homepage: http://github.com/nofxx/god_web