nofxx-god_web 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/god_web.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god_web}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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-08}
+  s.date = %q{2009-09-09}
   s.default_executable = %q{god_web}
   s.description = %q{iPhone friendly sinatra web UI for God}
   s.email = %q{see@github.com}
@@ -32,9 +32,12 @@ Gem::Specification.new do |s|
      "lib/god_web.rb",
      "public/.DS_Store",
      "public/app.css",
+     "public/icons/big_icon.png",
+     "public/icons/bookmark.png",
      "public/icons/databases.png",
      "public/icons/gear.png",
      "public/icons/groups.png",
+     "public/icons/info.png",
      "public/icons/key.png",
      "public/icons/monitor.png",
      "public/icons/restart.png",
@@ -74,6 +77,7 @@ Gem::Specification.new do |s|
      "spec/god_web_spec.rb",
      "spec/spec_helper.rb",
      "views/command.erb",
+     "views/icon.erb",
      "views/status.erb",
      "views/watch.erb"
   ]

data/lib/app.rb

@@ -15,7 +15,9 @@ get '/' do
   end
   @watches.sort!
   @groups = GODWEB.groups
-  show(:status)
+  @host = `hostname`
+  @footer = "GodWeb v0.2 - #{@host}"
+  show(:status, @host)
 end
 
 get '/w/:watch' do
@@ -42,6 +44,16 @@ get '/w/:watch/:command' do
   show(:command, "#{@command}ing #{@watch}")
 end
 
+get '/o' do
+  @commands = %w{ quit restart }
+  show(:watch, "god itself")
+end
+
+get '/i' do
+  @text = `hostname`
+  show(:icon)
+end
+
 get '/heartbeat' do
   @statuses = GODWEB.status
   'OK'

data/lib/god_web.rb

@@ -59,9 +59,7 @@ class GodWeb
     begin
       @server.ping
     rescue Exception => e
-      if (tries -= 1) > 0
-        retry
-      end
+      retry if (tries -= 1) > 1
       raise e, "The server is not available (or you do not have permissions to access it)"
     end
   end

data/public/app.css

@@ -1,14 +1,27 @@
-body > ul > li {
-  padding-left: 30px;
+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;
+  font-size: 4em;
+  margin-bottom: 100px;
+  height: 300px;
+  font-weight: bold;
+  color: #4d4d70;
+  text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0;
 }
-li.up {    background: transparent url(../icons/up.png) no-repeat scroll 8px 12px;}
-li.unmonitored {    background: transparent url(../icons/unmonitored.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.restart {    background: transparent url(../icons/restart.png) no-repeat scroll 8px 12px;}
-li.unmonitor {    background: transparent url(../icons/unmonitor.png) no-repeat scroll 8px 12px;}
-li.groups {    background: transparent url(../icons/groups.png) no-repeat scroll 8px 12px;}
 
 .info {
   font-size: 0.8em;

data/views/icon.erb

@@ -0,0 +1,10 @@
+<div class="panel" title="Home Icon">
+  <div align="center">
+    <p> Scroll down to get a good shot!</p>
+    <div class="home_icon_div">
+      <%= @text %>
+    </div>
+  </div>
+</div>
+
+

data/views/status.erb

@@ -13,7 +13,7 @@
       <a id="backButton" class="button" href="#"></a>
       <a class="button" href="/" target="_self">Refresh</a>
     </div>
-    <ul id="home" selected="true" title="GodWeb">
+    <ul id="home" selected="true" title="<%= @title %>">
     <% unless @groups.empty? %>
       <li class="group">Groups</li>
         <% @groups.each do |watch| %>
@@ -25,6 +25,15 @@
         <li id="<%= watch %>" class="<%= @statuses[watch][:state] %>">
         <a href="/w/<%= watch %>"><%= watch %></a></li>
       <% 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 class="group">About</li>
+      <li class="info"><%= @footer %> [ok]</li>
     </ul>
   </body>
 </html>

data/views/watch.erb

@@ -1,10 +1,14 @@
 <ul id="<%= @watch %>_commands" title="<%= @title %>">
-  <li class="<%= @status %>"> <%= @status %> [<%= Time.now.strftime("%H:%m %m/%d") %>]</li>
+  <% 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>
   <% end %>
-  <li class="group">Log</li>
-  <div class="info"><p><%= @log %></p></div>
+  <% if @log %>
+    <li class="group">Log</li>
+    <div class="info"><p><%= @log %></p></div>
+  <% end %>
 </ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-god_web
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jesse Newland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -07:00
+date: 2009-09-09 00:00:00 -07:00
 default_executable: god_web
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,9 +69,12 @@ files:
 - lib/god_web.rb
 - public/.DS_Store
 - public/app.css
+- public/icons/big_icon.png
+- public/icons/bookmark.png
 - public/icons/databases.png
 - public/icons/gear.png
 - public/icons/groups.png
+- public/icons/info.png
 - public/icons/key.png
 - public/icons/monitor.png
 - public/icons/restart.png
@@ -111,6 +114,7 @@ files:
 - spec/god_web_spec.rb
 - spec/spec_helper.rb
 - views/command.erb
+- views/icon.erb
 - views/status.erb
 - views/watch.erb
 has_rdoc: false